Commit f415e0f5 authored by Douglas Anderson's avatar Douglas Anderson Committed by Bjorn Andersson
Browse files

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: default avatarStephen Boyd <swboyd@chromium.org>
Signed-off-by: default avatarDouglas Anderson <dianders@chromium.org>
Reviewed-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Reviewed-by: default avatarStephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/20210301133318.v2.4.I1483fac4c5ae4b2d7660290ff85d69945292618f@changeid


Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent ce250024

arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi

+4 −17
Original line number Diff line number Diff line
@@ -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>;

};

arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts

+4 −15
Original line number Diff line number Diff line
@@ -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;

arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi

+15 −0
Original line number Diff line number Diff line
@@ -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 {