diff options
author | Michael Turquette <mturquette@baylibre.com> | 2015-12-22 19:34:10 +0100 |
---|---|---|
committer | Michael Turquette <mturquette@baylibre.com> | 2015-12-22 20:57:35 +0100 |
commit | b8f15e711904712e71d2aac3241f9669d0b62917 (patch) | |
tree | e44d2f1b0fdf7068df8d52318c1e74f7e3020468 /arch/arm/mach-omap2 | |
parent | Linux 4.4-rc6 (diff) | |
parent | Merge tag 'imx-clk-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/sha... (diff) | |
download | linux-b8f15e711904712e71d2aac3241f9669d0b62917.tar.xz linux-b8f15e711904712e71d2aac3241f9669d0b62917.zip |
Merge commit 'fe5fa8fbd4d47f40a45fa29ee1abdb10cb061ec2' into clk-next
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/clock.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index acb60ed17273..d058125876d8 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c @@ -225,5 +225,9 @@ void __init ti_clk_init_features(void) if (omap_rev() == OMAP3430_REV_ES1_0) features.flags |= TI_CLK_DPLL4_DENY_REPROGRAM; + /* Errata I810 for omap5 / dra7 */ + if (soc_is_omap54xx() || soc_is_dra7xx()) + features.flags |= TI_CLK_ERRATA_I810; + ti_clk_setup_features(&features); } |