Merge tag 'for-5.15/io_uring-2021-09-04' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / qcom / sc7180-trogdor.dtsi

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
index 77ae756..0f2b3c0 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
@@ -247,29 +247,14 @@
                };
        };
 
-       max98357a: audio-codec-0 {
-               compatible = "maxim,max98357a";
+       max98360a: audio-codec-0 {
+               compatible = "maxim,max98360a";
                pinctrl-names = "default";
                pinctrl-0 = <&amp_en>;
                sdmode-gpios = <&tlmm 23 GPIO_ACTIVE_HIGH>;
                #sound-dai-cells = <0>;
        };
 
-       panel: panel {
-               /* Compatible will be filled in per-board */
-               power-supply = <&pp3300_dx_edp>;
-               backlight = <&backlight>;
-               hpd-gpios = <&sn65dsi86_bridge 2 GPIO_ACTIVE_HIGH>;
-
-               ports {
-                       port {
-                               panel_in_edp: endpoint {
-                                       remote-endpoint = <&sn65dsi86_out>;
-                               };
-                       };
-               };
-       };
-
        pwmleds {
                compatible = "pwm-leds";
                keyboard_backlight: keyboard-backlight {
@@ -288,6 +273,7 @@
                        "Headphone Jack", "HPOL",
                        "Headphone Jack", "HPOR";
 
+               #sound-dai-cells = <0>;
                #address-cells = <1>;
                #size-cells = <0>;
 
@@ -311,7 +297,19 @@
                        };
 
                        sound_multimedia1_codec: codec {
-                               sound-dai = <&max98357a>;
+                               sound-dai = <&max98360a>;
+                       };
+               };
+
+               dai-link@2 {
+                       link-name = "MultiMedia2";
+                       reg = <2>;
+                       cpu {
+                               sound-dai = <&lpass_cpu 2>;
+                       };
+
+                       codec {
+                               sound-dai = <&mdss_dp>;
                        };
                };
        };
@@ -666,6 +664,21 @@ edp_brij_i2c: &i2c2 {
                                };
                        };
                };
+
+               aux-bus {
+                       panel: panel {
+                               /* Compatible will be filled in per-board */
+                               power-supply = <&pp3300_dx_edp>;
+                               backlight = <&backlight>;
+                               hpd-gpios = <&sn65dsi86_bridge 2 GPIO_ACTIVE_HIGH>;
+
+                               port {
+                                       panel_in_edp: endpoint {
+                                               remote-endpoint = <&sn65dsi86_out>;
+                                       };
+                               };
+                       };
+               };
        };
 };
 
@@ -768,6 +781,10 @@ hp_i2c: &i2c9 {
                reg = <MI2S_SECONDARY>;
                qcom,playback-sd-lines = <0>;
        };
+
+       hdmi-primary@0 {
+               reg = <LPASS_DP_RX>;
+       };
 };
 
 &mdp {
@@ -778,6 +795,15 @@ hp_i2c: &i2c9 {
        status = "okay";
 };
 
+&mdss_dp {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&dp_hot_plug_det>;
+       data-lanes = <0 1>;
+       vdda-1p2-supply = <&vdda_usb_ss_dp_1p2>;
+       vdda-0p9-supply = <&vdda_usb_ss_dp_core>;
+};
+
 &pm6150_adc {
        charger-thermistor@4f {
                reg = <ADC5_AMUX_THM3_100K_PU>;