Skip to content

Commit 7194048

Browse files
arndbarndb
committed
Merge tag 'imx-dt-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/dt
i.MX ARM device tree for 6.10: - New board support: Seeed Studio NPi dev board, UNI-T UTi260B thermal camera board. - A couple of IRQ config correction for touchscreen and RC5T619 on tolino-shine2hd device. - Add snvs-poweroff support for i.MX7. - A couple of dtb_check warning fixes on i.MX6SX and i.MX6QDL ESAI. - Enable USB support for imx6qdl-udoo and imx27-phytec. - A big series from Uwe Kleine-König to adopt #pwm-cells = <3> for i.MX devices. - Other small changes and clean-ups. * tag 'imx-dt-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (64 commits) ARM: dts: imx6ul-pico: Use #pwm-cells = <3> for imx27-pwm device ARM: dts: imx6ul-kontron-bl-common: Use #pwm-cells = <3> for imx27-pwm device ARM: dts: imx6ul-kontron-bl-43: Use #pwm-cells = <3> for imx27-pwm device ARM: dts: imx6ul-isiot: Use #pwm-cells = <3> for imx27-pwm device ARM: dts: imx6ul-imx6ull-opos6uldev: Use #pwm-cells = <3> for imx27-pwm device ARM: dts: imx6ul-geam: Use #pwm-cells = <3> for imx27-pwm device ARM: dts: imx6ul-ccimx6ulsbcpro: Use #pwm-cells = <3> for imx27-pwm device ARM: dts: imx6ul-14x14-evk: Use #pwm-cells = <3> for imx27-pwm device ARM: dts: imx6sx-softing-vining-2000: Use #pwm-cells = <3> for imx27-pwm device ARM: dts: imx6sx-sdb: Use #pwm-cells = <3> for imx27-pwm device ARM: dts: imx6sx-nitrogen6sx: Use #pwm-cells = <3> for imx27-pwm device ARM: dts: imx6sll-evk: Use #pwm-cells = <3> for imx27-pwm device ARM: dts: imx6sl-evk: Use #pwm-cells = <3> for imx27-pwm device ARM: dts: imx6q-var-dt6customboard: Use #pwm-cells = <3> for imx27-pwm device ARM: dts: imx6q-prti6q: Use #pwm-cells = <3> for imx27-pwm device ARM: dts: imx6q-pistachio: Use #pwm-cells = <3> for imx27-pwm device ARM: dts: imx6q-novena: Use #pwm-cells = <3> for imx27-pwm device ARM: dts: imx6q-kp: Use #pwm-cells = <3> for imx27-pwm device ARM: dts: imx6qdl-skov-cpu: Use #pwm-cells = <3> for imx27-pwm device ARM: dts: imx6qdl-savageboard: Use #pwm-cells = <3> for imx27-pwm device ... Link: https://lore.kernel.org/r/20240428121247.10370-3-shawnguo2@yeah.net Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 3fdb967 + 68313ee commit 7194048

70 files changed

Lines changed: 1366 additions & 186 deletions

File tree

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/Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,12 +349,15 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
349349
imx6ull-phytec-segin-lc-rdk-nand.dtb \
350350
imx6ull-phytec-tauri-emmc.dtb \
351351
imx6ull-phytec-tauri-nand.dtb \
352+
imx6ull-seeed-npi-dev-board-emmc.dtb \
353+
imx6ull-seeed-npi-dev-board-nand.dtb \
352354
imx6ull-tarragon-master.dtb \
353355
imx6ull-tarragon-micro.dtb \
354356
imx6ull-tarragon-slave.dtb \
355357
imx6ull-tarragon-slavext.dtb \
356358
imx6ull-tqma6ull2-mba6ulx.dtb \
357359
imx6ull-tqma6ull2l-mba6ulx.dtb \
360+
imx6ull-uti260b.dtb \
358361
imx6ulz-14x14-evk.dtb \
359362
imx6ulz-bsh-smm-m2.dtb
360363
dtb-$(CONFIG_SOC_IMX7D) += \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
compatible = "ricoh,rc5t619";
128128
reg = <0x32>;
129129
interrupt-parent = <&gpio5>;
130-
interrupts = <11 IRQ_TYPE_EDGE_FALLING>;
130+
interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
131131
system-power-controller;
132132

133133
regulators {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
compatible = "ricoh,rc5t619";
146146
reg = <0x32>;
147147
interrupt-parent = <&gpio4>;
148-
interrupts = <19 IRQ_TYPE_EDGE_FALLING>;
148+
interrupts = <19 IRQ_TYPE_LEVEL_LOW>;
149149
system-power-controller;
150150

151151
regulators {

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

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,22 @@
1515
device_type = "memory";
1616
reg = <0xa0000000 0x08000000>; /* 128MB */
1717
};
18+
19+
usbotgphy: usbotgphy {
20+
compatible = "usb-nop-xceiv";
21+
pinctrl-names = "default";
22+
pinctrl-0 = <&pinctrl_usbotgphy>;
23+
reset-gpios = <&gpio2 25 GPIO_ACTIVE_LOW>;
24+
#phy-cells = <0>;
25+
};
26+
27+
usbh2phy: usbh2phy {
28+
compatible = "usb-nop-xceiv";
29+
pinctrl-names = "default";
30+
pinctrl-0 = <&pinctrl_usbh2phy>;
31+
reset-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>;
32+
#phy-cells = <0>;
33+
};
1834
};
1935

2036
&cspi1 {
@@ -84,6 +100,52 @@
84100
MX27_PAD_NFWE_B__NFWE_B 0x0
85101
>;
86102
};
103+
104+
pinctrl_usbotgphy: usbotgphygrp {
105+
fsl,pins = <
106+
MX27_PAD_USBH1_RCV__GPIO2_25 0x1 /* reset gpio */
107+
>;
108+
};
109+
110+
pinctrl_usbotg: usbotggrp {
111+
fsl,pins = <
112+
MX27_PAD_USBOTG_CLK__USBOTG_CLK 0x0
113+
MX27_PAD_USBOTG_DIR__USBOTG_DIR 0x0
114+
MX27_PAD_USBOTG_NXT__USBOTG_NXT 0x0
115+
MX27_PAD_USBOTG_STP__USBOTG_STP 0x0
116+
MX27_PAD_USBOTG_DATA0__USBOTG_DATA0 0x0
117+
MX27_PAD_USBOTG_DATA1__USBOTG_DATA1 0x0
118+
MX27_PAD_USBOTG_DATA2__USBOTG_DATA2 0x0
119+
MX27_PAD_USBOTG_DATA3__USBOTG_DATA3 0x0
120+
MX27_PAD_USBOTG_DATA4__USBOTG_DATA4 0x0
121+
MX27_PAD_USBOTG_DATA5__USBOTG_DATA5 0x0
122+
MX27_PAD_USBOTG_DATA6__USBOTG_DATA6 0x0
123+
MX27_PAD_USBOTG_DATA7__USBOTG_DATA7 0x0
124+
>;
125+
};
126+
127+
pinctrl_usbh2phy: usbh2phygrp {
128+
fsl,pins = <
129+
MX27_PAD_USBH1_SUSP__GPIO2_22 0x0 /* reset gpio */
130+
>;
131+
};
132+
133+
pinctrl_usbh2: usbh2grp {
134+
fsl,pins = <
135+
MX27_PAD_USBH2_CLK__USBH2_CLK 0x0
136+
MX27_PAD_USBH2_DIR__USBH2_DIR 0x0
137+
MX27_PAD_USBH2_NXT__USBH2_NXT 0x0
138+
MX27_PAD_USBH2_STP__USBH2_STP 0x0
139+
MX27_PAD_CSPI2_SCLK__USBH2_DATA0 0x0
140+
MX27_PAD_CSPI2_MOSI__USBH2_DATA1 0x0
141+
MX27_PAD_CSPI2_MISO__USBH2_DATA2 0x0
142+
MX27_PAD_CSPI2_SS1__USBH2_DATA3 0x0
143+
MX27_PAD_CSPI2_SS2__USBH2_DATA4 0x0
144+
MX27_PAD_CSPI1_SS2__USBH2_DATA5 0x0
145+
MX27_PAD_CSPI2_SS0__USBH2_DATA6 0x0
146+
MX27_PAD_USBH2_DATA7__USBH2_DATA7 0x0
147+
>;
148+
};
87149
};
88150
};
89151

@@ -95,3 +157,19 @@
95157
nand-on-flash-bbt;
96158
status = "okay";
97159
};
160+
161+
&usbotg {
162+
pinctrl-names = "default";
163+
pinctrl-0 = <&pinctrl_usbotg>;
164+
phy_type = "ulpi";
165+
phys = <&usbotgphy>;
166+
status = "okay";
167+
};
168+
169+
&usbh2 {
170+
pinctrl-names = "default";
171+
pinctrl-0 = <&pinctrl_usbh2>;
172+
phy_type = "ulpi";
173+
phys = <&usbh2phy>;
174+
status = "okay";
175+
};

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
backlight: backlight {
4747
compatible = "pwm-backlight";
48-
pwms = <&pwm1 0 78770>;
48+
pwms = <&pwm1 0 78770 0>;
4949
brightness-levels = <0 150 200 255>;
5050
default-brightness-level = <1>;
5151
power-supply = <&backlight_reg>;
@@ -113,7 +113,6 @@
113113
};
114114

115115
&pwm1 {
116-
#pwm-cells = <2>;
117116
pinctrl-names = "default";
118117
pinctrl-0 = <&pinctrl_pwm_backlight>;
119118
status = "okay";

‎arch/arm/boot/dts/nxp/imx/imx53-kp-ddc.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
backlight_lcd: backlight {
1515
compatible = "pwm-backlight";
16-
pwms = <&pwm2 0 50000>;
16+
pwms = <&pwm2 0 50000 0>;
1717
power-supply = <&reg_backlight>;
1818
brightness-levels = <0 24 28 32 36
1919
40 44 48 52 56

‎arch/arm/boot/dts/nxp/imx/imx53-kp.dtsi‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
compatible = "pwm-beeper";
1414
pinctrl-names = "default";
1515
pinctrl-0 = <&pinctrl_buzzer>;
16-
pwms = <&pwm1 0 500000>;
16+
pwms = <&pwm1 0 500000 0>;
1717
};
1818

1919
gpio-buttons {
@@ -162,14 +162,6 @@
162162
>;
163163
};
164164

165-
&pwm1 {
166-
#pwm-cells = <2>;
167-
};
168-
169-
&pwm2 {
170-
#pwm-cells = <2>;
171-
};
172-
173165
&uart1 {
174166
status = "okay";
175167
};

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
backlight {
4343
compatible = "pwm-backlight";
44-
pwms = <&pwm1 0 3000>;
44+
pwms = <&pwm1 0 3000 0>;
4545
brightness-levels = <0 4 8 16 32 64 128 255>;
4646
default-brightness-level = <6>;
4747
power-supply = <&reg_backlight>;
@@ -313,7 +313,6 @@
313313
};
314314

315315
&pwm1 {
316-
#pwm-cells = <2>;
317316
pinctrl-names = "default";
318317
pinctrl-0 = <&pinctrl_pwm1>;
319318
status = "okay";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
backlight {
1919
compatible = "pwm-backlight";
20-
pwms = <&pwm2 0 50000>;
20+
pwms = <&pwm2 0 50000 0>;
2121
brightness-levels = <0 24 28 32 36 40 44 48 52 56 60 64 68 72 76 80 84 88 92 96 100>;
2222
default-brightness-level = <10>;
2323
enable-gpios = <&gpio7 7 0>;

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167

168168
pwm_bl: backlight {
169169
compatible = "pwm-backlight";
170-
pwms = <&pwm2 0 50000>;
170+
pwms = <&pwm2 0 50000 0>;
171171
brightness-levels = <0 2 5 7 10 12 15 17 20 22 25 28 30 33 35
172172
38 40 43 45 48 51 53 56 58 61 63 66 68 71
173173
73 76 79 81 84 86 89 91 94 96 99 102 104
@@ -187,7 +187,7 @@
187187

188188
led-1 {
189189
label = "alarm-brightness";
190-
pwms = <&pwm1 0 100000>;
190+
pwms = <&pwm1 0 100000 0>;
191191
max-brightness = <255>;
192192
};
193193
};
@@ -628,14 +628,12 @@
628628
};
629629

630630
&pwm1 {
631-
#pwm-cells = <2>;
632631
pinctrl-names = "default";
633632
pinctrl-0 = <&pinctrl_pwm1>;
634633
status = "okay";
635634
};
636635

637636
&pwm2 {
638-
#pwm-cells = <2>;
639637
pinctrl-names = "default";
640638
pinctrl-0 = <&pinctrl_pwm2>;
641639
status = "okay";

0 commit comments

Comments
 (0)