arm64: dts: qcom: Unify the sc7180-trogdor panel nodes

Let's avoid a bit of duplication by pushing this up to the trogdor.dtsi
file.

Suggested-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/20210301133318.v2.4.I1483fac4c5ae4b2d7660290ff85d69945292618f@changeid
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
index 11269522da508f899b619d2a68e73224d208bd52..5efa04d0d256b435b725074761908e4f8adf8c08 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
@@ -12,23 +12,6 @@ ap_h1_spi: &spi0 {};
 
 #include "sc7180-trogdor.dtsi"
 
-/ {
-       panel: panel {
-               compatible = "boe,nv133fhm-n62";
-               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>;
-                               };
-                       };
-               };
-       };
-};
-
 &ap_sar_sensor {
        semtech,cs0-ground;
        semtech,combined-sensors = <3>;
@@ -58,6 +41,10 @@ ap_ts_pen_1v8: &i2c4 {
        };
 };
 
+&panel {
+       compatible = "boe,nv133fhm-n62";
+};
+
 &trackpad {
        interrupts = <58 IRQ_TYPE_EDGE_FALLING>;
 };

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts
index bd2c783e0f2f672529347f40b65f2814e521e62b..2b522f9e0d8ff07b7758fcb085ebda6f89e5141f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts
@@ -17,21 +17,6 @@ ap_h1_spi: &spi0 {};
 / {
        model = "Google Trogdor (rev1+)";
        compatible = "google,trogdor", "qcom,sc7180";
-
-       panel: panel {
-               compatible = "auo,b116xa01";
-               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>;
-                               };
-                       };
-               };
-       };
 };
 
 ap_ts_pen_1v8: &i2c4 {
@@ -53,6 +38,10 @@ ap_ts_pen_1v8: &i2c4 {
        };
 };
 
+&panel {
+       compatible = "auo,b116xa01";
+};
+
 &pp3300_hub {
        /* pp3300_l7c is used to power the USB hub */
        /delete-property/regulator-always-on;

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
index b471503e415eb3024e0d5d9dd447a9f08edd50d9..7341fe6e2c0b52c721048c1afbe54ea2fa09d33f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
@@ -257,6 +257,21 @@
                #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 {