diff options
| author | Olof Johansson <olof@lixom.net> | 2015-08-20 18:35:02 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-08-20 18:35:02 -0700 |
| commit | 6b0770582d3b1c60172bc515d658fa12a72e1faf (patch) | |
| tree | 379094d2596a7cb42cd3e2524477be77b10eb58b /include | |
| parent | bc0195aad0daa2ad5b0d76cce22b167bc3435590 (diff) | |
| parent | cd6aceef028afc3fa216e3e7bc94cc31632cad43 (diff) | |
| download | linux-6b0770582d3b1c60172bc515d658fa12a72e1faf.tar.gz linux-6b0770582d3b1c60172bc515d658fa12a72e1faf.tar.bz2 linux-6b0770582d3b1c60172bc515d658fa12a72e1faf.zip | |
Merge tag 'samsung-clk-driver' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/late
Samsung clk driver updates for v4.3
- add cpu clock configuration data and instantiate cpu clock
for exynos3250, 4210, 4412 and 5250 SoCs to support Samsung
specific cpu-clock type
* Note this branch has been provided to clk tree as a topic branch
* tag 'samsung-clk-driver' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
clk: exynos4x12: add cpu clock configuration data and instantiate cpu clock
clk: exynos3250: Add cpu clock configuration data and instaniate cpu clock
clk: exynos5250: add cpu clock configuration data and instantiate cpu clock
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/clock/exynos3250.h | 1 | ||||
| -rw-r--r-- | include/dt-bindings/clock/exynos5250.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/exynos3250.h b/include/dt-bindings/clock/exynos3250.h index aab088d30199..63d01c15d2b3 100644 --- a/include/dt-bindings/clock/exynos3250.h +++ b/include/dt-bindings/clock/exynos3250.h @@ -31,6 +31,7 @@ #define CLK_FOUT_VPLL 4 #define CLK_FOUT_UPLL 5 #define CLK_FOUT_MPLL 6 +#define CLK_ARM_CLK 7 /* Muxes */ #define CLK_MOUT_MPLL_USER_L 16 diff --git a/include/dt-bindings/clock/exynos5250.h b/include/dt-bindings/clock/exynos5250.h index 4273891dc78e..8183d1c237d9 100644 --- a/include/dt-bindings/clock/exynos5250.h +++ b/include/dt-bindings/clock/exynos5250.h @@ -21,6 +21,7 @@ #define CLK_FOUT_CPLL 6 #define CLK_FOUT_EPLL 7 #define CLK_FOUT_VPLL 8 +#define CLK_ARM_CLK 9 /* gate for special clocks (sclk) */ #define CLK_SCLK_CAM_BAYER 128 |