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 24d293e..0f2b3c0 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
@@ -64,11 +64,6 @@
                        no-map;
                };
 
-               camera_mem: memory@8ec00000 {
-                       reg = <0x0 0x8ec00000 0x0 0x500000>;
-                       no-map;
-               };
-
                venus_mem: memory@8f600000 {
                        reg = <0 0x8f600000 0 0x500000>;
                        no-map;
@@ -252,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 {
@@ -293,6 +273,7 @@
                        "Headphone Jack", "HPOL",
                        "Headphone Jack", "HPOR";
 
+               #sound-dai-cells = <0>;
                #address-cells = <1>;
                #size-cells = <0>;
 
@@ -316,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>;
                        };
                };
        };
@@ -335,8 +328,7 @@
                compatible = "jedec,spi-nor";
                reg = <0>;
 
-               /* TODO: Increase frequency after testing */
-               spi-max-frequency = <25000000>;
+               spi-max-frequency = <37500000>;
                spi-tx-bus-width = <2>;
                spi-rx-bus-width = <2>;
        };
@@ -564,10 +556,6 @@
                        #size-cells = <0>;
                };
 
-               pdupdate {
-                       compatible = "google,cros-ec-pd-update";
-               };
-
                typec {
                        compatible = "google,cros-ec-typec";
                        #address-cells = <1>;
@@ -655,6 +643,8 @@ edp_brij_i2c: &i2c2 {
                clocks = <&rpmhcc RPMH_LN_BB_CLK3>;
                clock-names = "refclk";
 
+               no-hpd;
+
                ports {
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -674,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>;
+                                       };
+                               };
+                       };
+               };
        };
 };
 
@@ -772,10 +777,14 @@ hp_i2c: &i2c9 {
                qcom,capture-sd-lines = <0>;
        };
 
-       mi2s@1 {
+       secondary_mi2s: mi2s@1 {
                reg = <MI2S_SECONDARY>;
                qcom,playback-sd-lines = <0>;
        };
+
+       hdmi-primary@0 {
+               reg = <LPASS_DP_RX>;
+       };
 };
 
 &mdp {
@@ -786,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>;
@@ -805,7 +823,7 @@ hp_i2c: &i2c9 {
        };
 };
 
-&pm6150_pwrkey {
+&pm6150_pon {
        status = "disabled";
 };
 
@@ -981,6 +999,7 @@ ap_spi_fp: &spi10 {
 &qspi_clk {
        pinconf {
                pins = "gpio63";
+               drive-strength = <8>;
                bias-disable;
        };
 };
@@ -1494,4 +1513,106 @@ ap_spi_fp: &spi10 {
                        drive-strength = <2>;
                };
        };
+
+       sdc1_on: sdc1-on {
+               pinconf-clk {
+                       pins = "sdc1_clk";
+                       bias-disable;
+                       drive-strength = <16>;
+               };
+
+               pinconf-cmd {
+                       pins = "sdc1_cmd";
+                       bias-pull-up;
+                       drive-strength = <10>;
+               };
+
+               pinconf-data {
+                       pins = "sdc1_data";
+                       bias-pull-up;
+                       drive-strength = <10>;
+               };
+
+               pinconf-rclk {
+                       pins = "sdc1_rclk";
+                       bias-pull-down;
+               };
+       };
+
+       sdc1_off: sdc1-off {
+               pinconf-clk {
+                       pins = "sdc1_clk";
+                       bias-disable;
+                       drive-strength = <2>;
+               };
+
+               pinconf-cmd {
+                       pins = "sdc1_cmd";
+                       bias-pull-up;
+                       drive-strength = <2>;
+               };
+
+               pinconf-data {
+                       pins = "sdc1_data";
+                       bias-pull-up;
+                       drive-strength = <2>;
+               };
+
+               pinconf-rclk {
+                       pins = "sdc1_rclk";
+                       bias-pull-down;
+               };
+       };
+
+       sdc2_on: sdc2-on {
+               pinconf-clk {
+                       pins = "sdc2_clk";
+                       bias-disable;
+                       drive-strength = <16>;
+               };
+
+               pinconf-cmd {
+                       pins = "sdc2_cmd";
+                       bias-pull-up;
+                       drive-strength = <10>;
+               };
+
+               pinconf-data {
+                       pins = "sdc2_data";
+                       bias-pull-up;
+                       drive-strength = <10>;
+               };
+
+               pinconf-sd-cd {
+                       pins = "gpio69";
+                       bias-pull-up;
+                       drive-strength = <2>;
+               };
+       };
+
+       sdc2_off: sdc2-off {
+               pinconf-clk {
+                       pins = "sdc2_clk";
+                       bias-disable;
+                       drive-strength = <2>;
+               };
+
+               pinconf-cmd {
+                       pins = "sdc2_cmd";
+                       bias-pull-up;
+                       drive-strength = <2>;
+               };
+
+               pinconf-data {
+                       pins = "sdc2_data";
+                       bias-pull-up;
+                       drive-strength = <2>;
+               };
+
+               pinconf-sd-cd {
+                       pins = "gpio69";
+                       bias-pull-up;
+                       drive-strength = <2>;
+               };
+       };
 };