Re: CHIPPro NAND issue with 4.12 rc1

[Angus Ainslie]

On 2017-05-23 13:52, Maxime Ripard wrote:

Ok, good.

If you unrevert those patches, and add clk_ignore_unused to the kernel
command line, is it still broken?

Maxime


If I use the clk_ignore_unused flag with the patches below then the 
kernel can boot and mount the nand.

diff --git a/drivers/clk/sunxi-ng/ccu-sun5i.c 
b/drivers/clk/sunxi-ng/ccu-sun5i.c
index 5c476f9..700944c 100644
--- a/drivers/clk/sunxi-ng/ccu-sun5i.c
+++ b/drivers/clk/sunxi-ng/ccu-sun5i.c
@@ -251,7 +251,7 @@ static SUNXI_CCU_GATE(ahb_mmc1_clk, "ahb-mmc1",     
"ahb",
 static SUNXI_CCU_GATE(ahb_mmc2_clk,    "ahb-mmc2",     "ahb",
                      0x060, BIT(10), 0);
 static SUNXI_CCU_GATE(ahb_nand_clk,    "ahb-nand",     "ahb",
-                     0x060, BIT(13), 0);
+                     0x060, BIT(13), CLK_IS_CRITICAL);
 static SUNXI_CCU_GATE(ahb_sdram_clk,   "ahb-sdram",    "ahb",
                      0x060, BIT(14), CLK_IS_CRITICAL);
 static SUNXI_CCU_GATE(ahb_emac_clk,    "ahb-emac",     "ahb",


diff --git a/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts 
b/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts
index c55b11a..fa37cce 100644
--- a/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts
+++ b/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts
@@ -146,6 +149,32 @@
                reg = <0>;
                allwinner,rb = <0>;
                nand-ecc-mode = "hw";
+    nand-on-flash-bbt;
+
+    spl@0 {
+      label = "SPL";
+      reg = /bits/ 64 <0x0 0x400000>;
+    };
+
+    spl-backup@400000 {
+      label = "SPL.backup";
+      reg = /bits/ 64 <0x400000 0x400000>;
+    };
+
+    u-boot@800000 {
+      label = "U-Boot";
+      reg = /bits/ 64 <0x800000 0x400000>;
+    };
+
+    env@c00000 {
+      label = "env";
+      reg = /bits/ 64 <0xc00000 0x400000>;
+    };
+
+    rootfs@1000000 {
+      label = "rootfs";
+      reg = /bits/ 64 <0x1000000 0x1f000000>;
+    };
        };
 };