Commit 991e0d9d authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'imx-fixes-6.5-2' of...

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@dragonSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 52a93d39 78e869dd
...@@ -182,7 +182,7 @@ i2c_rtc: rtc@68 { ...@@ -182,7 +182,7 @@ i2c_rtc: rtc@68 {
pinctrl-0 = <&pinctrl_rtc_int>; pinctrl-0 = <&pinctrl_rtc_int>;
reg = <0x68>; reg = <0x68>;
interrupt-parent = <&gpio7>; interrupt-parent = <&gpio7>;
interrupts = <8 IRQ_TYPE_LEVEL_HIGH>; interrupts = <8 IRQ_TYPE_LEVEL_LOW>;
status = "disabled"; status = "disabled";
}; };
}; };
......
...@@ -863,7 +863,6 @@ port@0 { ...@@ -863,7 +863,6 @@ port@0 {
reg = <0>; reg = <0>;
ldb_from_lcdif1: endpoint { ldb_from_lcdif1: endpoint {
remote-endpoint = <&lcdif1_to_ldb>;
}; };
}; };
...@@ -1010,6 +1009,8 @@ usdhc1: mmc@2190000 { ...@@ -1010,6 +1009,8 @@ usdhc1: mmc@2190000 {
<&clks IMX6SX_CLK_USDHC1>; <&clks IMX6SX_CLK_USDHC1>;
clock-names = "ipg", "ahb", "per"; clock-names = "ipg", "ahb", "per";
bus-width = <4>; bus-width = <4>;
fsl,tuning-start-tap = <20>;
fsl,tuning-step= <2>;
status = "disabled"; status = "disabled";
}; };
...@@ -1022,6 +1023,8 @@ usdhc2: mmc@2194000 { ...@@ -1022,6 +1023,8 @@ usdhc2: mmc@2194000 {
<&clks IMX6SX_CLK_USDHC2>; <&clks IMX6SX_CLK_USDHC2>;
clock-names = "ipg", "ahb", "per"; clock-names = "ipg", "ahb", "per";
bus-width = <4>; bus-width = <4>;
fsl,tuning-start-tap = <20>;
fsl,tuning-step= <2>;
status = "disabled"; status = "disabled";
}; };
...@@ -1034,6 +1037,8 @@ usdhc3: mmc@2198000 { ...@@ -1034,6 +1037,8 @@ usdhc3: mmc@2198000 {
<&clks IMX6SX_CLK_USDHC3>; <&clks IMX6SX_CLK_USDHC3>;
clock-names = "ipg", "ahb", "per"; clock-names = "ipg", "ahb", "per";
bus-width = <4>; bus-width = <4>;
fsl,tuning-start-tap = <20>;
fsl,tuning-step= <2>;
status = "disabled"; status = "disabled";
}; };
...@@ -1309,11 +1314,8 @@ lcdif1: lcdif@2220000 { ...@@ -1309,11 +1314,8 @@ lcdif1: lcdif@2220000 {
power-domains = <&pd_disp>; power-domains = <&pd_disp>;
status = "disabled"; status = "disabled";
ports { port {
port { lcdif1_to_ldb: endpoint {
lcdif1_to_ldb: endpoint {
remote-endpoint = <&ldb_from_lcdif1>;
};
}; };
}; };
}; };
......
...@@ -1184,6 +1184,8 @@ usdhc1: mmc@30b40000 { ...@@ -1184,6 +1184,8 @@ usdhc1: mmc@30b40000 {
<&clks IMX7D_USDHC1_ROOT_CLK>; <&clks IMX7D_USDHC1_ROOT_CLK>;
clock-names = "ipg", "ahb", "per"; clock-names = "ipg", "ahb", "per";
bus-width = <4>; bus-width = <4>;
fsl,tuning-step = <2>;
fsl,tuning-start-tap = <20>;
status = "disabled"; status = "disabled";
}; };
...@@ -1196,6 +1198,8 @@ usdhc2: mmc@30b50000 { ...@@ -1196,6 +1198,8 @@ usdhc2: mmc@30b50000 {
<&clks IMX7D_USDHC2_ROOT_CLK>; <&clks IMX7D_USDHC2_ROOT_CLK>;
clock-names = "ipg", "ahb", "per"; clock-names = "ipg", "ahb", "per";
bus-width = <4>; bus-width = <4>;
fsl,tuning-step = <2>;
fsl,tuning-start-tap = <20>;
status = "disabled"; status = "disabled";
}; };
...@@ -1208,6 +1212,8 @@ usdhc3: mmc@30b60000 { ...@@ -1208,6 +1212,8 @@ usdhc3: mmc@30b60000 {
<&clks IMX7D_USDHC3_ROOT_CLK>; <&clks IMX7D_USDHC3_ROOT_CLK>;
clock-names = "ipg", "ahb", "per"; clock-names = "ipg", "ahb", "per";
bus-width = <4>; bus-width = <4>;
fsl,tuning-step = <2>;
fsl,tuning-start-tap = <20>;
status = "disabled"; status = "disabled";
}; };
......
...@@ -1221,10 +1221,9 @@ mipi_csi: mipi-csi@32e30000 { ...@@ -1221,10 +1221,9 @@ mipi_csi: mipi-csi@32e30000 {
compatible = "fsl,imx8mm-mipi-csi2"; compatible = "fsl,imx8mm-mipi-csi2";
reg = <0x32e30000 0x1000>; reg = <0x32e30000 0x1000>;
interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
assigned-clocks = <&clk IMX8MM_CLK_CSI1_CORE>, assigned-clocks = <&clk IMX8MM_CLK_CSI1_CORE>;
<&clk IMX8MM_CLK_CSI1_PHY_REF>; assigned-clock-parents = <&clk IMX8MM_SYS_PLL2_1000M>;
assigned-clock-parents = <&clk IMX8MM_SYS_PLL2_1000M>,
<&clk IMX8MM_SYS_PLL2_1000M>;
clock-frequency = <333000000>; clock-frequency = <333000000>;
clocks = <&clk IMX8MM_CLK_DISP_APB_ROOT>, clocks = <&clk IMX8MM_CLK_DISP_APB_ROOT>,
<&clk IMX8MM_CLK_CSI1_ROOT>, <&clk IMX8MM_CLK_CSI1_ROOT>,
......
...@@ -1175,10 +1175,8 @@ mipi_csi: mipi-csi@32e30000 { ...@@ -1175,10 +1175,8 @@ mipi_csi: mipi-csi@32e30000 {
compatible = "fsl,imx8mm-mipi-csi2"; compatible = "fsl,imx8mm-mipi-csi2";
reg = <0x32e30000 0x1000>; reg = <0x32e30000 0x1000>;
interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
assigned-clocks = <&clk IMX8MN_CLK_CAMERA_PIXEL>, assigned-clocks = <&clk IMX8MN_CLK_CAMERA_PIXEL>;
<&clk IMX8MN_CLK_CSI1_PHY_REF>; assigned-clock-parents = <&clk IMX8MN_SYS_PLL2_1000M>;
assigned-clock-parents = <&clk IMX8MN_SYS_PLL2_1000M>,
<&clk IMX8MN_SYS_PLL2_1000M>;
assigned-clock-rates = <333000000>; assigned-clock-rates = <333000000>;
clock-frequency = <333000000>; clock-frequency = <333000000>;
clocks = <&clk IMX8MN_CLK_DISP_APB_ROOT>, clocks = <&clk IMX8MN_CLK_DISP_APB_ROOT>,
......
...@@ -340,7 +340,7 @@ mediamix: power-domain@44462400 { ...@@ -340,7 +340,7 @@ mediamix: power-domain@44462400 {
anatop: anatop@44480000 { anatop: anatop@44480000 {
compatible = "fsl,imx93-anatop", "syscon"; compatible = "fsl,imx93-anatop", "syscon";
reg = <0x44480000 0x10000>; reg = <0x44480000 0x2000>;
}; };
adc1: adc@44530000 { adc1: adc@44530000 {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment