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

[sfrench/cifs-2.6.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 70c88c37de321028c55c6af40e2e62138e49cbc3..d4f4441179fcc0c2bc1511a92e3e074fcc2d2d19 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
@@ -601,15 +601,6 @@
 &dsi0 {
        status = "okay";
        vdda-supply = <&vdda_mipi_dsi0_1p2>;
-
-       ports {
-               port@1 {
-                       endpoint {
-                               remote-endpoint = <&sn65dsi86_in>;
-                               data-lanes = <0 1 2 3>;
-                       };
-               };
-       };
 };
 
 &dsi_phy {
@@ -617,70 +608,6 @@
        vdds-supply = <&vdda_mipi_dsi0_pll>;
 };
 
-edp_brij_i2c: &i2c2 {
-       status = "okay";
-       clock-frequency = <400000>;
-
-       sn65dsi86_bridge: bridge@2d {
-               compatible = "ti,sn65dsi86";
-               reg = <0x2d>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&edp_brij_en>, <&edp_brij_irq>;
-               gpio-controller;
-               #gpio-cells = <2>;
-
-               interrupt-parent = <&tlmm>;
-               interrupts = <11 IRQ_TYPE_LEVEL_HIGH>;
-
-               enable-gpios = <&tlmm 104 GPIO_ACTIVE_HIGH>;
-
-               vpll-supply = <&pp1800_edp_vpll>;
-               vccio-supply = <&pp1800_brij_vccio>;
-               vcca-supply = <&pp1200_brij>;
-               vcc-supply = <&pp1200_brij>;
-
-               clocks = <&rpmhcc RPMH_LN_BB_CLK3>;
-               clock-names = "refclk";
-
-               no-hpd;
-
-               ports {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       port@0 {
-                               reg = <0>;
-                               sn65dsi86_in: endpoint {
-                                       remote-endpoint = <&dsi0_out>;
-                               };
-                       };
-
-                       port@1 {
-                               reg = <1>;
-                               sn65dsi86_out: endpoint {
-                                       data-lanes = <0 1>;
-                                       remote-endpoint = <&panel_in_edp>;
-                               };
-                       };
-               };
-
-               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>;
-                                       };
-                               };
-                       };
-               };
-       };
-};
-
 ap_sar_sensor_i2c: &i2c5 {
        clock-frequency = <400000>;
 
@@ -750,17 +677,6 @@ hp_i2c: &i2c9 {
        };
 };
 
-&ipa {
-       status = "okay";
-
-       /*
-        * Trogdor doesn't have QHEE (Qualcomm's EL2 blob), so the
-        * modem needs to cover certain init steps (GSI init), and
-        * the AP needs to wait for it.
-        */
-       modem-init;
-};
-
 &lpass_cpu {
        status = "okay";
 
@@ -1244,19 +1160,6 @@ ap_spi_fp: &spi10 {
                };
        };
 
-       edp_brij_irq: edp-brij-irq {
-               pinmux {
-                       pins = "gpio11";
-                       function = "gpio";
-               };
-
-               pinconf {
-                       pins = "gpio11";
-                       drive-strength = <2>;
-                       bias-pull-down;
-               };
-       };
-
        en_pp3300_codec: en-pp3300-codec {
                pinmux {
                        pins = "gpio83";
@@ -1523,13 +1426,13 @@ ap_spi_fp: &spi10 {
                pinconf-cmd {
                        pins = "sdc1_cmd";
                        bias-pull-up;
-                       drive-strength = <10>;
+                       drive-strength = <16>;
                };
 
                pinconf-data {
                        pins = "sdc1_data";
                        bias-pull-up;
-                       drive-strength = <10>;
+                       drive-strength = <16>;
                };
 
                pinconf-rclk {