Skip to content

Commit a5c3378

Browse files
arndbarndb
committed
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/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 1d9140d + db92a8d commit a5c3378

File tree

106 files changed

+1435
-1191
lines changed

Some content is hidden

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

106 files changed

+1435
-1191
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,8 @@
5858
pinctrl-names = "default";
5959
pinctrl-0 = <&pinctrl_eth>;
6060
compatible = "davicom,dm9000";
61-
reg = <
62-
4 0x00c00000 0x2
63-
4 0x00c00002 0x2
64-
>;
61+
reg = <4 0x00c00000 0x2>,
62+
<4 0x00c00002 0x2>;
6563
interrupt-parent = <&gpio2>;
6664
interrupts = <14 IRQ_TYPE_LEVEL_LOW>;
6765
fsl,weim-cs-timing = <0x0000c700 0x19190d01>;

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

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,15 @@
3030
};
3131
};
3232

33-
regulators {
34-
compatible = "simple-bus";
35-
#address-cells = <1>;
36-
#size-cells = <0>;
37-
38-
reg_lcd_3v3: regulator@0 {
39-
compatible = "regulator-fixed";
40-
reg = <0>;
41-
pinctrl-names = "default";
42-
pinctrl-0 = <&pinctrl_reg_lcd_3v3>;
43-
regulator-name = "lcd-3v3";
44-
regulator-min-microvolt = <3300000>;
45-
regulator-max-microvolt = <3300000>;
46-
gpio = <&gpio1 26 GPIO_ACTIVE_HIGH>;
47-
enable-active-high;
48-
};
33+
reg_lcd_3v3: regulator-0 {
34+
compatible = "regulator-fixed";
35+
pinctrl-names = "default";
36+
pinctrl-0 = <&pinctrl_reg_lcd_3v3>;
37+
regulator-name = "lcd-3v3";
38+
regulator-min-microvolt = <3300000>;
39+
regulator-max-microvolt = <3300000>;
40+
gpio = <&gpio1 26 GPIO_ACTIVE_HIGH>;
41+
enable-active-high;
4942
};
5043
};
5144

‎arch/arm/boot/dts/nxp/imx/imx25-karo-tx25.dts

Lines changed: 32 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,13 @@
1414
stdout-path = &uart1;
1515
};
1616

17-
regulators {
18-
compatible = "simple-bus";
19-
#address-cells = <1>;
20-
#size-cells = <0>;
21-
22-
reg_fec_phy: regulator@0 {
23-
compatible = "regulator-fixed";
24-
reg = <0>;
25-
regulator-name = "fec-phy";
26-
regulator-min-microvolt = <3300000>;
27-
regulator-max-microvolt = <3300000>;
28-
gpio = <&gpio4 9 0>;
29-
enable-active-high;
30-
};
17+
reg_fec_phy: regulator-0 {
18+
compatible = "regulator-fixed";
19+
regulator-name = "fec-phy";
20+
regulator-min-microvolt = <3300000>;
21+
regulator-max-microvolt = <3300000>;
22+
gpio = <&gpio4 9 0>;
23+
enable-active-high;
3124
};
3225

3326
memory@80000000 {
@@ -39,46 +32,46 @@
3932
&iomuxc {
4033
pinctrl_uart1: uart1grp {
4134
fsl,pins = <
42-
MX25_PAD_UART1_TXD__UART1_TXD 0x80000000
43-
MX25_PAD_UART1_RXD__UART1_RXD 0x80000000
44-
MX25_PAD_UART1_CTS__UART1_CTS 0x80000000
45-
MX25_PAD_UART1_RTS__UART1_RTS 0x80000000
35+
MX25_PAD_UART1_TXD__UART1_TXD 0x00000020
36+
MX25_PAD_UART1_RXD__UART1_RXD 0x000000a0
37+
MX25_PAD_UART1_CTS__UART1_CTS 0x00000060
38+
MX25_PAD_UART1_RTS__UART1_RTS 0x000000e0
4639
>;
4740
};
4841

4942
pinctrl_fec: fecgrp {
5043
fsl,pins = <
51-
MX25_PAD_D11__GPIO_4_9 0x80000000 /* FEC PHY power on pin */
52-
MX25_PAD_D13__GPIO_4_7 0x80000000 /* FEC reset */
53-
MX25_PAD_FEC_MDC__FEC_MDC 0x80000000
54-
MX25_PAD_FEC_MDIO__FEC_MDIO 0x80000000
55-
MX25_PAD_FEC_TDATA0__FEC_TDATA0 0x80000000
56-
MX25_PAD_FEC_TDATA1__FEC_TDATA1 0x80000000
57-
MX25_PAD_FEC_TX_EN__FEC_TX_EN 0x80000000
58-
MX25_PAD_FEC_RDATA0__FEC_RDATA0 0x80000000
59-
MX25_PAD_FEC_RDATA1__FEC_RDATA1 0x80000000
60-
MX25_PAD_FEC_RX_DV__FEC_RX_DV 0x80000000
61-
MX25_PAD_FEC_TX_CLK__FEC_TX_CLK 0x80000000
44+
MX25_PAD_D11__GPIO_4_9 0x00000021 /* FEC PHY power on pin */
45+
MX25_PAD_D13__GPIO_4_7 0x000000a1 /* FEC reset */
46+
MX25_PAD_FEC_MDC__FEC_MDC 0x00000060
47+
MX25_PAD_FEC_MDIO__FEC_MDIO 0x000001f0
48+
MX25_PAD_FEC_TDATA0__FEC_TDATA0 0x00000060
49+
MX25_PAD_FEC_TDATA1__FEC_TDATA1 0x00000060
50+
MX25_PAD_FEC_TX_EN__FEC_TX_EN 0x00000060
51+
MX25_PAD_FEC_RDATA0__FEC_RDATA0 0x000000c1
52+
MX25_PAD_FEC_RDATA1__FEC_RDATA1 0x000000c0
53+
MX25_PAD_FEC_RX_DV__FEC_RX_DV 0x000000c0
54+
MX25_PAD_FEC_TX_CLK__FEC_TX_CLK 0x000000c0
6255
>;
6356
};
6457

6558
pinctrl_nfc: nfcgrp {
6659
fsl,pins = <
67-
MX25_PAD_NF_CE0__NF_CE0 0x80000000
60+
MX25_PAD_NF_CE0__NF_CE0 0x00000001
6861
MX25_PAD_NFWE_B__NFWE_B 0x80000000
6962
MX25_PAD_NFRE_B__NFRE_B 0x80000000
7063
MX25_PAD_NFALE__NFALE 0x80000000
7164
MX25_PAD_NFCLE__NFCLE 0x80000000
7265
MX25_PAD_NFWP_B__NFWP_B 0x80000000
73-
MX25_PAD_NFRB__NFRB 0x80000000
74-
MX25_PAD_D7__D7 0x80000000
75-
MX25_PAD_D6__D6 0x80000000
76-
MX25_PAD_D5__D5 0x80000000
77-
MX25_PAD_D4__D4 0x80000000
78-
MX25_PAD_D3__D3 0x80000000
79-
MX25_PAD_D2__D2 0x80000000
80-
MX25_PAD_D1__D1 0x80000000
81-
MX25_PAD_D0__D0 0x80000000
66+
MX25_PAD_NFRB__NFRB 0x000000e0
67+
MX25_PAD_D7__D7 0x00000080
68+
MX25_PAD_D6__D6 0x00000080
69+
MX25_PAD_D5__D5 0x00000080
70+
MX25_PAD_D4__D4 0x00000080
71+
MX25_PAD_D3__D3 0x00000080
72+
MX25_PAD_D2__D2 0x00000080
73+
MX25_PAD_D1__D1 0x00000000
74+
MX25_PAD_D0__D0 0x00000080
8275
>;
8376
};
8477
};

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

Lines changed: 26 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -16,45 +16,35 @@
1616
reg = <0x80000000 0x4000000>;
1717
};
1818

19-
regulators {
20-
compatible = "simple-bus";
21-
#address-cells = <1>;
22-
#size-cells = <0>;
23-
24-
reg_fec_3v3: regulator@0 {
25-
compatible = "regulator-fixed";
26-
reg = <0>;
27-
regulator-name = "fec-3v3";
28-
regulator-min-microvolt = <3300000>;
29-
regulator-max-microvolt = <3300000>;
30-
gpio = <&gpio2 3 0>;
31-
enable-active-high;
32-
};
19+
reg_fec_3v3: regulator-0 {
20+
compatible = "regulator-fixed";
21+
regulator-name = "fec-3v3";
22+
regulator-min-microvolt = <3300000>;
23+
regulator-max-microvolt = <3300000>;
24+
gpio = <&gpio2 3 0>;
25+
enable-active-high;
26+
};
3327

34-
reg_2p5v: regulator@1 {
35-
compatible = "regulator-fixed";
36-
reg = <1>;
37-
regulator-name = "2P5V";
38-
regulator-min-microvolt = <2500000>;
39-
regulator-max-microvolt = <2500000>;
40-
};
28+
reg_2p5v: regulator-1 {
29+
compatible = "regulator-fixed";
30+
regulator-name = "2P5V";
31+
regulator-min-microvolt = <2500000>;
32+
regulator-max-microvolt = <2500000>;
33+
};
4134

42-
reg_3p3v: regulator@2 {
43-
compatible = "regulator-fixed";
44-
reg = <2>;
45-
regulator-name = "3P3V";
46-
regulator-min-microvolt = <3300000>;
47-
regulator-max-microvolt = <3300000>;
48-
};
35+
reg_3p3v: regulator-2 {
36+
compatible = "regulator-fixed";
37+
regulator-name = "3P3V";
38+
regulator-min-microvolt = <3300000>;
39+
regulator-max-microvolt = <3300000>;
40+
};
4941

50-
reg_can_3v3: regulator@3 {
51-
compatible = "regulator-fixed";
52-
reg = <3>;
53-
regulator-name = "can-3v3";
54-
regulator-min-microvolt = <3300000>;
55-
regulator-max-microvolt = <3300000>;
56-
gpio = <&gpio4 6 0>;
57-
};
42+
reg_can_3v3: regulator-3 {
43+
compatible = "regulator-fixed";
44+
regulator-name = "can-3v3";
45+
regulator-min-microvolt = <3300000>;
46+
regulator-max-microvolt = <3300000>;
47+
gpio = <&gpio4 6 0>;
5848
};
5949

6050
sound {

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

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,12 @@
5454
};
5555
};
5656

57-
regulators {
58-
compatible = "simple-bus";
59-
#address-cells = <1>;
60-
#size-cells = <0>;
61-
62-
reg_max5821: regulator@0 {
63-
compatible = "regulator-fixed";
64-
reg = <0>;
65-
regulator-name = "max5821-reg";
66-
regulator-min-microvolt = <2500000>;
67-
regulator-max-microvolt = <2500000>;
68-
regulator-always-on;
69-
};
57+
reg_max5821: regulator-0 {
58+
compatible = "regulator-fixed";
59+
regulator-name = "max5821-reg";
60+
regulator-min-microvolt = <2500000>;
61+
regulator-max-microvolt = <2500000>;
62+
regulator-always-on;
7063
};
7164
};
7265

‎arch/arm/boot/dts/nxp/imx/imx27-eukrea-mbimxsd27-baseboard.dts

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -54,22 +54,15 @@
5454
};
5555
};
5656

57-
regulators {
58-
#address-cells = <1>;
59-
#size-cells = <0>;
60-
compatible = "simple-bus";
61-
62-
reg_lcd: regulator@0 {
63-
pinctrl-names = "default";
64-
pinctrl-0 = <&pinctrl_lcdreg>;
65-
compatible = "regulator-fixed";
66-
reg = <0>;
67-
regulator-name = "LCD";
68-
regulator-min-microvolt = <5000000>;
69-
regulator-max-microvolt = <5000000>;
70-
gpio = <&gpio1 25 GPIO_ACTIVE_HIGH>;
71-
enable-active-high;
72-
};
57+
reg_lcd: regulator-0 {
58+
compatible = "regulator-fixed";
59+
pinctrl-names = "default";
60+
pinctrl-0 = <&pinctrl_lcdreg>;
61+
regulator-name = "LCD";
62+
regulator-min-microvolt = <5000000>;
63+
regulator-max-microvolt = <5000000>;
64+
gpio = <&gpio1 25 GPIO_ACTIVE_HIGH>;
65+
enable-active-high;
7366
};
7467
};
7568

‎arch/arm/boot/dts/nxp/imx/imx27-phytec-phycard-s-rdk.dts

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,12 @@
3333
};
3434
};
3535

36-
regulators {
37-
compatible = "simple-bus";
38-
#address-cells = <1>;
39-
#size-cells = <0>;
40-
41-
reg_3v3: regulator@0 {
42-
compatible = "regulator-fixed";
43-
reg = <0>;
44-
regulator-name = "3V3";
45-
regulator-min-microvolt = <3300000>;
46-
regulator-max-microvolt = <3300000>;
47-
regulator-always-on;
48-
};
36+
reg_3v3: regulator-0 {
37+
compatible = "regulator-fixed";
38+
regulator-name = "3V3";
39+
regulator-min-microvolt = <3300000>;
40+
regulator-max-microvolt = <3300000>;
41+
regulator-always-on;
4942
};
5043
};
5144

‎arch/arm/boot/dts/nxp/imx/imx27-phytec-phycore-rdk.dts

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,15 @@
3737
};
3838
};
3939

40-
regulators {
41-
regulator@2 {
42-
compatible = "regulator-fixed";
43-
pinctrl-names = "default";
44-
pinctrl-0 = <&pinctrl_csien>;
45-
reg = <2>;
46-
regulator-name = "CSI_EN";
47-
regulator-min-microvolt = <3300000>;
48-
regulator-max-microvolt = <3300000>;
49-
gpio = <&gpio2 24 GPIO_ACTIVE_LOW>;
50-
regulator-always-on;
51-
};
40+
regulator-2 {
41+
compatible = "regulator-fixed";
42+
pinctrl-names = "default";
43+
pinctrl-0 = <&pinctrl_csien>;
44+
regulator-name = "CSI_EN";
45+
regulator-min-microvolt = <3300000>;
46+
regulator-max-microvolt = <3300000>;
47+
gpio = <&gpio2 24 GPIO_ACTIVE_LOW>;
48+
regulator-always-on;
5249
};
5350

5451
usbphy {

‎arch/arm/boot/dts/nxp/imx/imx27-phytec-phycore-som.dtsi

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,18 @@
1515
reg = <0xa0000000 0x08000000>;
1616
};
1717

18-
regulators {
19-
compatible = "simple-bus";
20-
#address-cells = <1>;
21-
#size-cells = <0>;
22-
23-
reg_3v3: regulator@0 {
24-
compatible = "regulator-fixed";
25-
reg = <0>;
26-
regulator-name = "3V3";
27-
regulator-min-microvolt = <3300000>;
28-
regulator-max-microvolt = <3300000>;
29-
};
18+
reg_3v3: regulator-0 {
19+
compatible = "regulator-fixed";
20+
regulator-name = "3V3";
21+
regulator-min-microvolt = <3300000>;
22+
regulator-max-microvolt = <3300000>;
23+
};
3024

31-
reg_5v0: regulator@1 {
32-
compatible = "regulator-fixed";
33-
reg = <1>;
34-
regulator-name = "5V0";
35-
regulator-min-microvolt = <5000000>;
36-
regulator-max-microvolt = <5000000>;
37-
};
25+
reg_5v0: regulator-1 {
26+
compatible = "regulator-fixed";
27+
regulator-name = "5V0";
28+
regulator-min-microvolt = <5000000>;
29+
regulator-max-microvolt = <5000000>;
3830
};
3931

4032
usbphy {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@
534534
clock-names = "ipg", "ahb";
535535
};
536536

537-
clks: ccm@10027000{
537+
clks: ccm@10027000 {
538538
compatible = "fsl,imx27-ccm";
539539
reg = <0x10027000 0x1000>;
540540
#clock-cells = <1>;

0 commit comments

Comments
 (0)