Merge "ARM: dts: msm: aatc usb changes for holi" (e19efa7f) · Commits · e / devices / android_kernel_fairphone_FP5

qcom/holi-mtp-usbc-overlay.dts

+37 −0

Original line number	Diff line number	Diff line
		@@ -9,3 +9,40 @@
		qcom,msm-id = <454 0x10000>, <472 0x10000>;
		qcom,board-id = <8 1>;
		};

		&swr0 {
		qcom,is_wcd937x = <0>;
		};

		&wcd937x_tx_slave {
		status = "disabled";
		};

		&wcd937x_rx_slave {
		status = "disabled";
		};

		&wcd937x_codec {
		status = "disabled";
		};

		&wcd938x_tx_slave {
		status = "ok";
		};

		&wcd938x_rx_slave {
		status = "ok";
		};

		&wcd938x_codec {
		status = "ok";
		};

		&holi_snd {
		asoc-codec = <&stub_codec>, <&bolero>,
		<&wcd938x_codec>, <&wsa881x_i2c_e>,
		<&wsa881x_i2c_f>;
		asoc-codec-names = "msm-stub-codec.1", "bolero_codec",
		"wcd938x_codec", "wsa-codec0",
		"wsa-codec1";
		};

qcom/holi-mtp-usbc.dtsi

+76 −3

Original line number	Diff line number	Diff line
		@@ -2,6 +2,8 @@
		#include <dt-bindings/gpio/gpio.h>
		#include <dt-bindings/input/linux-event-codes.h>
		#include "holi-pmic-overlay.dtsi"
		#include "display/holi-sde-display-mtp.dtsi"
		#include "holi-thermal-overlay.dtsi"
		#include <dt-bindings/iio/qti_power_supply_iio.h>

		&sdhc_1 {
		@@ -69,10 +71,45 @@
		status = "ok";
		};

		&qupv3_se0_i2c {
		status = "ok";
		#address-cells = <1>;
		#size-cells = <0>;
		nq@28 {
		compatible = "qcom,sn-nci";
		reg = <0x28>;
		qcom,sn-irq = <&tlmm 9 0x00>;
		qcom,sn-ven = <&tlmm 6 0x00>;
		qcom,sn-firm = <&tlmm 8 0x00>;
		qcom,sn-clkreq = <&tlmm 7 0x00>;
		qcom,sn-vdd-1p8-supply = <&L11A>;
		qcom,sn-vdd-1p8-voltage = <1800000 1800000>;
		qcom,sn-vdd-1p8-current = <157000>;
		interrupt-parent = <&tlmm>;
		interrupts = <9 0>;
		interrupt-names = "nfc_irq";
		pinctrl-names = "nfc_active", "nfc_suspend";
		pinctrl-0 = <&nfc_int_active &nfc_enable_active>;
		pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>;
		};
		};

		&holi_snd {
		qcom,msm-mbhc-usbc-audio-supported = <1>;
		qcom,msm-mbhc-hphl-swh = <0>;
		qcom,msm-mbhc-gnd-swh = <0>;
		fsa4480-i2c-handle = <&fsa4480>;
		};

		&qupv3_se10_i2c {
		status = "ok";
		fsa4480: fsa4480@42 {
		compatible = "qcom,fsa4480-i2c";
		reg = <0x42>;
		io-channels = <&pm7250b_charger PSY_IIO_TYPEC_ACCESSORY_MODE>;
		io-channel-names = "typec_mode";
		qcom,use-power-supply = <1>;
		};
		};

		&soc {
		@@ -102,6 +139,44 @@
		};
		};

		&pm6150a_amoled {
		status = "ok";
		};

		&qupv3_se8_i2c {
		status = "okay";
		qcom,i2c-touch-active="synaptics,tcm-i2c";

		synaptics_tcm@20 {
		compatible = "synaptics,tcm-i2c";
		reg = <0x20>;
		interrupt-parent = <&tlmm>;
		interrupts = <22 0x2008>;
		pinctrl-names = "pmx_ts_active","pmx_ts_suspend",
		"pmx_ts_release";
		pinctrl-0 = <&ts_active>;
		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;
		pinctrl-2 = <&pmx_ts_release>;
		vdd-supply = <&L11A>;
		avdd-supply = <&L6A>;
		synaptics,pwr-reg-name = "avdd";
		synaptics,bus-reg-name = "vdd";
		synaptics,irq-gpio = <&tlmm 22 0x2008>;
		synaptics,irq-on-state = <0>;
		synaptics,reset-gpio = <&tlmm 21 0x00>;
		synaptics,reset-on-state = <0>;
		synaptics,reset-active-ms = <20>;
		synaptics,reset-delay-ms = <200>;
		synaptics,power-delay-ms = <200>;
		synaptics,ubl-i2c-addr = <0x20>;
		synaptics,extend_report;
		synaptics,firmware-name = "synaptics_firmware.img";

		panel = <&dsi_rm69299_visionox_amoled_video
		&dsi_rm69299_visionox_amoled_cmd>;
		};
		};

		&pm7250b_charger {
		status = "ok";
		#io-channel-cells = <1>;
		@@ -214,9 +289,7 @@
		qcom,use-cp-iin-sns;
		};

		&pm6150a_amoled {
		status = "ok";
		};
		#include "camera/holi-camera-sensor-mtp.dtsi"

		&pm7250b_charger {
		dpdm-supply = <&qusb_phy0>;