diff options
author | Michael Turquette <mturquette@linaro.org> | 2014-12-15 13:30:05 -0800 |
---|---|---|
committer | Michael Turquette <mturquette@linaro.org> | 2014-12-15 17:05:07 -0800 |
commit | b1924c2ec1db98278100010ef87b54406d5ce612 (patch) | |
tree | e8cab2230cdf0e85920075bf2489b04030d4a78e /arch/arm/mach-omap2/clock.h | |
parent | 89f7e9de59bf3e3cda2e00de12c66db22675a7cf (diff) | |
parent | 79005fbd3e1d671d08c45c9140ee9826efdc367c (diff) |
Merge tag 'for-v3.19/omap-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into tmp
Some OMAP clock/hwmod patches for v3.19.
Most of the patches are clock-related. The DPLL implementation is
changed to better align to the common clock framework.
There is also a patch that removes a few lines from the hwmod code -
this patch should have no functional effect.
Basic build, boot, and PM test logs for these patches can be found here:
http://www.pwsan.com/omap/testlogs/omap-a-for-v3.19/20141113094101/
Diffstat (limited to 'arch/arm/mach-omap2/clock.h')
-rw-r--r-- | arch/arm/mach-omap2/clock.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h index 4592a2762592..641337c6cde9 100644 --- a/arch/arm/mach-omap2/clock.h +++ b/arch/arm/mach-omap2/clock.h @@ -234,6 +234,7 @@ struct ti_clk_features { }; #define TI_CLK_DPLL_HAS_FREQSEL (1 << 0) +#define TI_CLK_DPLL4_DENY_REPROGRAM (1 << 1) extern struct ti_clk_features ti_clk_features; |