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

Commit 3698b691 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add panel information to amoled-ecm for Lahaina platforms"

parents fe5129d5 9cadd4d7

bindings/hwmon/qcom,amoled-ecm.yaml

+6 −0
Original line number Diff line number Diff line
@@ -53,6 +53,12 @@ properties: 
      - const: ecm-sdam1

    $ref: /schemas/types.yaml#/definitions/string-array



  display-panels:

    minItems: 1

    description: Array of one or more phandles of the display panel(s)

      that sends the DRM blank/unblank notifications.

    $ref: /schemas/types.yaml#/definitions/phandle-array



required:

  - compatible

  - reg

qcom/lahaina-cdp.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -182,6 +182,15 @@ 
	status = "ok";

};



&pm8350b_amoled_ecm {

	display-panels = <&dsi_sw43404_amoled_cmd

			  &dsi_sw43404_amoled_video

			  &dsi_sw43404_amoled_fhd_plus_cmd

			  &dsi_r66451_amoled_cmd

			  &dsi_r66451_amoled_video

			  &dsi_sharp_qhd_plus_dsc_cmd>;

};



&pm8350c_switch0 {

	qcom,led-mask = <9>; /* Channels 1 & 4 */

	qcom,symmetry-en;

qcom/lahaina-mtp.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -163,6 +163,14 @@ 
	status = "ok";

};



&pm8350b_amoled_ecm {

	display-panels = <&dsi_sw43404_amoled_cmd

			  &dsi_sw43404_amoled_video

			  &dsi_sw43404_amoled_fhd_plus_cmd

			  &dsi_r66451_amoled_cmd

			  &dsi_r66451_amoled_video>;

};



&pm8350c_switch0 {

	qcom,led-mask = <9>; /* Channels 1 & 4 */

	qcom,symmetry-en;

qcom/lahaina-qrd-common.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -300,6 +300,11 @@ 
	};

};



&pm8350b_amoled_ecm {

	display-panels = <&dsi_r66451_amoled_cmd

			  &dsi_r66451_amoled_video>;

};



&soc {

	gpio_keys {

		compatible = "gpio-keys";

qcom/pm8350b.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ 
			};

		};



		qcom,amoled-ecm@f900 {

		pm8350b_amoled_ecm: qcom,amoled-ecm@f900 {

			compatible = "qcom,amoled-ecm";

			reg = <0xf900>;

			nvmem-names = "amoled-ecm-sdam0", "amoled-ecm-sdam1";