Let's avoid a bit of duplication by pushing this up to the trogdor.dtsi
file.
Signed-off-by: Douglas Anderson
---
.../boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 21 ---
.../arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 19 -
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 15 +
3 files changed, 23 insertions(+), 32 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
index 11269522da50..5efa04d0d256 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
@@ -12,23 +12,6 @@
#include "sc7180-trogdor.dtsi"
-/ {
- panel: panel {
- compatible = "boe,nv133fhm-n62";
- power-supply = <_dx_edp>;
- backlight = <>;
- hpd-gpios = <_bridge 2 GPIO_ACTIVE_HIGH>;
-
- ports {
- port {
- panel_in_edp: endpoint {
- remote-endpoint = <_out>;
- };
- };
- };
- };
-};
-
_sar_sensor {
semtech,cs0-ground;
semtech,combined-sensors = <3>;
@@ -58,6 +41,10 @@ ap_ts: touchscreen@10 {
};
};
+ {
+ compatible = "boe,nv133fhm-n62";
+};
+
{
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 bd2c783e0f2f..2b522f9e0d8f 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts
@@ -17,21 +17,6 @@
/ {
model = "Google Trogdor (rev1+)";
compatible = "google,trogdor", "qcom,sc7180";
-
- panel: panel {
- compatible = "auo,b116xa01";
- power-supply = <_dx_edp>;
- backlight = <>;
- hpd-gpios = <_bridge 2 GPIO_ACTIVE_HIGH>;
-
- ports {
- port {
- panel_in_edp: endpoint {
- remote-endpoint = <_out>;
- };
- };
- };
- };
};
ap_ts_pen_1v8: {
@@ -53,6 +38,10 @@ ap_ts: touchscreen@10 {
};
};
+ {
+ compatible = "auo,b116xa01";
+};
+
_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 4ad27b5c34d1..9fcb19a0501f 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
@@ -255,6 +255,21 @@ max98357a: audio-codec-0 {
#sound-dai-cells = <0>;
};
+ panel: panel {
+ /* Compatible will be filled in per-board */
+ power-supply = <_dx_edp>;
+ backlight = <>;
+ hpd-gpios = <_bridge 2 GPIO_ACTIVE_HIGH>;
+
+ ports {
+ port {
+ panel_in_edp: endpoint {
+ remote-endpoint = <_out>;
+ };
+ };
+ };
+ };
+
pwmleds {
compatible = "pwm-leds";
keyboard_backlight: keyboard-backlight {
--
2.30.1.766.gb4fecdf3b7-goog
