Merge branch 'v3.18-next/armclkid' into v3.18-next/cpuclk
This commit is contained in:
commit
f79c3c0154
2 changed files with 2 additions and 0 deletions
|
@ -20,6 +20,7 @@
|
||||||
#define PLL_GPLL 4
|
#define PLL_GPLL 4
|
||||||
#define CORE_PERI 5
|
#define CORE_PERI 5
|
||||||
#define CORE_L2C 6
|
#define CORE_L2C 6
|
||||||
|
#define ARMCLK 7
|
||||||
|
|
||||||
/* sclk gates (special clocks) */
|
/* sclk gates (special clocks) */
|
||||||
#define SCLK_UART0 64
|
#define SCLK_UART0 64
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
#define PLL_CPLL 3
|
#define PLL_CPLL 3
|
||||||
#define PLL_GPLL 4
|
#define PLL_GPLL 4
|
||||||
#define PLL_NPLL 5
|
#define PLL_NPLL 5
|
||||||
|
#define ARMCLK 6
|
||||||
|
|
||||||
/* sclk gates (special clocks) */
|
/* sclk gates (special clocks) */
|
||||||
#define SCLK_GPU 64
|
#define SCLK_GPU 64
|
||||||
|
|
Loading…
Reference in a new issue