]> git.sur5r.net Git - u-boot/commitdiff
sunxi: Fix sun5i mbus speed when booting old kernels
authorHans de Goede <hdegoede@redhat.com>
Thu, 19 Feb 2015 13:46:44 +0000 (14:46 +0100)
committerHans de Goede <hdegoede@redhat.com>
Sat, 21 Feb 2015 15:53:37 +0000 (16:53 +0100)
Older linux-sunxi-3.4 kernels override our PLL6 setting with 300 MHz,
halving the mbus frequency, so set it to 300 MHz ourselves and base the
mbus divider on that.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
arch/arm/include/asm/arch-sunxi/clock_sun4i.h

index d297ed0f73e434cabcb1345e7c439bcb1639b70e..c28ee0528fb822d4da57e60a578f68ed8b5fdfad 100644 (file)
@@ -144,7 +144,16 @@ struct sunxi_ccm_reg {
 
 #define PLL1_CFG_DEFAULT       0xa1005000
 
+#if defined CONFIG_OLD_SUNXI_KERNEL_COMPAT && defined CONFIG_MACH_SUN5I
+/*
+ * Older linux-sunxi-3.4 kernels override our PLL6 setting with 300 MHz,
+ * halving the mbus frequency, so set it to 300 MHz ourselves and base the
+ * mbus divider on that.
+ */
+#define PLL6_CFG_DEFAULT       0xa1009900
+#else
 #define PLL6_CFG_DEFAULT       0xa1009911
+#endif
 
 /* nand clock */
 #define NAND_CLK_SRC_OSC24             0