Skip to content

Commit 58982e1

Browse files
arndbarndb
committed
Merge tag 'imx-dt64-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/dt
i.MX arm64 device tree changes for 6.4: - New board device trees: Apalis quadmax, DH electronics i.MX8M Plus DHCOM and PDK3, Data Modul i.MX8M Plus eDM SBC, Colibri Aster and Iris, etc. - Add FlexSPI, BBNSM and TPM PWM devices for i.MX93 SoC. - A series of imx8mq-librem5 udpates which includes minor fixes, magnetometer, CSI/camera support, and powersaving improvements. - Add Cadence USB3 support for i.MX8QXP. - Add FlexCAN support for i.MX8QXP and i.MX8QM. - Add UART DMA support for i.MX8MQ. - Add GPT devices for i.MX8MP. - Add VPU decoder and encoder support for i.MX8QM. - Add display pipeline and PCIe EP support for i.MX8M family SoCs. - A series from Peng Fan updating various i.MX8M device trees to pinctrl nodes match DT schema. - A series from Philippe Schenker improving colibri-imx8x device trees in various aspects. - Other random device tree updates. * tag 'imx-dt64-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (87 commits) arm64: dts: imx8mp: Add support for Data Modul i.MX8M Plus eDM SBC arm64: dts: imx8mp: Add display pipeline components arm64: dts: imx8mn: Add display pipeline components arm64: dts: imx8mm: Add display pipeline components arm64: dts: freescale: imx8qxp-mek: enable cadence usb3 arm64: dts: imx8qxp: add cadence usb3 support arm64: dts: imx8mq-librem5: add missing #clock-cells arm64: dts: imx8mm-prt8mm: update pinctrl to match dtschema arm64: dts: imx8mn-bsh-smm: update pinctrl to match dtschema arm64: dts: imx8mm-emcon: update pinctrl to match dtschema arm64: dts: imx8mq-librem5: update pinctrl to match dtschema arm64: dts: imx8mm-ddr4-evk: update gpmi pinctrl to match dtschema arm64: dts: imx8mn-evk: update i2c pinctrl to match dtschema arm64: dts: imx8mp: Add GPT blocks arm64: dts: imx8-apalis-v1.1: drop ci-disable-lpm arm64: dts: imx8dxl: drop clocks from scu clock controller arm64: dts: imx8mp: verdin-yavia: drop disable-over-current arm64: dts: imx8mq: tqma8mq-mba8mx: drop disable-over-current arm64: dts: imx8mp: Add support for DH electronics i.MX8M Plus DHCOM and PDK3 arm64: dts: colibri-imx8x: Add iris v2 carrier board ... Link: https://lore.kernel.org/r/20230408101928.280271-5-shawnguo@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 0efb9fa + 562d222 commit 58982e1

66 files changed

Lines changed: 5912 additions & 745 deletions

Some content is hidden

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

‎arch/arm64/boot/dts/freescale/Makefile‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,10 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mn-tqma8mqnl-mba8mx.dtb
8989
dtb-$(CONFIG_ARCH_MXC) += imx8mn-var-som-symphony.dtb
9090
dtb-$(CONFIG_ARCH_MXC) += imx8mn-venice-gw7902.dtb
9191
dtb-$(CONFIG_ARCH_MXC) += imx8mp-beacon-kit.dtb
92+
dtb-$(CONFIG_ARCH_MXC) += imx8mp-data-modul-edm-sbc.dtb
9293
dtb-$(CONFIG_ARCH_MXC) += imx8mp-debix-model-a.dtb
9394
dtb-$(CONFIG_ARCH_MXC) += imx8mp-dhcom-pdk2.dtb
95+
dtb-$(CONFIG_ARCH_MXC) += imx8mp-dhcom-pdk3.dtb
9496
dtb-$(CONFIG_ARCH_MXC) += imx8mp-evk.dtb
9597
dtb-$(CONFIG_ARCH_MXC) += imx8mp-icore-mx8mp-edimm2.2.dtb
9698
dtb-$(CONFIG_ARCH_MXC) += imx8mp-msc-sm2s-ep1.dtb
@@ -122,9 +124,17 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mq-pico-pi.dtb
122124
dtb-$(CONFIG_ARCH_MXC) += imx8mq-thor96.dtb
123125
dtb-$(CONFIG_ARCH_MXC) += imx8mq-zii-ultra-rmb3.dtb
124126
dtb-$(CONFIG_ARCH_MXC) += imx8mq-zii-ultra-zest.dtb
127+
dtb-$(CONFIG_ARCH_MXC) += imx8qm-apalis-eval.dtb
128+
dtb-$(CONFIG_ARCH_MXC) += imx8qm-apalis-ixora-v1.1.dtb
129+
dtb-$(CONFIG_ARCH_MXC) += imx8qm-apalis-v1.1-eval.dtb
130+
dtb-$(CONFIG_ARCH_MXC) += imx8qm-apalis-v1.1-ixora-v1.1.dtb
131+
dtb-$(CONFIG_ARCH_MXC) += imx8qm-apalis-v1.1-ixora-v1.2.dtb
125132
dtb-$(CONFIG_ARCH_MXC) += imx8qm-mek.dtb
126133
dtb-$(CONFIG_ARCH_MXC) += imx8qxp-ai_ml.dtb
134+
dtb-$(CONFIG_ARCH_MXC) += imx8qxp-colibri-aster.dtb
127135
dtb-$(CONFIG_ARCH_MXC) += imx8qxp-colibri-eval-v3.dtb
136+
dtb-$(CONFIG_ARCH_MXC) += imx8qxp-colibri-iris.dtb
137+
dtb-$(CONFIG_ARCH_MXC) += imx8qxp-colibri-iris-v2.dtb
128138
dtb-$(CONFIG_ARCH_MXC) += imx8qxp-mek.dtb
129139
dtb-$(CONFIG_ARCH_MXC) += imx8ulp-evk.dtb
130140
dtb-$(CONFIG_ARCH_MXC) += imx93-11x11-evk.dtb

‎arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
interrupt-controller;
132132
interrupts = <GIC_PPI 9 (GIC_CPU_MASK_RAW(0xf) |
133133
IRQ_TYPE_LEVEL_LOW)>;
134-
its: gic-its@6020000 {
134+
its: msi-controller@6020000 {
135135
compatible = "arm,gic-v3-its";
136136
msi-controller;
137137
reg = <0x0 0x06020000 0 0x20000>;/* GIC Translater */

‎arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
#size-cells = <2>;
124124
ranges;
125125

126-
its: gic-its@6020000 {
126+
its: msi-controller@6020000 {
127127
compatible = "arm,gic-v3-its";
128128
msi-controller;
129129
reg = <0x0 0x6020000 0 0x20000>;

‎arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
interrupt-controller;
6161
interrupts = <1 9 0x4>;
6262

63-
its: gic-its@6020000 {
63+
its: msi-controller@6020000 {
6464
compatible = "arm,gic-v3-its";
6565
msi-controller;
6666
reg = <0x0 0x6020000 0 0x20000>;

‎arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@
395395
interrupt-controller;
396396
interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
397397

398-
its: gic-its@6020000 {
398+
its: msi-controller@6020000 {
399399
compatible = "arm,gic-v3-its";
400400
msi-controller;
401401
reg = <0x0 0x6020000 0 0x20000>;

‎arch/arm64/boot/dts/freescale/imx8-apalis-eval.dtsi‎

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
2+
/*
3+
* Copyright 2022 Toradex
4+
*/
5+
6+
/ {
7+
aliases {
8+
rtc0 = &rtc_i2c;
9+
rtc1 = &rtc;
10+
};
11+
12+
reg_usb_host_vbus: regulator-usb-host-vbus {
13+
regulator-name = "VCC USBH2(ABCD) / USBH(3|4)";
14+
};
15+
};
16+
17+
&adc0 {
18+
status = "okay";
19+
};
20+
21+
&adc1 {
22+
status = "okay";
23+
};
24+
25+
/* TODO: Audio Mixer */
26+
27+
/* TODO: Asynchronous Sample Rate Converter (ASRC) */
28+
29+
/* TODO: Display Controller */
30+
31+
/* TODO: DPU */
32+
33+
/* Apalis ETH1 */
34+
&fec1 {
35+
status = "okay";
36+
};
37+
38+
/* Apalis CAN1 */
39+
&flexcan1 {
40+
status = "okay";
41+
};
42+
43+
/* Apalis CAN2 */
44+
&flexcan2 {
45+
status = "okay";
46+
};
47+
48+
/* TODO: GPU */
49+
50+
/* Apalis I2C1 */
51+
&i2c2 {
52+
status = "okay";
53+
54+
/* M41T0M6 real time clock on carrier board */
55+
rtc_i2c: rtc@68 {
56+
status = "okay";
57+
};
58+
};
59+
60+
/* Apalis I2C3 (CAM) */
61+
&i2c3 {
62+
status = "okay";
63+
};
64+
65+
/* Apalis SPI1 */
66+
&lpspi0 {
67+
status = "okay";
68+
};
69+
70+
/* Apalis SPI2 */
71+
&lpspi2 {
72+
status = "okay";
73+
};
74+
75+
/* Apalis UART3 */
76+
&lpuart0 {
77+
status = "okay";
78+
};
79+
80+
/* Apalis UART1 */
81+
&lpuart1 {
82+
status = "okay";
83+
};
84+
85+
/* Apalis UART4 */
86+
&lpuart2 {
87+
status = "okay";
88+
};
89+
90+
/* Apalis UART2 */
91+
&lpuart3 {
92+
status = "okay";
93+
};
94+
95+
/* Apalis PWM3, MXM3 pin 6 */
96+
&lsio_pwm0 {
97+
status = "okay";
98+
};
99+
100+
/* Apalis PWM4, MXM3 pin 8 */
101+
&lsio_pwm1 {
102+
status = "okay";
103+
};
104+
105+
/* Apalis PWM1, MXM3 pin 2 */
106+
&lsio_pwm2 {
107+
status = "okay";
108+
};
109+
110+
/* Apalis PWM2, MXM3 pin 4 */
111+
&lsio_pwm3 {
112+
status = "okay";
113+
};
114+
115+
/* TODO: Apalis PCIE1 */
116+
117+
/* TODO: Apalis BKL1_PWM */
118+
119+
/* TODO: Apalis DAP1 */
120+
121+
/* TODO: Apalis Analogue Audio */
122+
123+
/* TODO: Apalis SATA1 */
124+
125+
/* TODO: Apalis SPDIF1 */
126+
127+
/* TODO: Apalis USBH2, Apalis USBH3 and on-module Wi-Fi via on-module HSIC Hub */
128+
129+
/* Apalis USBO1 */
130+
&usbotg1 {
131+
status = "okay";
132+
};
133+
134+
/* TODO: Apalis USBH4 SuperSpeed */
135+
136+
/* Apalis MMC1 */
137+
&usdhc2 {
138+
status = "okay";
139+
};
140+
141+
/* Apalis SD1 */
142+
&usdhc3 {
143+
status = "okay";
144+
};

0 commit comments

Comments
 (0)