Skip to content

Commit 991e0d9

Browse files
committed
Merge tag 'imx-fixes-6.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes
i.MX fixes for 6.5, 2nd round: - Fix i.MX93 ANATOP 'reg' resource size to avoid overlapping with TMU memory area. - Fix RTC interrupt level on imx6qdl-phytec-mira board. - Remove LDB endpoint from from the common imx6sx.dtsi as it causes regression for boards that has the LCDIF connected directly to a parallel display. - Drop CSI1 PHY reference clock configuration from i.MX8MM/N device tree to avoid overclocking. - Set a proper default tuning step for i.MX6SX and i.MX7D uSDHC to fix a tuning failure seen with some SD cards. * tag 'imx-fixes-6.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: arm64: dts: imx93: Fix anatop node size ARM: dts: imx: Set default tuning step for imx6sx usdhc arm64: dts: imx8mm: Drop CSI1 PHY reference clock configuration arm64: dts: imx8mn: Drop CSI1 PHY reference clock configuration ARM: dts: imx: Set default tuning step for imx7d usdhc ARM: dts: imx6: phytec: fix RTC interrupt level ARM: dts: imx6sx: Remove LDB endpoint Link: https://lore.kernel.org/r/20230809100034.GS151430@dragon Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 52a93d3 + 78e869d commit 991e0d9

File tree

6 files changed

+21
-16
lines changed

6 files changed

+21
-16
lines changed

arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-mira.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
pinctrl-0 = <&pinctrl_rtc_int>;
183183
reg = <0x68>;
184184
interrupt-parent = <&gpio7>;
185-
interrupts = <8 IRQ_TYPE_LEVEL_HIGH>;
185+
interrupts = <8 IRQ_TYPE_LEVEL_LOW>;
186186
status = "disabled";
187187
};
188188
};

arch/arm/boot/dts/nxp/imx/imx6sx.dtsi

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,6 @@
863863
reg = <0>;
864864

865865
ldb_from_lcdif1: endpoint {
866-
remote-endpoint = <&lcdif1_to_ldb>;
867866
};
868867
};
869868

@@ -1010,6 +1009,8 @@
10101009
<&clks IMX6SX_CLK_USDHC1>;
10111010
clock-names = "ipg", "ahb", "per";
10121011
bus-width = <4>;
1012+
fsl,tuning-start-tap = <20>;
1013+
fsl,tuning-step= <2>;
10131014
status = "disabled";
10141015
};
10151016

@@ -1022,6 +1023,8 @@
10221023
<&clks IMX6SX_CLK_USDHC2>;
10231024
clock-names = "ipg", "ahb", "per";
10241025
bus-width = <4>;
1026+
fsl,tuning-start-tap = <20>;
1027+
fsl,tuning-step= <2>;
10251028
status = "disabled";
10261029
};
10271030

@@ -1034,6 +1037,8 @@
10341037
<&clks IMX6SX_CLK_USDHC3>;
10351038
clock-names = "ipg", "ahb", "per";
10361039
bus-width = <4>;
1040+
fsl,tuning-start-tap = <20>;
1041+
fsl,tuning-step= <2>;
10371042
status = "disabled";
10381043
};
10391044

@@ -1309,11 +1314,8 @@
13091314
power-domains = <&pd_disp>;
13101315
status = "disabled";
13111316

1312-
ports {
1313-
port {
1314-
lcdif1_to_ldb: endpoint {
1315-
remote-endpoint = <&ldb_from_lcdif1>;
1316-
};
1317+
port {
1318+
lcdif1_to_ldb: endpoint {
13171319
};
13181320
};
13191321
};

arch/arm/boot/dts/nxp/imx/imx7s.dtsi

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1184,6 +1184,8 @@
11841184
<&clks IMX7D_USDHC1_ROOT_CLK>;
11851185
clock-names = "ipg", "ahb", "per";
11861186
bus-width = <4>;
1187+
fsl,tuning-step = <2>;
1188+
fsl,tuning-start-tap = <20>;
11871189
status = "disabled";
11881190
};
11891191

@@ -1196,6 +1198,8 @@
11961198
<&clks IMX7D_USDHC2_ROOT_CLK>;
11971199
clock-names = "ipg", "ahb", "per";
11981200
bus-width = <4>;
1201+
fsl,tuning-step = <2>;
1202+
fsl,tuning-start-tap = <20>;
11991203
status = "disabled";
12001204
};
12011205

@@ -1208,6 +1212,8 @@
12081212
<&clks IMX7D_USDHC3_ROOT_CLK>;
12091213
clock-names = "ipg", "ahb", "per";
12101214
bus-width = <4>;
1215+
fsl,tuning-step = <2>;
1216+
fsl,tuning-start-tap = <20>;
12111217
status = "disabled";
12121218
};
12131219

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,10 +1221,9 @@
12211221
compatible = "fsl,imx8mm-mipi-csi2";
12221222
reg = <0x32e30000 0x1000>;
12231223
interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
1224-
assigned-clocks = <&clk IMX8MM_CLK_CSI1_CORE>,
1225-
<&clk IMX8MM_CLK_CSI1_PHY_REF>;
1226-
assigned-clock-parents = <&clk IMX8MM_SYS_PLL2_1000M>,
1227-
<&clk IMX8MM_SYS_PLL2_1000M>;
1224+
assigned-clocks = <&clk IMX8MM_CLK_CSI1_CORE>;
1225+
assigned-clock-parents = <&clk IMX8MM_SYS_PLL2_1000M>;
1226+
12281227
clock-frequency = <333000000>;
12291228
clocks = <&clk IMX8MM_CLK_DISP_APB_ROOT>,
12301229
<&clk IMX8MM_CLK_CSI1_ROOT>,

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1175,10 +1175,8 @@
11751175
compatible = "fsl,imx8mm-mipi-csi2";
11761176
reg = <0x32e30000 0x1000>;
11771177
interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
1178-
assigned-clocks = <&clk IMX8MN_CLK_CAMERA_PIXEL>,
1179-
<&clk IMX8MN_CLK_CSI1_PHY_REF>;
1180-
assigned-clock-parents = <&clk IMX8MN_SYS_PLL2_1000M>,
1181-
<&clk IMX8MN_SYS_PLL2_1000M>;
1178+
assigned-clocks = <&clk IMX8MN_CLK_CAMERA_PIXEL>;
1179+
assigned-clock-parents = <&clk IMX8MN_SYS_PLL2_1000M>;
11821180
assigned-clock-rates = <333000000>;
11831181
clock-frequency = <333000000>;
11841182
clocks = <&clk IMX8MN_CLK_DISP_APB_ROOT>,

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

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

341341
anatop: anatop@44480000 {
342342
compatible = "fsl,imx93-anatop", "syscon";
343-
reg = <0x44480000 0x10000>;
343+
reg = <0x44480000 0x2000>;
344344
};
345345

346346
adc1: adc@44530000 {

0 commit comments

Comments
 (0)