Skip to content

Commit 8c5ce90

Browse files
committed
Merge tag 'imx-dt-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/dt
i.MX ARM device tree for 6.8: - A bunch of changes from Fabio Estevam cleaning up dt-schema warnings. - A number of i.MX7 related small fixes and peripheral addition from Alexander Stein. - A set of changes from Hiago De Franco adding usdhc aliases for Apalis and Colibri boards. - A white-space cleanup from Krzysztof Kozlowski. - A change from Linus Walleij to correct errors in the Marvell MV88E6xxx switch descriptions. - Fix a couple of typo in comment for MBA6 and MBA6ULX board. - Add on-chip memory and enable MIPI-DSI support for i.MX7. - Add LM75A sensor for TQMA7 board. * tag 'imx-dt-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (41 commits) ARM: dts: imx27-phytec-phycore-som: Use 'rtc' as node name ARM: dts: imx25: Remove unneeded keypad properties ARM: dts: imx23/28: Fix the DMA controller node name ARM: dts: imx23-sansa: Use preferred i2c-gpios properties ARM: dts: imx27-apf27dev: Fix LED name ARM: dts: imx25/27: Pass timing0 ARM: dts: imx25: Fix the iim compatible string ARM: dts: imx25: Move usbphy nodes out of simple-bus ARM: dts: imx1: Use 'bus' for AIPI bus ARM: dts: imx27-phytec-phycore-rdk: Move usbphy nodes out of simple-bus ARM: dts: imx27-pdk: Move usbphy0 out of simple-bus ARM: dts: imx27: Use 'bus' for EMI bus ARM: dts: imx27: Use 'bus' for AIPI bus ARM: dts: imx27-phytec-phycore-som: Use the mux- prefix ARM: dts: imx1: Fix sram node ARM: dts: imx27: Fix sram node ARM: dts: imx: Use flash@0,0 pattern ARM: dts: imx25/27-eukrea: Fix RTC node name ARM: dts: imx25-pdk: Pass #sound-dai-cells ARM: dts: imx25: Pass I2C clock-names property ... Link: https://lore.kernel.org/r/20231216064605.876196-4-shawnguo@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents e802ed9 + 47360e4 commit 8c5ce90

56 files changed

Lines changed: 289 additions & 212 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

arch/arm/boot/dts/nxp/imx/imx1-ads.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
pinctrl-0 = <&pinctrl_weim>;
6666
status = "okay";
6767

68-
nor: nor@0,0 {
68+
nor: flash@0,0 {
6969
compatible = "cfi-flash";
7070
reg = <0 0x00000000 0x02000000>;
7171
bank-width = <4>;

arch/arm/boot/dts/nxp/imx/imx1-apf9328.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
pinctrl-0 = <&pinctrl_weim>;
4646
status = "okay";
4747

48-
nor: nor@0,0 {
48+
nor: flash@0,0 {
4949
compatible = "cfi-flash";
5050
reg = <0 0x00000000 0x02000000>;
5151
bank-width = <2>;

arch/arm/boot/dts/nxp/imx/imx1.dtsi

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
interrupt-parent = <&aitc>;
6969
ranges;
7070

71-
aipi@200000 {
71+
bus@200000 {
7272
compatible = "fsl,aipi-bus", "simple-bus";
7373
#address-cells = <1>;
7474
#size-cells = <1>;
@@ -155,7 +155,7 @@
155155
};
156156
};
157157

158-
aipi@210000 {
158+
bus@210000 {
159159
compatible = "fsl,aipi-bus", "simple-bus";
160160
#address-cells = <1>;
161161
#size-cells = <1>;
@@ -268,9 +268,12 @@
268268
status = "disabled";
269269
};
270270

271-
esram: esram@300000 {
271+
esram: sram@300000 {
272272
compatible = "mmio-sram";
273273
reg = <0x00300000 0x20000>;
274+
ranges = <0 0x00300000 0x20000>;
275+
#address-cells = <1>;
276+
#size-cells = <1>;
274277
};
275278
};
276279
};

arch/arm/boot/dts/nxp/imx/imx25-eukrea-cpuimx25.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
pinctrl-0 = <&pinctrl_i2c1>;
2828
status = "okay";
2929

30-
pcf8563@51 {
30+
rtc@51 {
3131
compatible = "nxp,pcf8563";
3232
reg = <0x51>;
3333
};

arch/arm/boot/dts/nxp/imx/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
bus-width = <18>;
1717
display-timings {
1818
native-mode = <&qvga_timings>;
19-
qvga_timings: 320x240 {
19+
qvga_timings: timing0 {
2020
clock-frequency = <6500000>;
2121
hactive = <320>;
2222
vactive = <240>;

arch/arm/boot/dts/nxp/imx/imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
bus-width = <18>;
1717
display-timings {
1818
native-mode = <&dvi_svga_timings>;
19-
dvi_svga_timings: 800x600 {
19+
dvi_svga_timings: timing0 {
2020
clock-frequency = <40000000>;
2121
hactive = <800>;
2222
vactive = <600>;

arch/arm/boot/dts/nxp/imx/imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
bus-width = <18>;
1717
display-timings {
1818
native-mode = <&dvi_vga_timings>;
19-
dvi_vga_timings: 640x480 {
19+
dvi_vga_timings: timing0 {
2020
clock-frequency = <31250000>;
2121
hactive = <640>;
2222
vactive = <480>;

arch/arm/boot/dts/nxp/imx/imx25-pdk.dts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
bus-width = <18>;
6969
display-timings {
7070
native-mode = <&wvga_timings>;
71-
wvga_timings: 640x480 {
71+
wvga_timings: timing0 {
7272
hactive = <640>;
7373
vactive = <480>;
7474
hback-porch = <45>;
@@ -122,6 +122,7 @@
122122
codec: sgtl5000@a {
123123
compatible = "fsl,sgtl5000";
124124
reg = <0x0a>;
125+
#sound-dai-cells = <0>;
125126
clocks = <&clks 129>;
126127
VDDA-supply = <&reg_2p5v>;
127128
VDDIO-supply = <&reg_3p3v>;

arch/arm/boot/dts/nxp/imx/imx25.dtsi

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,16 @@
6868
};
6969
};
7070

71+
usbphy0: usb-phy0 {
72+
compatible = "usb-nop-xceiv";
73+
#phy-cells = <0>;
74+
};
75+
76+
usbphy1: usb-phy1 {
77+
compatible = "usb-nop-xceiv";
78+
#phy-cells = <0>;
79+
};
80+
7181
soc: soc {
7282
#address-cells = <1>;
7383
#size-cells = <1>;
@@ -93,7 +103,7 @@
93103
compatible = "fsl,imx25-i2c", "fsl,imx21-i2c";
94104
reg = <0x43f80000 0x4000>;
95105
clocks = <&clks 48>;
96-
clock-names = "";
106+
clock-names = "ipg";
97107
interrupts = <3>;
98108
status = "disabled";
99109
};
@@ -104,7 +114,7 @@
104114
compatible = "fsl,imx25-i2c", "fsl,imx21-i2c";
105115
reg = <0x43f84000 0x4000>;
106116
clocks = <&clks 48>;
107-
clock-names = "";
117+
clock-names = "ipg";
108118
interrupts = <10>;
109119
status = "disabled";
110120
};
@@ -151,7 +161,7 @@
151161
compatible = "fsl,imx25-i2c", "fsl,imx21-i2c";
152162
reg = <0x43f98000 0x4000>;
153163
clocks = <&clks 48>;
154-
clock-names = "";
164+
clock-names = "ipg";
155165
interrupts = <4>;
156166
status = "disabled";
157167
};
@@ -178,12 +188,9 @@
178188
};
179189

180190
kpp: kpp@43fa8000 {
181-
#address-cells = <1>;
182-
#size-cells = <0>;
183191
compatible = "fsl,imx25-kpp", "fsl,imx21-kpp";
184192
reg = <0x43fa8000 0x4000>;
185193
clocks = <&clks 102>;
186-
clock-names = "";
187194
interrupts = <24>;
188195
status = "disabled";
189196
};
@@ -542,7 +549,7 @@
542549
};
543550

544551
iim: efuse@53ff0000 {
545-
compatible = "fsl,imx25-iim", "fsl,imx27-iim";
552+
compatible = "fsl,imx25-iim";
546553
reg = <0x53ff0000 0x4000>;
547554
interrupts = <19>;
548555
clocks = <&clks 99>;
@@ -597,7 +604,7 @@
597604
#size-cells = <1>;
598605
};
599606

600-
emi@80000000 {
607+
bus@80000000 {
601608
compatible = "fsl,emi-bus", "simple-bus";
602609
#address-cells = <1>;
603610
#size-cells = <1>;
@@ -617,22 +624,4 @@
617624
};
618625
};
619626
};
620-
621-
usbphy {
622-
compatible = "simple-bus";
623-
#address-cells = <1>;
624-
#size-cells = <0>;
625-
626-
usbphy0: usb-phy@0 {
627-
reg = <0>;
628-
compatible = "usb-nop-xceiv";
629-
#phy-cells = <0>;
630-
};
631-
632-
usbphy1: usb-phy@1 {
633-
reg = <1>;
634-
compatible = "usb-nop-xceiv";
635-
#phy-cells = <0>;
636-
};
637-
};
638627
};

arch/arm/boot/dts/nxp/imx/imx27-apf27dev.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
fsl,pcr = <0xfae80083>; /* non-standard but required */
1717
display-timings {
1818
native-mode = <&timing0>;
19-
timing0: 800x480 {
19+
timing0: timing0 {
2020
clock-frequency = <33000033>;
2121
hactive = <800>;
2222
vactive = <480>;
@@ -47,7 +47,7 @@
4747
pinctrl-names = "default";
4848
pinctrl-0 = <&pinctrl_gpio_leds>;
4949

50-
user {
50+
led-user {
5151
label = "Heartbeat";
5252
gpios = <&gpio6 14 GPIO_ACTIVE_HIGH>;
5353
linux,default-trigger = "heartbeat";

0 commit comments

Comments
 (0)