Skip to content

Commit d39b6ae

Browse files
arndbarndb
committed
Merge tag 'imx-dt-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/dt
i.MX device tree changes for 5.8: - A series from Anson Huang updating SRC devices to match bindings schema definition. - Correct CPU supply name and add cpu1 supply for i.MX7D. - Convert thermal device to use nvmem interface to get fuse data for imx6qdl and imx6sl. - A series from Tim Harvey to update imx6qdl-gw devices, adding support of LSM9DS1 IIO imu/magn, USB OTG, bcm4330-bt, etc. - Add input MUX for ENET2 MDIO into IMX7D pin functions. - Misc random device addition or update. * tag 'imx-dt-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (22 commits) ARM: dts: imx53-cx9020: Group port definitions for the dvi-converter ARM: dts: imx5: make src node name generic ARM: dts: imx50: Add src node interrupt ARM: dts: imx: make src node name generic ARM: dts: imx7d-pinfunc: add input mux for ENET2 mdio ARM: dts: imx6sl: Use nvmem interface to get fuse data ARM: dts: imx6qdl: Use nvmem interface to get fuse data ARM: dts: imx6qdl-gw5910: fix wlan regulator ARM: dts: imx6qdl-gw5910: add support for bcm4330-bt ARM: dts: imx6qdl-gw5904: add lsm9ds1 iio imu/magn support ARM: dts: imx6qdl-gw560x: add lsm9ds1 iio imu/magn support ARM: dts: imx53: Add src node interrupt ARM: dts: imx51: Add src node interrupt ARM: dts: imx50: Remove unused iomuxc-gpr node ARM: dts: imx6qdl-gw552x: add USB OTG support ARM: dts: imx6-sr-som: add ethernet PHY configuration arm: dts: ls1021atwr: Add QSPI node properties ARM: dts: e60k02: add interrupt for PMIC ARM: dts: colibri: introduce device trees with UHS-I support ARM: dts: imx7d: Add cpu1 supply ... Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 48d44c2 + 103515d commit d39b6ae

30 files changed

+384
-55
lines changed

‎arch/arm/boot/dts/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
416416
imx6dl-aristainetos2_4.dtb \
417417
imx6dl-aristainetos2_7.dtb \
418418
imx6dl-colibri-eval-v3.dtb \
419+
imx6dl-colibri-v1_1-eval-v3.dtb \
419420
imx6dl-cubox-i.dtb \
420421
imx6dl-cubox-i-emmc-som-v15.dtb \
421422
imx6dl-cubox-i-som-v15.dtb \

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@
117117
ricoh619: pmic@32 {
118118
compatible = "ricoh,rc5t619";
119119
reg = <0x32>;
120+
interrupt-parent = <&gpio5>;
121+
interrupts = <11 IRQ_TYPE_EDGE_FALLING>;
120122
system-power-controller;
121123

122124
regulators {

‎arch/arm/boot/dts/imx50.dtsi

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -288,11 +288,6 @@
288288
reg = <0x53fa8000 0x4000>;
289289
};
290290

291-
gpr: iomuxc-gpr@53fa8000 {
292-
compatible = "fsl,imx50-iomuxc-gpr", "syscon";
293-
reg = <0x53fa8000 0xc>;
294-
};
295-
296291
pwm1: pwm@53fb4000 {
297292
#pwm-cells = <2>;
298293
compatible = "fsl,imx50-pwm", "fsl,imx27-pwm";
@@ -333,9 +328,10 @@
333328
status = "disabled";
334329
};
335330

336-
src: src@53fd0000 {
331+
src: reset-controller@53fd0000 {
337332
compatible = "fsl,imx50-src", "fsl,imx51-src";
338333
reg = <0x53fd0000 0x4000>;
334+
interrupts = <75>;
339335
#reset-cells = <1>;
340336
};
341337

‎arch/arm/boot/dts/imx51.dtsi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,9 +439,10 @@
439439
status = "disabled";
440440
};
441441

442-
src: src@73fd0000 {
442+
src: reset-controller@73fd0000 {
443443
compatible = "fsl,imx51-src";
444444
reg = <0x73fd0000 0x4000>;
445+
interrupts = <75>;
445446
#reset-cells = <1>;
446447
};
447448

‎arch/arm/boot/dts/imx53-cx9020.dts

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,23 +59,26 @@
5959
};
6060

6161
dvi-converter {
62-
#address-cells = <1>;
63-
#size-cells = <0>;
6462
compatible = "ti,tfp410";
6563

66-
port@0 {
67-
reg = <0>;
64+
ports {
65+
#address-cells = <1>;
66+
#size-cells = <0>;
67+
68+
port@0 {
69+
reg = <0>;
6870

69-
tfp410_in: endpoint {
70-
remote-endpoint = <&display0_out>;
71+
tfp410_in: endpoint {
72+
remote-endpoint = <&display0_out>;
73+
};
7174
};
72-
};
7375

74-
port@1 {
75-
reg = <1>;
76+
port@1 {
77+
reg = <1>;
7678

77-
tfp410_out: endpoint {
78-
remote-endpoint = <&dvi_connector_in>;
79+
tfp410_out: endpoint {
80+
remote-endpoint = <&dvi_connector_in>;
81+
};
7982
};
8083
};
8184
};

‎arch/arm/boot/dts/imx53.dtsi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -588,9 +588,10 @@
588588
status = "disabled";
589589
};
590590

591-
src: src@53fd0000 {
591+
src: reset-controller@53fd0000 {
592592
compatible = "fsl,imx53-src", "fsl,imx51-src";
593593
reg = <0x53fd0000 0x4000>;
594+
interrupts = <75>;
594595
#reset-cells = <1>;
595596
};
596597

‎arch/arm/boot/dts/imx6dl-colibri-v1_1-eval-v3.dts

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// SPDX-License-Identifier: GPL-2.0+ OR MIT
2+
/*
3+
* Copyright 2020 Toradex
4+
*/
5+
6+
/dts-v1/;
7+
8+
#include "imx6dl-colibri-eval-v3.dts"
9+
#include "imx6qdl-colibri-v1_1-uhs.dtsi"
10+
11+
/ {
12+
model = "Toradex Colibri iMX6DL/S V1.1 on Colibri Evaluation Board V3";
13+
compatible = "toradex,colibri_imx6dl-v1_1-eval-v3",
14+
"toradex,colibri_imx6dl-v1_1",
15+
"toradex,colibri_imx6dl-eval-v3",
16+
"toradex,colibri_imx6dl",
17+
"fsl,imx6dl";
18+
};
19+
20+
/* Colibri MMC */
21+
&usdhc1 {
22+
status = "okay";
23+
/*
24+
* Please make sure your carrier board does not pull-up any of
25+
* the MMC/SD signals to 3.3 volt before attempting to activate
26+
* UHS-I support.
27+
* To let signaling voltage be changed to 1.8V, please
28+
* delete no-1-8-v property (example below):
29+
* /delete-property/no-1-8-v;
30+
*/
31+
};

‎arch/arm/boot/dts/imx6q-dhcom-pdk2.dts

Lines changed: 113 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,53 @@
2222
clock-frequency = <24000000>;
2323
};
2424

25+
display_bl: display-bl {
26+
compatible = "pwm-backlight";
27+
pwms = <&pwm1 0 50000 PWM_POLARITY_INVERTED>;
28+
brightness-levels = <0 16 22 30 40 55 75 102 138 188 255>;
29+
default-brightness-level = <8>;
30+
enable-gpios = <&gpio3 27 GPIO_ACTIVE_HIGH>;
31+
status = "okay";
32+
};
33+
34+
lcd_display: disp0 {
35+
compatible = "fsl,imx-parallel-display";
36+
#address-cells = <1>;
37+
#size-cells = <0>;
38+
interface-pix-fmt = "rgb24";
39+
pinctrl-names = "default";
40+
pinctrl-0 = <&pinctrl_ipu1_lcdif>;
41+
status = "okay";
42+
43+
port@0 {
44+
reg = <0>;
45+
46+
lcd_display_in: endpoint {
47+
remote-endpoint = <&ipu1_di0_disp0>;
48+
};
49+
};
50+
51+
port@1 {
52+
reg = <1>;
53+
54+
lcd_display_out: endpoint {
55+
remote-endpoint = <&lcd_panel_in>;
56+
};
57+
};
58+
};
59+
60+
panel {
61+
compatible = "edt,etm0700g0edh6";
62+
ddc-i2c-bus = <&i2c2>;
63+
backlight = <&display_bl>;
64+
65+
port {
66+
lcd_panel_in: endpoint {
67+
remote-endpoint = <&lcd_display_out>;
68+
};
69+
};
70+
};
71+
2572
sound {
2673
compatible = "fsl,imx-audio-sgtl5000";
2774
model = "imx-sgtl5000";
@@ -65,6 +112,15 @@
65112
VDDA-supply = <&reg_3p3v>;
66113
VDDIO-supply = <&sw2_reg>;
67114
};
115+
116+
touchscreen@38 {
117+
pinctrl-names = "default";
118+
pinctrl-0 = <&pinctrl_touchscreen>;
119+
compatible = "edt,edt-ft5406";
120+
reg = <0x38>;
121+
interrupt-parent = <&gpio4>;
122+
interrupts = <5 IRQ_TYPE_EDGE_FALLING>; /* GPIO E */
123+
};
68124
};
69125

70126
&iomuxc {
@@ -77,9 +133,7 @@
77133
MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x400120b0
78134
MX6QDL_PAD_GPIO_5__GPIO1_IO05 0x400120b0
79135
MX6QDL_PAD_CSI0_DAT17__GPIO6_IO03 0x400120b0
80-
MX6QDL_PAD_GPIO_19__GPIO4_IO05 0x120b0
81136
MX6QDL_PAD_DI0_PIN4__GPIO4_IO20 0x400120b0
82-
MX6QDL_PAD_EIM_D27__GPIO3_IO27 0x120b0
83137
MX6QDL_PAD_KEY_ROW0__GPIO4_IO07 0x120b0
84138
MX6QDL_PAD_KEY_COL1__GPIO4_IO08 0x400120b0
85139
MX6QDL_PAD_NANDF_CS1__GPIO6_IO14 0x400120b0
@@ -132,20 +186,77 @@
132186
>;
133187
};
134188

189+
pinctrl_ipu1_lcdif: ipu1-lcdif-grp {
190+
fsl,pins = <
191+
MX6QDL_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK 0x38
192+
MX6QDL_PAD_DI0_PIN15__IPU1_DI0_PIN15 0x38
193+
MX6QDL_PAD_DI0_PIN2__IPU1_DI0_PIN02 0x38
194+
MX6QDL_PAD_DI0_PIN3__IPU1_DI0_PIN03 0x38
195+
MX6QDL_PAD_DISP0_DAT0__IPU1_DISP0_DATA00 0x38
196+
MX6QDL_PAD_DISP0_DAT1__IPU1_DISP0_DATA01 0x38
197+
MX6QDL_PAD_DISP0_DAT2__IPU1_DISP0_DATA02 0x38
198+
MX6QDL_PAD_DISP0_DAT3__IPU1_DISP0_DATA03 0x38
199+
MX6QDL_PAD_DISP0_DAT4__IPU1_DISP0_DATA04 0x38
200+
MX6QDL_PAD_DISP0_DAT5__IPU1_DISP0_DATA05 0x38
201+
MX6QDL_PAD_DISP0_DAT6__IPU1_DISP0_DATA06 0x38
202+
MX6QDL_PAD_DISP0_DAT7__IPU1_DISP0_DATA07 0x38
203+
MX6QDL_PAD_DISP0_DAT8__IPU1_DISP0_DATA08 0x38
204+
MX6QDL_PAD_DISP0_DAT9__IPU1_DISP0_DATA09 0x38
205+
MX6QDL_PAD_DISP0_DAT10__IPU1_DISP0_DATA10 0x38
206+
MX6QDL_PAD_DISP0_DAT11__IPU1_DISP0_DATA11 0x38
207+
MX6QDL_PAD_DISP0_DAT12__IPU1_DISP0_DATA12 0x38
208+
MX6QDL_PAD_DISP0_DAT13__IPU1_DISP0_DATA13 0x38
209+
MX6QDL_PAD_DISP0_DAT14__IPU1_DISP0_DATA14 0x38
210+
MX6QDL_PAD_DISP0_DAT15__IPU1_DISP0_DATA15 0x38
211+
MX6QDL_PAD_DISP0_DAT16__IPU1_DISP0_DATA16 0x38
212+
MX6QDL_PAD_DISP0_DAT17__IPU1_DISP0_DATA17 0x38
213+
MX6QDL_PAD_DISP0_DAT18__IPU1_DISP0_DATA18 0x38
214+
MX6QDL_PAD_DISP0_DAT19__IPU1_DISP0_DATA19 0x38
215+
MX6QDL_PAD_DISP0_DAT20__IPU1_DISP0_DATA20 0x38
216+
MX6QDL_PAD_DISP0_DAT21__IPU1_DISP0_DATA21 0x38
217+
MX6QDL_PAD_DISP0_DAT22__IPU1_DISP0_DATA22 0x38
218+
MX6QDL_PAD_DISP0_DAT23__IPU1_DISP0_DATA23 0x38
219+
MX6QDL_PAD_EIM_D27__GPIO3_IO27 0x120b0
220+
>;
221+
};
222+
223+
pinctrl_pwm1: pwm1-grp {
224+
fsl,pins = <
225+
MX6QDL_PAD_SD1_DAT3__PWM1_OUT 0x1b0b1
226+
>;
227+
};
228+
229+
pinctrl_touchscreen: touchscreen-grp {
230+
fsl,pins = <
231+
MX6QDL_PAD_GPIO_19__GPIO4_IO05 0x1b0b1
232+
>;
233+
};
234+
135235
pinctrl_pcie: pcie-grp {
136236
fsl,pins = <
137237
MX6QDL_PAD_CSI0_DATA_EN__GPIO5_IO20 0x1b0b1
138238
>;
139239
};
140240
};
141241

242+
&ipu1_di0_disp0 {
243+
remote-endpoint = <&lcd_display_in>;
244+
};
245+
142246
&pcie {
143247
pinctrl-names = "default";
144248
pinctrl-0 = <&pinctrl_pcie>;
145249
reset-gpio = <&gpio6 14 GPIO_ACTIVE_LOW>;
146250
status = "okay";
147251
};
148252

253+
&pwm1 {
254+
pinctrl-names = "default";
255+
pinctrl-0 = <&pinctrl_pwm1>;
256+
#pwm-cells = <3>;
257+
status = "okay";
258+
};
259+
149260
&ssi1 {
150261
status = "okay";
151262
};

‎arch/arm/boot/dts/imx6qdl-colibri-v1_1-uhs.dtsi

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
// SPDX-License-Identifier: GPL-2.0+ OR MIT
2+
/*
3+
* Copyright 2020 Toradex
4+
*/
5+
6+
&iomuxc {
7+
pinctrl_usdhc1_100mhz: usdhc1grp100mhz {
8+
fsl,pins = <
9+
MX6QDL_PAD_SD1_CMD__SD1_CMD 0x170b1
10+
MX6QDL_PAD_SD1_CLK__SD1_CLK 0x100b1
11+
MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x170b1
12+
MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x170b1
13+
MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x170b1
14+
MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x170b1
15+
>;
16+
};
17+
18+
pinctrl_usdhc1_200mhz: usdhc1grp200mhz {
19+
fsl,pins = <
20+
MX6QDL_PAD_SD1_CMD__SD1_CMD 0x170f1
21+
MX6QDL_PAD_SD1_CLK__SD1_CLK 0x100f1
22+
MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x170f1
23+
MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x170f1
24+
MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x170f1
25+
MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x170f1
26+
>;
27+
};
28+
};
29+
30+
/* Colibri MMC */
31+
&usdhc1 {
32+
pinctrl-names = "default", "state_100mhz", "state_200mhz";
33+
pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_mmc_cd>;
34+
pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_mmc_cd>;
35+
pinctrl-2 = <&pinctrl_usdhc1_200mhz &pinctrl_mmc_cd>;
36+
vmmc-supply = <&reg_module_3v3>;
37+
vqmmc-supply = <&vgen3_reg>;
38+
wakeup-source;
39+
keep-power-in-suspend;
40+
sd-uhs-sdr12;
41+
sd-uhs-sdr25;
42+
sd-uhs-sdr50;
43+
sd-uhs-sdr104;
44+
};

‎arch/arm/boot/dts/imx6qdl-colibri.dtsi

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,16 @@
193193
regulator-always-on;
194194
};
195195

196-
/* vgen3: unused */
196+
/*
197+
* +V3.3_1.8_SD1 coming off VGEN3 and supplying
198+
* the i.MX 6 NVCC_SD1.
199+
*/
200+
vgen3_reg: vgen3 {
201+
regulator-min-microvolt = <1800000>;
202+
regulator-max-microvolt = <3300000>;
203+
regulator-boot-on;
204+
regulator-always-on;
205+
};
197206

198207
vgen4_reg: vgen4 {
199208
regulator-min-microvolt = <1800000>;

0 commit comments

Comments
 (0)