OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 16... Line 16...
16 Furthermore, a bit of documentation is added to clarify that the 16 Furthermore, a bit of documentation is added to clarify that the
17 required setting for the PLL LDO is 1.37v as per the A31 manual. 17 required setting for the PLL LDO is 1.37v as per the A31 manual.
Line 18... Line 18...
18   18  
19 --- a/arch/arm/mach-sunxi/clock_sun6i.c 19 --- a/arch/arm/mach-sunxi/clock_sun6i.c
20 +++ b/arch/arm/mach-sunxi/clock_sun6i.c 20 +++ b/arch/arm/mach-sunxi/clock_sun6i.c
21 @@ -25,13 +25,26 @@ void clock_init_safe(void) 21 @@ -26,13 +26,26 @@ void clock_init_safe(void)
22 struct sunxi_prcm_reg * const prcm = 22 struct sunxi_prcm_reg * const prcm =
Line 23... Line 23...
23 (struct sunxi_prcm_reg *)SUNXI_PRCM_BASE; 23 (struct sunxi_prcm_reg *)SUNXI_PRCM_BASE;
24 24
Line 47... Line 47...
47 #endif 47 #endif
Line 48... Line 48...
48 48
49 #if defined(CONFIG_MACH_SUN8I_R40) || defined(CONFIG_MACH_SUN50I) 49 #if defined(CONFIG_MACH_SUN8I_R40) || defined(CONFIG_MACH_SUN50I)
50 --- a/arch/arm/include/asm/arch-sunxi/prcm.h 50 --- a/arch/arm/include/asm/arch-sunxi/prcm.h
51 +++ b/arch/arm/include/asm/arch-sunxi/prcm.h 51 +++ b/arch/arm/include/asm/arch-sunxi/prcm.h
52 @@ -110,13 +110,13 @@ 52 @@ -111,13 +111,13 @@
53 #define PRCM_PLL_CTRL_LDO_OUT_MASK \ 53 #define PRCM_PLL_CTRL_LDO_OUT_MASK \
54 __PRCM_PLL_CTRL_LDO_OUT(0x7) 54 __PRCM_PLL_CTRL_LDO_OUT(0x7)
55 /* When using the low voltage 20 mV steps, and high voltage 30 mV steps */ 55 /* When using the low voltage 20 mV steps, and high voltage 30 mV steps */
56 -#define PRCM_PLL_CTRL_LDO_OUT_L(n) \ 56 -#define PRCM_PLL_CTRL_LDO_OUT_L(n) \