diff options
author | Olof Johansson <olof@lixom.net> | 2012-11-21 01:06:05 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-11-21 02:13:11 -0800 |
commit | 17bffc78438d010c3e57ad5c1956e3ab50be423a (patch) | |
tree | b69583a61ba780be64ce806c208bc170ff44fa4f /arch/arm/include | |
parent | f86804af89686562fdeeabbdc0dfc6db9397f202 (diff) | |
parent | bcd6f569e87471d7f104bd9497f0b516a3b12e32 (diff) | |
download | op-kernel-dev-17bffc78438d010c3e57ad5c1956e3ab50be423a.zip op-kernel-dev-17bffc78438d010c3e57ad5c1956e3ab50be423a.tar.gz |
Merge branch 'depends/clk' into next/soc
From Mike Turquette:
* depends/clk:
clk: Common clocks implementation for Versatile Express
clk: Versatile Express clock generators ("osc") driver
CLK: clk-twl6040: Initial clock driver for OMAP4+ McPDM fclk clock
clk: fix return value check in sirfsoc_of_clk_init()
clk: fix return value check in of_fixed_clk_setup()
clk: ux500: Update sdmmc clock to 100MHz for u8500
clk: ux500: Support prcmu ape opp voltage clock
mfd: dbx500: Export prmcu_request_ape_opp_100_voltage
clk: Don't return negative numbers for unsigned values with !clk
clk: Fix documentation typos
clk: Document .is_enabled op
clk: SPEAr: Vco-pll: Fix compilation warning
Diffstat (limited to 'arch/arm/include')
-rw-r--r-- | arch/arm/include/asm/hardware/sp810.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/hardware/sp810.h b/arch/arm/include/asm/hardware/sp810.h index 6b9b077..afd7e91 100644 --- a/arch/arm/include/asm/hardware/sp810.h +++ b/arch/arm/include/asm/hardware/sp810.h @@ -56,6 +56,8 @@ #define SCCTRL_TIMEREN1SEL_REFCLK (0 << 17) #define SCCTRL_TIMEREN1SEL_TIMCLK (1 << 17) +#define SCCTRL_TIMERENnSEL_SHIFT(n) (15 + ((n) * 2)) + static inline void sysctl_soft_reset(void __iomem *base) { /* switch to slow mode */ |