mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-05 09:49:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Arnd Bergmann
2020-11-23 17:15:25 +01:00
parent b2d91953b6 ef5704b535
commit c7cf673399
8 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/boot/dts/ste-ab8500.dtsi
View File

@@ -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>;
};
};

6
arch/arm/boot/dts/ste-ab8505.dtsi
View File

@@ -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>;
};
};

6
arch/arm/boot/dts/ste-dbx5x0.dtsi
View File

@@ -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 */

2
arch/arm/boot/dts/ste-href-stuib.dtsi
View File

@@ -199,7 +199,7 @@ stuib_cfg2 {
mcde@a0350000 {
status = "okay";
dsi-controller@a0351000 {
dsi@a0351000 {
panel {
compatible = "samsung,s6d16d0";
reg = <0>;

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

@@ -66,7 +66,7 @@ lis331dl@1c {
mcde@a0350000 {
status = "okay";
dsi-controller@a0351000 {
dsi@a0351000 {
panel {
compatible = "samsung,s6d16d0";
reg = <0>;

2
arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi
View File

@@ -45,7 +45,7 @@ lis3dh@18 {
mcde@a0350000 {
status = "okay";
dsi-controller@a0351000 {
dsi@a0351000 {
panel {
compatible = "sony,acx424akp";
reg = <0>;

9
arch/arm/boot/dts/ste-ux500-samsung-golden.dts
View File

@@ -260,6 +260,11 @@ touchscreen@4a {
interrupt-parent = <&gpio6>;
interrupts = <26 IRQ_TYPE_EDGE_FALLING>;
/* VDDA is "analog supply", 2.57-3.47 V */
vdda-supply = <&ab8500_ldo_aux2_reg>;
/* VDD is "digital supply" 1.71-3.47V */
vdd-supply = <&ab8500_ldo_aux5_reg>;
pinctrl-names = "default";
pinctrl-0 = <&tsp_default>;
};
@@ -284,7 +289,6 @@ ab8500_ldo_aux2 {
regulator-name = "vreg_tsp_a3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on; /* FIXME */
};
ab8500_ldo_aux3 {
@@ -301,7 +305,6 @@ ab8500_ldo_aux5 {
regulator-name = "vreg_tsp_1v8";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on; /* FIXME */
};
ab8500_ldo_aux6 {
@@ -322,7 +325,7 @@ mcde@a0350000 {
pinctrl-names = "default";
pinctrl-0 = <&dsi_default_mode>;
dsi-controller@a0351000 {
dsi@a0351000 {
panel@0 {
compatible = "samsung,s6e63m0";
reg = <0>;

12
arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
View File

@@ -393,7 +393,7 @@ mcde@a0350000 {
pinctrl-names = "default";
pinctrl-0 = <&dsi_default_mode>;
dsi-controller@a0351000 {
dsi@a0351000 {
panel {
/* NT35510-based Hydis HVA40WV1 */
compatible = "hydis,hva40wv1", "novatek,nt35510";
@@ -433,6 +433,16 @@ default_cfg5 {
};
};
/* The unused FBCLK needs to be pulled down on this machine */
sdi2 {
mc2_a_1_default {
default_cfg2 {
pins = "GPIO130_C8"; /* FBCLK */
ste,config = <&in_pd>;
};
};
};
mcde {
dsi_default_mode: dsi_default {
default_mux1 {