Merge tag 'soc-dt-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / qcom / sm8550-qrd.dts

diff --git a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
index d401d63..92f0150 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
+++ b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
@@ -124,14 +124,21 @@
                                "SpkrRight IN", "WSA_SPK2 OUT",
                                "IN1_HPHL", "HPHL_OUT",
                                "IN2_HPHR", "HPHR_OUT",
+                               "AMIC1", "MIC BIAS1",
                                "AMIC2", "MIC BIAS2",
+                               "AMIC3", "MIC BIAS3",
+                               "AMIC4", "MIC BIAS3",
+                               "AMIC5", "MIC BIAS4",
                                "VA DMIC0", "MIC BIAS1",
                                "VA DMIC1", "MIC BIAS1",
                                "VA DMIC2", "MIC BIAS3",
                                "TX DMIC0", "MIC BIAS1",
                                "TX DMIC1", "MIC BIAS2",
                                "TX DMIC2", "MIC BIAS3",
-                               "TX SWR_ADC1", "ADC2_OUTPUT";
+                               "TX SWR_INPUT0", "ADC1_OUTPUT",
+                               "TX SWR_INPUT1", "ADC2_OUTPUT",
+                               "TX SWR_INPUT0", "ADC3_OUTPUT",
+                               "TX SWR_INPUT1", "ADC4_OUTPUT";
 
                wcd-playback-dai-link {
                        link-name = "WCD Playback";
@@ -724,6 +731,10 @@
                 <&usb_dp_qmpphy QMP_USB43DP_USB3_PIPE_CLK>;
 };
 
+&gpi_dma1 {
+       status = "okay";
+};
+
 &gpu {
        status = "okay";
 
@@ -960,6 +971,30 @@
        };
 };
 
+&spi4 {
+       status = "okay";
+
+       touchscreen@0 {
+               compatible = "goodix,gt9916";
+               reg = <0>;
+
+               interrupt-parent = <&tlmm>;
+               interrupts = <25 IRQ_TYPE_LEVEL_LOW>;
+
+               reset-gpios = <&tlmm 24 GPIO_ACTIVE_LOW>;
+
+               avdd-supply = <&vreg_l14b_3p2>;
+
+               spi-max-frequency = <1000000>;
+
+               touchscreen-size-x = <1080>;
+               touchscreen-size-y = <2400>;
+
+               pinctrl-names = "default";
+               pinctrl-0 = <&ts_irq>, <&ts_reset>;
+       };
+};
+
 &swr1 {
        status = "okay";
 
@@ -978,7 +1013,7 @@
        wcd_tx: codec@0,3 {
                compatible = "sdw20217010d00";
                reg = <0 3>;
-               qcom,tx-port-mapping = <1 1 2 3>;
+               qcom,tx-port-mapping = <2 2 3 4>;
        };
 };
 
@@ -1028,6 +1063,20 @@
                bias-pull-down;
        };
 
+       ts_irq: ts-irq-state {
+               pins = "gpio25";
+               function = "gpio";
+               drive-strength = <8>;
+               bias-pull-up;
+       };
+
+       ts_reset: ts-reset-state {
+               pins = "gpio24";
+               function = "gpio";
+               drive-strength = <8>;
+               bias-pull-up;
+       };
+
        wcd_default: wcd-reset-n-active-state {
                pins = "gpio108";
                function = "gpio";