Commit c7cf6733 authored Nov 23, 2020 by Arnd Bergmann

Merge tag 'ux500-dts-for-v5.11-1' of...

Merge tag 'ux500-dts-for-v5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into arm/dt

Ux500 DTS updates for the v5.11 kernels:

- Rename the DSI controllers to match the preferred
  schema.
- Pull down the SDI2 feedback clock on the Skomer.
- Add proper supplies to the MaxToch touchscreen on
  the Golden.

* tag 'ux500-dts-for-v5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: dts: ux500-golden: Add proper supplies to touchscreen
  ARM: dts: ux500: skomer: Pull down SDI2 FBCLK
  ARM: dts: ux500: Rename DSI controller nodes

Link: https://lore.kernel.org/r/CACRpkdY_M4xj++QhRPqX6N3x9YmFNJkz70DnvBj7Ai-dOtCJSQ@mail.gmail.com


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents b2d91953 ef5704b5

arch/arm/boot/dts/ste-ab8500.dtsi

+3 −3

Original line number	Diff line number	Diff line
		@@ -326,13 +326,13 @@ sound {
		mcde@a0350000 {
		vana-supply = <&ab8500_ldo_ana_reg>;

		dsi-controller@a0351000 {
		dsi@a0351000 {
		vana-supply = <&ab8500_ldo_ana_reg>;
		};
		dsi-controller@a0352000 {
		dsi@a0352000 {
		vana-supply = <&ab8500_ldo_ana_reg>;
		};
		dsi-controller@a0353000 {
		dsi@a0353000 {
		vana-supply = <&ab8500_ldo_ana_reg>;
		};
		};

arch/arm/boot/dts/ste-ab8505.dtsi

+3 −3

Original line number	Diff line number	Diff line
		@@ -261,13 +261,13 @@ sound {
		mcde@a0350000 {
		vana-supply = <&ab8500_ldo_ana_reg>;

		dsi-controller@a0351000 {
		dsi@a0351000 {
		vana-supply = <&ab8500_ldo_ana_reg>;
		};
		dsi-controller@a0352000 {
		dsi@a0352000 {
		vana-supply = <&ab8500_ldo_ana_reg>;
		};
		dsi-controller@a0353000 {
		dsi@a0353000 {
		vana-supply = <&ab8500_ldo_ana_reg>;
		};
		};

arch/arm/boot/dts/ste-dbx5x0.dtsi

+3 −3

Original line number	Diff line number	Diff line
		@@ -1097,7 +1097,7 @@ mcde@a0350000 {
		ranges;
		status = "disabled";

		dsi0: dsi-controller@a0351000 {
		dsi0: dsi@a0351000 {
		compatible = "ste,mcde-dsi";
		reg = <0xa0351000 0x1000>;
		clocks = <&prcmu_clk PRCMU_DSI0CLK>, <&prcmu_clk PRCMU_DSI0ESCCLK>;
		@@ -1105,7 +1105,7 @@ dsi0: dsi-controller@a0351000 {
		#address-cells = <1>;
		#size-cells = <0>;
		};
		dsi1: dsi-controller@a0352000 {
		dsi1: dsi@a0352000 {
		compatible = "ste,mcde-dsi";
		reg = <0xa0352000 0x1000>;
		clocks = <&prcmu_clk PRCMU_DSI1CLK>, <&prcmu_clk PRCMU_DSI1ESCCLK>;
		@@ -1113,7 +1113,7 @@ dsi1: dsi-controller@a0352000 {
		#address-cells = <1>;
		#size-cells = <0>;
		};
		dsi2: dsi-controller@a0353000 {
		dsi2: dsi@a0353000 {
		compatible = "ste,mcde-dsi";
		reg = <0xa0353000 0x1000>;
		/* This DSI port only has the Low Power / Energy Save clock */

arch/arm/boot/dts/ste-href-stuib.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -199,7 +199,7 @@ stuib_cfg2 {
		mcde@a0350000 {
		status = "okay";

		dsi-controller@a0351000 {
		dsi@a0351000 {
		panel {
		compatible = "samsung,s6d16d0";
		reg = <0>;

arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,7 @@ lis331dl@1c {
		mcde@a0350000 {
		status = "okay";

		dsi-controller@a0351000 {
		dsi@a0351000 {
		panel {
		compatible = "samsung,s6d16d0";
		reg = <0>;