summaryrefslogtreecommitdiff
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2023-08-14 23:38:26 +0200
committerArnd Bergmann <arnd@arndb.de>2023-08-14 23:38:56 +0200
commita5c3378290dd8a3e352079b865cf45044fd54ef8 (patch)
tree8f3334a95d4c02a08b08acc8a264b07072a99980 /arch/arm/boot
parent1d9140d2af8bcbd0551d483d6b5b5d6154a122e7 (diff)
parentdb92a8d917c7d959584cc15f838a134c1b115915 (diff)
downloadlinux-a5c3378290dd8a3e352079b865cf45044fd54ef8.tar.gz
linux-a5c3378290dd8a3e352079b865cf45044fd54ef8.tar.bz2
linux-a5c3378290dd8a3e352079b865cf45044fd54ef8.zip
Merge tag 'imx-dt-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/dt
i.MX ARM device tree change for 6.6: - New device tree for TQ-Systems MBLS102xA board. - A bunch of dtschema warning fixes from Fabio Estevam and Krzysztof Kozlowski. - Add missing supply regulator for imx6qdl-mba6 and imx6qdl-tqma6x. - Replace deprecated extcon-usb-gpio id-gpio/vbus-gpio properties. - Disable the internal i.MX6 watchdog and rely on PMIC reboot handler for phycore and pfla02 boards. - Replace NO_PAD_CTL by explicit pad configuration for karo-tx25 board. * tag 'imx-dt-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (35 commits) ARM: dts: imx6qdl: mba6: Fix gpio-keys button node names ARM: dts: imx6ul: Fix nand-controller #size-cells ARM: dts: imx6ul: mba6ulx: Fix stmpe811 node warnings ARM: dts: imx6dl-b1x5pv2: Fix simple-audio routing property ARM: dts: imx6q-prti6q: Fix the SDIO wifi node ARM: dts: vfxxx: Pass 'mmc' as the esdhc node names ARM: dts: imx53-smd: Remove invalid SPI flash entry ARM: dts: imx50-evk: Use generic node name for SPI NOR flash ARM: dts: imx6q-cm-fx6: Remove invalid SPI flash entry ARM: dts: ls1021a: add TQMLS1021A flash partition layout ARM: dts: ls1021a: add TQ-Systems MBLS102xA device tree ARM: dts: imx: Remove 'compatible' from the pfuze nodes ARM: dts: imx: Pass #sound-dai-cells to sgtl5000 ARM: dts: nxp: mxs: split interrupts per cells ARM: dts: imx6ul-geam: Remove invalid sgtl5000 property ARM: dts: imx28: drop incorrect reg in fixed regulators ARM: dts: imx27: drop incorrect reg in fixed regulators ARM: dts: imx25: drop incorrect reg in fixed regulators ARM: dts: imx23: drop incorrect reg in fixed regulators ARM: dts: imx50-kobo-aura: switch to enable-gpios ... Link: https://lore.kernel.org/r/20230813133354.847010-4-shawnguo@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx1-apf9328.dts6
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts25
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx25-karo-tx25.dts71
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx25-pdk.dts62
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx27-apf27dev.dts19
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx27-eukrea-mbimxsd27-baseboard.dts25
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx27-phytec-phycard-s-rdk.dts19
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx27-phytec-phycore-rdk.dts21
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx27-phytec-phycore-som.dtsi30
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx27.dtsi2
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx31.dtsi2
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx50-evk.dts2
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx50-kobo-aura.dts2
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx50.dtsi2
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx51-babbage.dts25
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx51-eukrea-mbimxsd51-baseboard.dts23
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx51.dtsi2
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx53-ard.dts19
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx53-m53.dtsi34
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx53-m53evk.dts34
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx53-mba53.dts33
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx53-qsb-common.dtsi65
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx53-smd.dts4
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx53-tqma53.dtsi19
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx53-voipac-dmm-668.dtsi36
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx53.dtsi2
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6dl-b1x5pv2.dtsi2
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6dl-riotboard.dts1
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6q-arm2.dts36
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6q-bosch-acc.dts2
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6q-bx50v3.dtsi1
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6q-cm-fx6.dts2
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6q-dmo-edmqmx6.dts55
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6q-dms-ba16.dts1
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6q-gk802.dts19
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6q-gw5400-a.dts67
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6q-h100.dts1
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6q-pistachio.dts1
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6q-prti6q.dts5
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6q-tbs2910.dts1
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6qdl-apf6dev.dtsi1
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6qdl-aristainetos2.dtsi4
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6qdl-colibri.dtsi2
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6qdl-dfi-fs700-m60.dtsi30
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6qdl-gw52xx.dtsi1
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6qdl-gw53xx.dtsi1
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6qdl-gw54xx.dtsi85
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6qdl-mba6.dtsi6
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6qdl-mba6a.dtsi2
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6qdl-mba6b.dtsi2
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6qdl-nit6xlite.dtsi79
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6qdl-nitrogen6_max.dtsi132
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6qdl-nitrogen6_som2.dtsi1
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6qdl-nitrogen6x.dtsi121
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-pbab01.dtsi26
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-pfla02.dtsi50
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-phycore-som.dtsi8
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6qdl-rex.dtsi58
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6qdl-sabrelite.dtsi147
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6a.dtsi1
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6b.dtsi1
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6qdl-ts7970.dtsi1
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6qdl-udoo.dtsi36
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6qdl-wandboard.dtsi1
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6sx-nitrogen6sx.dts2
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6sx.dtsi6
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6ul-14x14-evk.dtsi4
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6ul-ccimx6ulsbcexpress.dts2
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6ul-ccimx6ulsbcpro.dts6
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6ul-ccimx6ulsom.dtsi1
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6ul-geam.dts1
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6ul-kontron-bl-common.dtsi2
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6ul-pico-dwarf.dts1
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6ul-pico-hobbit.dts1
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6ul-pico-pi.dts1
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6ul-tx6ul-mainboard.dts2
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6ul.dtsi2
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6ull-colibri.dtsi1
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx7-colibri.dtsi2
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx7d-pico-dwarf.dts1
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx7d-pico-nymph.dts1
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx7d-pico.dtsi2
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx7d-sdb.dts5
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx7s.dtsi2
-rw-r--r--arch/arm/boot/dts/nxp/imx/mba6ulx.dtsi3
-rw-r--r--arch/arm/boot/dts/nxp/ls/Makefile1
-rw-r--r--arch/arm/boot/dts/nxp/ls/ls1021a-iot.dts10
-rw-r--r--arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a-mbls1021a.dts405
-rw-r--r--arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a.dtsi107
-rw-r--r--arch/arm/boot/dts/nxp/mxs/imx23-olinuxino.dts23
-rw-r--r--arch/arm/boot/dts/nxp/mxs/imx23-stmp378x_devb.dts19
-rw-r--r--arch/arm/boot/dts/nxp/mxs/imx23.dtsi21
-rw-r--r--arch/arm/boot/dts/nxp/mxs/imx28-apf28dev.dts34
-rw-r--r--arch/arm/boot/dts/nxp/mxs/imx28-cfa10037.dts23
-rw-r--r--arch/arm/boot/dts/nxp/mxs/imx28-cfa10049.dts23
-rw-r--r--arch/arm/boot/dts/nxp/mxs/imx28-cfa10057.dts23
-rw-r--r--arch/arm/boot/dts/nxp/mxs/imx28-cfa10058.dts23
-rw-r--r--arch/arm/boot/dts/nxp/mxs/imx28-eukrea-mbmx283lc.dts2
-rw-r--r--arch/arm/boot/dts/nxp/mxs/imx28-eukrea-mbmx28lc.dtsi82
-rw-r--r--arch/arm/boot/dts/nxp/mxs/imx28-m28.dtsi19
-rw-r--r--arch/arm/boot/dts/nxp/mxs/imx28-m28cu3.dts66
-rw-r--r--arch/arm/boot/dts/nxp/mxs/imx28-m28evk.dts45
-rw-r--r--arch/arm/boot/dts/nxp/mxs/imx28-sps1.dts19
-rw-r--r--arch/arm/boot/dts/nxp/mxs/imx28.dtsi24
-rw-r--r--arch/arm/boot/dts/nxp/vf/vf610-twr.dts31
-rw-r--r--arch/arm/boot/dts/nxp/vf/vfxxx.dtsi4
106 files changed, 1435 insertions, 1191 deletions
diff --git a/arch/arm/boot/dts/nxp/imx/imx1-apf9328.dts b/arch/arm/boot/dts/nxp/imx/imx1-apf9328.dts
index 77b21aa7a146..1f11e9542a72 100644
--- a/arch/arm/boot/dts/nxp/imx/imx1-apf9328.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx1-apf9328.dts
@@ -58,10 +58,8 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_eth>;
compatible = "davicom,dm9000";
- reg = <
- 4 0x00c00000 0x2
- 4 0x00c00002 0x2
- >;
+ reg = <4 0x00c00000 0x2>,
+ <4 0x00c00002 0x2>;
interrupt-parent = <&gpio2>;
interrupts = <14 IRQ_TYPE_LEVEL_LOW>;
fsl,weim-cs-timing = <0x0000c700 0x19190d01>;
diff --git a/arch/arm/boot/dts/nxp/imx/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts b/arch/arm/boot/dts/nxp/imx/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts
index 7d4301b22b90..fc8a502fc957 100644
--- a/arch/arm/boot/dts/nxp/imx/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts
@@ -30,22 +30,15 @@
};
};
- regulators {
- compatible = "simple-bus";
- #address-cells = <1>;
- #size-cells = <0>;
-
- reg_lcd_3v3: regulator@0 {
- compatible = "regulator-fixed";
- reg = <0>;
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_reg_lcd_3v3>;
- regulator-name = "lcd-3v3";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- gpio = <&gpio1 26 GPIO_ACTIVE_HIGH>;
- enable-active-high;
- };
+ reg_lcd_3v3: regulator-0 {
+ compatible = "regulator-fixed";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_reg_lcd_3v3>;
+ regulator-name = "lcd-3v3";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ gpio = <&gpio1 26 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
};
};
diff --git a/arch/arm/boot/dts/nxp/imx/imx25-karo-tx25.dts b/arch/arm/boot/dts/nxp/imx/imx25-karo-tx25.dts
index 0950eb66d3d9..458b94d3d4ed 100644
--- a/arch/arm/boot/dts/nxp/imx/imx25-karo-tx25.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx25-karo-tx25.dts
@@ -14,20 +14,13 @@
stdout-path = &uart1;
};
- regulators {
- compatible = "simple-bus";
- #address-cells = <1>;
- #size-cells = <0>;
-
- reg_fec_phy: regulator@0 {
- compatible = "regulator-fixed";
- reg = <0>;
- regulator-name = "fec-phy";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- gpio = <&gpio4 9 0>;
- enable-active-high;
- };
+ reg_fec_phy: regulator-0 {
+ compatible = "regulator-fixed";
+ regulator-name = "fec-phy";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ gpio = <&gpio4 9 0>;
+ enable-active-high;
};
memory@80000000 {
@@ -39,46 +32,46 @@
&iomuxc {
pinctrl_uart1: uart1grp {
fsl,pins = <
- MX25_PAD_UART1_TXD__UART1_TXD 0x80000000
- MX25_PAD_UART1_RXD__UART1_RXD 0x80000000
- MX25_PAD_UART1_CTS__UART1_CTS 0x80000000
- MX25_PAD_UART1_RTS__UART1_RTS 0x80000000
+ MX25_PAD_UART1_TXD__UART1_TXD 0x00000020
+ MX25_PAD_UART1_RXD__UART1_RXD 0x000000a0
+ MX25_PAD_UART1_CTS__UART1_CTS 0x00000060
+ MX25_PAD_UART1_RTS__UART1_RTS 0x000000e0
>;
};
pinctrl_fec: fecgrp {
fsl,pins = <
- MX25_PAD_D11__GPIO_4_9 0x80000000 /* FEC PHY power on pin */
- MX25_PAD_D13__GPIO_4_7 0x80000000 /* FEC reset */
- MX25_PAD_FEC_MDC__FEC_MDC 0x80000000
- MX25_PAD_FEC_MDIO__FEC_MDIO 0x80000000
- MX25_PAD_FEC_TDATA0__FEC_TDATA0 0x80000000
- MX25_PAD_FEC_TDATA1__FEC_TDATA1 0x80000000
- MX25_PAD_FEC_TX_EN__FEC_TX_EN 0x80000000
- MX25_PAD_FEC_RDATA0__FEC_RDATA0 0x80000000
- MX25_PAD_FEC_RDATA1__FEC_RDATA1 0x80000000
- MX25_PAD_FEC_RX_DV__FEC_RX_DV 0x80000000
- MX25_PAD_FEC_TX_CLK__FEC_TX_CLK 0x80000000
+ MX25_PAD_D11__GPIO_4_9 0x00000021 /* FEC PHY power on pin */
+ MX25_PAD_D13__GPIO_4_7 0x000000a1 /* FEC reset */
+ MX25_PAD_FEC_MDC__FEC_MDC 0x00000060
+ MX25_PAD_FEC_MDIO__FEC_MDIO 0x000001f0
+ MX25_PAD_FEC_TDATA0__FEC_TDATA0 0x00000060
+ MX25_PAD_FEC_TDATA1__FEC_TDATA1 0x00000060
+ MX25_PAD_FEC_TX_EN__FEC_TX_EN 0x00000060
+ MX25_PAD_FEC_RDATA0__FEC_RDATA0 0x000000c1
+ MX25_PAD_FEC_RDATA1__FEC_RDATA1 0x000000c0
+ MX25_PAD_FEC_RX_D