MLK-11349-2 ARM: dts: disable apbh dma on imx7d

APBH DMA needs NAND clk to be enabled, its driver
does NOT handle this clk very well, so kernel
will boot up fail without NAND clk enabled, so
disable APBH DMA by default.

Signed-off-by: Anson Huang <b20788@freescale.com>

diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi
index 7f9e3d2..5dc5064 100644 (file)
--- a/arch/arm/boot/dts/imx7d.dtsi
+++ b/arch/arm/boot/dts/imx7d.dtsi
@@ -153,6 +153,7 @@
                        clocks = <&clks IMX7D_NAND_USDHC_BUS_ROOT_CLK>,
                                <&clks IMX7D_NAND_ROOT_CLK>;
                        clock-names = "dma_apbh_bch", "dma_apbh_io";
+                       status = "disabled";
                };
 
                pcie: pcie@0x33800000 {

diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 2b6cb05..98c3e89 100644 (file)
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -926,8 +926,8 @@
                                compatible = "fsl,imx7d-usdhc", "fsl,imx6sl-usdhc";
                                reg = <0x30b40000 0x10000>;
                                interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
-                               clocks = <&clks IMX7D_CLK_DUMMY>,
-                                       <&clks IMX7D_CLK_DUMMY>,
+                               clocks = <&clks IMX7D_IPG_ROOT_CLK>,
+                                       <&clks IMX7D_NAND_USDHC_BUS_ROOT_CLK>,
                                        <&clks IMX7D_USDHC1_ROOT_CLK>;
                                clock-names = "ipg", "ahb", "per";
                                bus-width = <4>;