Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d09e162 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: move common nodes to sde display for SM8150" into dev/msm-4.14-display

parents 68121b60 88a0dc6f

arch/arm64/boot/dts/qcom/sm8150-qrd.dtsi

+0 −29
Original line number Diff line number Diff line
@@ -164,35 +164,6 @@ 
	};

};



&tlmm {

	display_panel_avdd_eldo_default: display_panel_avdd_eldo_default {

		mux {

			pins = "gpio130";

			function = "gpio";

		};

		config {

			pins = "gpio130";

			drive-strength = <8>;

			bias-disable = <0>;

			output-low;

		};

	};

};



&soc {

	display_panel_avdd_eldo: display-gpio-regulator@0 {

		compatible = "regulator-fixed";

		regulator-name = "display_panel_avdd_eldo";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		regulator-enable-ramp-delay = <233>;

		gpio = <&tlmm 130 0>;

		enable-active-high;

		pinctrl-names = "default";

		pintctrl-0 = <&display_panel_avdd_eldo_default>;

	};

};



&dsi_panel_pwr_supply_vdd_no_labibb {

	qcom,panel-supply-entry@1 {

		qcom,supply-min-voltage = <1800000>;

arch/arm64/boot/dts/qcom/sm8150-sde-display.dtsi

+28 −0
Original line number Diff line number Diff line
@@ -30,6 +30,21 @@ 
#include "dsi-panel-sw43404-amoled-dsc-wqhd-cmd.dtsi"

#include <dt-bindings/clock/mdss-10nm-pll-clk.h>



&tlmm {

	display_panel_avdd_eldo_default: display_panel_avdd_eldo_default {

		mux {

			pins = "gpio130";

			function = "gpio";

		};

		config {

			pins = "gpio130";

			drive-strength = <8>;

			bias-disable = <0>;

			output-low;

		};

	};

};



&soc {

	dsi_panel_pwr_supply: dsi_panel_pwr_supply {

		#address-cells = <1>;
@@ -105,6 +120,18 @@ 
		};

	};



	display_panel_avdd_eldo: display-gpio-regulator@0 {

		compatible = "regulator-fixed";

		regulator-name = "display_panel_avdd_eldo";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		regulator-enable-ramp-delay = <233>;

		gpio = <&tlmm 130 0>;

		enable-active-high;

		pinctrl-names = "default";

		pintctrl-0 = <&display_panel_avdd_eldo_default>;

	};



	dsi_sharp_4k_dsc_video_display: qcom,dsi-display@0 {

		label = "dsi_sharp_4k_dsc_video_display";

		qcom,display-type = "primary";
@@ -315,6 +342,7 @@ 
		vddio-supply = <&pm855_l14>;

		lab-supply = <&lcdb_ldo_vreg>;

		ibb-supply = <&lcdb_ncp_vreg>;

		vdd-supply = <&display_panel_avdd_eldo>;



		qcom,dsi-display-list =

			<&dsi_sharp_4k_dsc_video_display