Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f79c3c01 authored by Heiko Stuebner's avatar Heiko Stuebner
Browse files

Merge branch 'v3.18-next/armclkid' into v3.18-next/cpuclk

parents b52f4914 4d742e62

include/dt-bindings/clock/rk3188-cru-common.h

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#define PLL_GPLL		4

#define CORE_PERI		5

#define CORE_L2C		6

#define ARMCLK			7



/* sclk gates (special clocks) */

#define SCLK_UART0		64

include/dt-bindings/clock/rk3288-cru.h

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#define PLL_CPLL		3

#define PLL_GPLL		4

#define PLL_NPLL		5

#define ARMCLK			6



/* sclk gates (special clocks) */

#define SCLK_GPU		64