Skip to content

Commit 128795b

Browse files
committed
Merge tag 'imx-fixes-6.15' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes
i.MX fixes for 6.15: - An i.MX8MP change from Ahmad Fatoum to fix the broken nominal device tree caused by commit 9f7595b ("arm64: dts: imx8mp: configure GPU and NPU clocks to overdrive rate") - A MAINTAINERS update from Michael Riesch to exclude Sony IMX image sensor drivers from i.MX entry - A i.MX95 device tree change from Richard Zhu to correct the range of PCIe app-reg region - An opos6ul device tree change from Sébastien Szymanski to fix an Ethernet regression caused by commit c7e73b5 ("ARM: imx: mach-imx6ul: remove 14x14 EVK specific PHY fixup") - An imx8mm-verdin device tree change from Wojciech Dubowik to fix a SD card regression caused by commit f5aab04 ("regulator: pca9450: Fix enable register for LDO5") * tag 'imx-fixes-6.15' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: arm64: dts: imx8mm-verdin: Link reg_usdhc2_vqmmc to usdhc2 MAINTAINERS: add exclude for dt-bindings to imx entry ARM: dts: opos6ul: add ksz8081 phy properties arm64: dts: imx95: Correct the range of PCIe app-reg region arm64: dts: imx8mp: configure GPU and NPU clocks in nominal DTSI
2 parents 7771f41 + 5591ce0 commit 128795b

File tree

5 files changed

+54
-9
lines changed

5 files changed

+54
-9
lines changed

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2519,6 +2519,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
25192519
F: arch/arm/boot/dts/nxp/imx/
25202520
F: arch/arm/boot/dts/nxp/mxs/
25212521
F: arch/arm64/boot/dts/freescale/
2522+
X: Documentation/devicetree/bindings/media/i2c/
25222523
X: arch/arm64/boot/dts/freescale/fsl-*
25232524
X: arch/arm64/boot/dts/freescale/qoriq-*
25242525
X: drivers/media/i2c/

arch/arm/boot/dts/nxp/imx/imx6ul-imx6ull-opos6ul.dtsi

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040
reg = <1>;
4141
interrupt-parent = <&gpio4>;
4242
interrupts = <16 IRQ_TYPE_LEVEL_LOW>;
43+
micrel,led-mode = <1>;
44+
clocks = <&clks IMX6UL_CLK_ENET_REF>;
45+
clock-names = "rmii-ref";
4346
status = "okay";
4447
};
4548
};

arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,19 @@
144144
startup-delay-us = <20000>;
145145
};
146146

147+
reg_usdhc2_vqmmc: regulator-usdhc2-vqmmc {
148+
compatible = "regulator-gpio";
149+
pinctrl-names = "default";
150+
pinctrl-0 = <&pinctrl_usdhc2_vsel>;
151+
gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
152+
regulator-max-microvolt = <3300000>;
153+
regulator-min-microvolt = <1800000>;
154+
states = <1800000 0x1>,
155+
<3300000 0x0>;
156+
regulator-name = "PMIC_USDHC_VSELECT";
157+
vin-supply = <&reg_nvcc_sd>;
158+
};
159+
147160
reserved-memory {
148161
#address-cells = <2>;
149162
#size-cells = <2>;
@@ -269,7 +282,7 @@
269282
"SODIMM_19",
270283
"",
271284
"",
272-
"",
285+
"PMIC_USDHC_VSELECT",
273286
"",
274287
"",
275288
"",
@@ -785,6 +798,7 @@
785798
pinctrl-2 = <&pinctrl_usdhc2_200mhz>, <&pinctrl_usdhc2_cd>;
786799
pinctrl-3 = <&pinctrl_usdhc2_sleep>, <&pinctrl_usdhc2_cd_sleep>;
787800
vmmc-supply = <&reg_usdhc2_vmmc>;
801+
vqmmc-supply = <&reg_usdhc2_vqmmc>;
788802
};
789803

790804
&wdog1 {
@@ -1206,13 +1220,17 @@
12061220
<MX8MM_IOMUXC_NAND_CLE_GPIO3_IO5 0x6>; /* SODIMM 76 */
12071221
};
12081222

1223+
pinctrl_usdhc2_vsel: usdhc2vselgrp {
1224+
fsl,pins =
1225+
<MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x10>; /* PMIC_USDHC_VSELECT */
1226+
};
1227+
12091228
/*
12101229
* Note: Due to ERR050080 we use discrete external on-module resistors pulling-up to the
12111230
* on-module +V3.3_1.8_SD (LDO5) rail and explicitly disable the internal pull-ups here.
12121231
*/
12131232
pinctrl_usdhc2: usdhc2grp {
12141233
fsl,pins =
1215-
<MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0x10>,
12161234
<MX8MM_IOMUXC_SD2_CLK_USDHC2_CLK 0x90>, /* SODIMM 78 */
12171235
<MX8MM_IOMUXC_SD2_CMD_USDHC2_CMD 0x90>, /* SODIMM 74 */
12181236
<MX8MM_IOMUXC_SD2_DATA0_USDHC2_DATA0 0x90>, /* SODIMM 80 */
@@ -1223,7 +1241,6 @@
12231241

12241242
pinctrl_usdhc2_100mhz: usdhc2-100mhzgrp {
12251243
fsl,pins =
1226-
<MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0x10>,
12271244
<MX8MM_IOMUXC_SD2_CLK_USDHC2_CLK 0x94>,
12281245
<MX8MM_IOMUXC_SD2_CMD_USDHC2_CMD 0x94>,
12291246
<MX8MM_IOMUXC_SD2_DATA0_USDHC2_DATA0 0x94>,
@@ -1234,7 +1251,6 @@
12341251

12351252
pinctrl_usdhc2_200mhz: usdhc2-200mhzgrp {
12361253
fsl,pins =
1237-
<MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0x10>,
12381254
<MX8MM_IOMUXC_SD2_CLK_USDHC2_CLK 0x96>,
12391255
<MX8MM_IOMUXC_SD2_CMD_USDHC2_CMD 0x96>,
12401256
<MX8MM_IOMUXC_SD2_DATA0_USDHC2_DATA0 0x96>,
@@ -1246,7 +1262,6 @@
12461262
/* Avoid backfeeding with removed card power */
12471263
pinctrl_usdhc2_sleep: usdhc2slpgrp {
12481264
fsl,pins =
1249-
<MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0x0>,
12501265
<MX8MM_IOMUXC_SD2_CLK_USDHC2_CLK 0x0>,
12511266
<MX8MM_IOMUXC_SD2_CMD_USDHC2_CMD 0x0>,
12521267
<MX8MM_IOMUXC_SD2_DATA0_USDHC2_DATA0 0x0>,

arch/arm64/boot/dts/freescale/imx8mp-nominal.dtsi

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,20 @@
2424
fsl,operating-mode = "nominal";
2525
};
2626

27+
&gpu2d {
28+
assigned-clocks = <&clk IMX8MP_CLK_GPU2D_CORE>;
29+
assigned-clock-parents = <&clk IMX8MP_SYS_PLL1_800M>;
30+
assigned-clock-rates = <800000000>;
31+
};
32+
33+
&gpu3d {
34+
assigned-clocks = <&clk IMX8MP_CLK_GPU3D_CORE>,
35+
<&clk IMX8MP_CLK_GPU3D_SHADER_CORE>;
36+
assigned-clock-parents = <&clk IMX8MP_SYS_PLL1_800M>,
37+
<&clk IMX8MP_SYS_PLL1_800M>;
38+
assigned-clock-rates = <800000000>, <800000000>;
39+
};
40+
2741
&pgc_hdmimix {
2842
assigned-clocks = <&clk IMX8MP_CLK_HDMI_AXI>,
2943
<&clk IMX8MP_CLK_HDMI_APB>;
@@ -46,6 +60,18 @@
4660
assigned-clock-rates = <600000000>, <300000000>;
4761
};
4862

63+
&pgc_mlmix {
64+
assigned-clocks = <&clk IMX8MP_CLK_ML_CORE>,
65+
<&clk IMX8MP_CLK_ML_AXI>,
66+
<&clk IMX8MP_CLK_ML_AHB>;
67+
assigned-clock-parents = <&clk IMX8MP_SYS_PLL1_800M>,
68+
<&clk IMX8MP_SYS_PLL1_800M>,
69+
<&clk IMX8MP_SYS_PLL1_800M>;
70+
assigned-clock-rates = <800000000>,
71+
<800000000>,
72+
<300000000>;
73+
};
74+
4975
&media_blk_ctrl {
5076
assigned-clocks = <&clk IMX8MP_CLK_MEDIA_AXI>,
5177
<&clk IMX8MP_CLK_MEDIA_APB>,

arch/arm64/boot/dts/freescale/imx95.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1626,7 +1626,7 @@
16261626
reg = <0 0x4c300000 0 0x10000>,
16271627
<0 0x60100000 0 0xfe00000>,
16281628
<0 0x4c360000 0 0x10000>,
1629-
<0 0x4c340000 0 0x2000>;
1629+
<0 0x4c340000 0 0x4000>;
16301630
reg-names = "dbi", "config", "atu", "app";
16311631
ranges = <0x81000000 0x0 0x00000000 0x0 0x6ff00000 0 0x00100000>,
16321632
<0x82000000 0x0 0x10000000 0x9 0x10000000 0 0x10000000>;
@@ -1673,7 +1673,7 @@
16731673
reg = <0 0x4c300000 0 0x10000>,
16741674
<0 0x4c360000 0 0x1000>,
16751675
<0 0x4c320000 0 0x1000>,
1676-
<0 0x4c340000 0 0x2000>,
1676+
<0 0x4c340000 0 0x4000>,
16771677
<0 0x4c370000 0 0x10000>,
16781678
<0x9 0 1 0>;
16791679
reg-names = "dbi","atu", "dbi2", "app", "dma", "addr_space";
@@ -1700,7 +1700,7 @@
17001700
reg = <0 0x4c380000 0 0x10000>,
17011701
<8 0x80100000 0 0xfe00000>,
17021702
<0 0x4c3e0000 0 0x10000>,
1703-
<0 0x4c3c0000 0 0x2000>;
1703+
<0 0x4c3c0000 0 0x4000>;
17041704
reg-names = "dbi", "config", "atu", "app";
17051705
ranges = <0x81000000 0 0x00000000 0x8 0x8ff00000 0 0x00100000>,
17061706
<0x82000000 0 0x10000000 0xa 0x10000000 0 0x10000000>;
@@ -1749,7 +1749,7 @@
17491749
reg = <0 0x4c380000 0 0x10000>,
17501750
<0 0x4c3e0000 0 0x1000>,
17511751
<0 0x4c3a0000 0 0x1000>,
1752-
<0 0x4c3c0000 0 0x2000>,
1752+
<0 0x4c3c0000 0 0x4000>,
17531753
<0 0x4c3f0000 0 0x10000>,
17541754
<0xa 0 1 0>;
17551755
reg-names = "dbi", "atu", "dbi2", "app", "dma", "addr_space";

0 commit comments

Comments
 (0)