Skip to content

Commit f01448a

Browse files
arndbarndb
committed
i.MX ARM device tree change for 6.11: - A few changes from Krzysztof Kozlowski to fix dtschema issues - A series from Michael Walle to improve kontron-samx6i SoM support by fixing various errors and add kontron-samx6i-ads2 board - Add LVDS port data mapping for M53 Menlo board - Convert NVMEM usage to layout syntax on MBA6 boards * tag 'imx-dt-6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: dts: imx6qdl-kontron-samx6i: add actual device trees ARM: dts: imx6qdl-kontron-samx6i: remove wake-up-gpio property ARM: dts: imx6qdl-kontron-samx6i: fix PCIe reset polarity ARM: dts: imx6qdl-kontron-samx6i: fix node names ARM: dts: imx6qdl-kontron-samx6i: add SDIO_PWR_EN support ARM: dts: imx6qdl-kontron-samx6i: always enable eMMC ARM: dts: imx6qdl-kontron-samx6i: fix product name ARM: dts: imx6qdl-kontron-samx6i: fix SPI0 chip selects ARM: dts: imx6qdl-kontron-samx6i: cleanup the PMIC node ARM: dts: imx6qdl-kontron-samx6i: fix board reset ARM: dts: imx6qdl-kontron-samx6i: fix PHY reset ARM: dts: imx6qdl-kontron-samx6i: fix phy-mode ARM: dts: nxp: imx6: convert NVMEM content to layout syntax ARM: dts: e60k02: fix aliases for mmc ARM: dts: imx: Add LVDS port data mapping on M53 Menlo ARM: dts: imx28-tx28: drop redundant 'panel-name' property ARM: dts: imx: drop redundant 'u-boot,panel-name' property ARM: dts: imx6dl-aristainetos2_4: drop redundant 'power-on-delay' property ARM: dts: imx: correct choice of panel native mode ARM: dts: imx: align panel timings node name with dtschema Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 07fd5cc + dac1c50 commit f01448a

31 files changed

+287
-123
lines changed

‎arch/arm/boot/dts/nxp/imx/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
9999
imx6dl-icore.dtb \
100100
imx6dl-icore-mipi.dtb \
101101
imx6dl-icore-rqs.dtb \
102+
imx6dl-kontron-samx6i-ads2.dtb \
102103
imx6dl-lanmcu.dtb \
103104
imx6dl-mamoj.dtb \
104105
imx6dl-mba6a.dtb \
@@ -207,6 +208,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
207208
imx6q-icore-ofcap10.dtb \
208209
imx6q-icore-ofcap12.dtb \
209210
imx6q-icore-rqs.dtb \
211+
imx6q-kontron-samx6i-ads2.dtb \
210212
imx6q-kp-tpc.dtb \
211213
imx6q-logicpd.dtb \
212214
imx6q-marsboard.dtb \

‎arch/arm/boot/dts/nxp/imx/e60k02.dtsi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
#include <dt-bindings/input/input.h>
1515

1616
/ {
17+
aliases {
18+
mmc0 = &usdhc2;
19+
mmc1 = &usdhc3;
20+
};
1721

1822
chosen {
1923
stdout-path = &uart1;

‎arch/arm/boot/dts/nxp/imx/imx51-apf51dev.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
pinctrl-0 = <&pinctrl_ipu_disp1>;
2626

2727
display-timings {
28-
lw700 {
29-
native-mode;
28+
native-mode = <&timing0>;
29+
timing0: timing-lw700 {
3030
clock-frequency = <33000033>;
3131
hactive = <800>;
3232
vactive = <480>;

‎arch/arm/boot/dts/nxp/imx/imx51-babbage.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
status = "disabled";
9090
display-timings {
9191
native-mode = <&timing1>;
92-
timing1: claawvga {
92+
timing1: timing-claawvga {
9393
clock-frequency = <27000000>;
9494
hactive = <800>;
9595
vactive = <480>;

‎arch/arm/boot/dts/nxp/imx/imx51-ts4800.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
pinctrl-0 = <&pinctrl_lcd>;
5959

6060
display-timings {
61-
800x480p60 {
62-
native-mode;
61+
native-mode = <&timing0>;
62+
timing0: timing-800x480p60 {
6363
clock-frequency = <30066000>;
6464
hactive = <800>;
6565
vactive = <480>;

‎arch/arm/boot/dts/nxp/imx/imx53-m53evk.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
pinctrl-0 = <&pinctrl_ipu_disp1>;
1818

1919
display-timings {
20-
800x480p60 {
21-
native-mode;
20+
native-mode = <&timing0>;
21+
timing0: timing-800x480p60 {
2222
clock-frequency = <31500000>;
2323
hactive = <800>;
2424
vactive = <480>;

‎arch/arm/boot/dts/nxp/imx/imx53-m53menlo.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
reg = <0>;
6565

6666
lvds_decoder_in: endpoint {
67+
data-mapping = "jeida-18";
6768
remote-endpoint = <&lvds0_out>;
6869
};
6970
};

‎arch/arm/boot/dts/nxp/imx/imx53-tx53-x03x.dts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
};
6868

6969
display-timings {
70-
VGA {
70+
timing-vga {
7171
clock-frequency = <25200000>;
7272
hactive = <640>;
7373
vactive = <480>;
@@ -83,7 +83,7 @@
8383
pixelclk-active = <0>;
8484
};
8585

86-
ETV570 {
86+
timing-etc570 {
8787
clock-frequency = <25200000>;
8888
hactive = <640>;
8989
vactive = <480>;
@@ -99,7 +99,7 @@
9999
pixelclk-active = <0>;
100100
};
101101

102-
ET0350 {
102+
timing-et0350 {
103103
clock-frequency = <6413760>;
104104
hactive = <320>;
105105
vactive = <240>;
@@ -115,7 +115,7 @@
115115
pixelclk-active = <0>;
116116
};
117117

118-
ET0430 {
118+
timing-et0430 {
119119
clock-frequency = <9009000>;
120120
hactive = <480>;
121121
vactive = <272>;
@@ -131,7 +131,7 @@
131131
pixelclk-active = <1>;
132132
};
133133

134-
ET0500 {
134+
timing-et0500 {
135135
clock-frequency = <33264000>;
136136
hactive = <800>;
137137
vactive = <480>;
@@ -147,7 +147,7 @@
147147
pixelclk-active = <0>;
148148
};
149149

150-
ET0700 { /* same as ET0500 */
150+
timing-et0700 { /* same as ET0500 */
151151
clock-frequency = <33264000>;
152152
hactive = <800>;
153153
vactive = <480>;
@@ -163,7 +163,7 @@
163163
pixelclk-active = <0>;
164164
};
165165

166-
ETQ570 {
166+
timing-etq570 {
167167
clock-frequency = <6596040>;
168168
hactive = <320>;
169169
vactive = <240>;

‎arch/arm/boot/dts/nxp/imx/imx53-tx53-x13x.dts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
display-timings {
192192
native-mode = <&lvds0_timing0>;
193193

194-
lvds0_timing0: hsd100pxn1 {
194+
lvds0_timing0: timing-hsd100pxn1 {
195195
clock-frequency = <65000000>;
196196
hactive = <1024>;
197197
vactive = <768>;
@@ -207,7 +207,7 @@
207207
pixelclk-active = <1>;
208208
};
209209

210-
lvds0_timing1: nl12880bc20 {
210+
lvds0_timing1: timing-nl12880bc20 {
211211
clock-frequency = <71000000>;
212212
hactive = <1280>;
213213
vactive = <800>;
@@ -233,7 +233,7 @@
233233
display-timings {
234234
native-mode = <&lvds1_timing0>;
235235

236-
lvds1_timing0: hsd100pxn1 {
236+
lvds1_timing0: timing-hsd100pxn1 {
237237
clock-frequency = <65000000>;
238238
hactive = <1024>;
239239
vactive = <768>;

‎arch/arm/boot/dts/nxp/imx/imx6dl-aristainetos2_4.dts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,10 @@
8282
compatible = "lg,lg4573";
8383
spi-max-frequency = <10000000>;
8484
reg = <0>;
85-
power-on-delay = <10>;
8685

8786
display-timings {
88-
480x800p57 {
89-
native-mode;
87+
native-mode = <&timing0>;
88+
timing0: timing-480x800p57 {
9089
clock-frequency = <27000027>;
9190
hactive = <480>;
9291
vactive = <800>;

0 commit comments

Comments
 (0)