summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMike Turquette <mturquette@linaro.org>2014-07-02 21:05:56 +0400
committerMike Turquette <mturquette@linaro.org>2014-07-02 21:05:56 +0400
commit4924b8a2fa137335bef82829733b30a5172e51b3 (patch)
treeb4475934e16fb14f1413f2a2892c732af420b1f4 /include
parent5c726dcdd22d2fa007a87e258128393acfc364d2 (diff)
parent44ff0254b89079a8a95e652635e760d93196ac1f (diff)
downloadlinux-4924b8a2fa137335bef82829733b30a5172e51b3.tar.xz
Merge tag 'for_3.16/samsung-clk-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tfiga/samsung-clk into clk-fixes-samsung
Samsung clock fixes for v3.16. This pull request contains fixes for various issues found while testing -rc versions of Linux 3.16. Mostly two kinds of patches: * Fixes of incorrectly defined clocks 1) a37c82a clk: samsung: exynos4: Remove SRC_MASK_ISP gates Issue present since v3.10. 2) 0b1643b clk/exynos5250: fix bit number for tv sysmmu clock Issue present since v3.16. 3) 44ff025 clk: exynos5420: Remove aclk66_peric from the clock tree description Issue present since v3.11. * Adding things missed by original patches 1) cec1cde clk: samsung: fix several typos to fix boot on s3c2410 2) 34ece9e clk: samsung: add more aliases for s3c24xx Both issues present since the driver was added in v3.16. 3) a92dda4 clk: s3c64xx: Hookup SPI clocks correctly Issue present since v3.12.
Diffstat (limited to 'include')
-rw-r--r--include/dt-bindings/clock/exynos5420.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/dt-bindings/clock/exynos5420.h b/include/dt-bindings/clock/exynos5420.h
index 97dcb89d37d3..14e1c8f9640c 100644
--- a/include/dt-bindings/clock/exynos5420.h
+++ b/include/dt-bindings/clock/exynos5420.h
@@ -63,7 +63,6 @@
#define CLK_SCLK_MPHY_IXTAL24 161
/* gate clocks */
-#define CLK_ACLK66_PERIC 256
#define CLK_UART0 257
#define CLK_UART1 258
#define CLK_UART2 259