diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-11-14 10:38:43 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-11-14 10:38:43 -0800 |
| commit | b357787e74e6dcd82f5a4ac27d920f6425513a23 (patch) | |
| tree | e1a74bbe2bd3dc66151cd10fe50e28fd1eaaf97a /arch/arm/mach-omap2/cclock44xx_data.c | |
| parent | 10d0c9705e80bbd3d587c5fad24599aabaca6688 (diff) | |
| parent | 4ff7e3b65c8e1d8062365296b738fd262cfc2e9c (diff) | |
| download | blackbird-op-linux-b357787e74e6dcd82f5a4ac27d920f6425513a23.tar.gz blackbird-op-linux-b357787e74e6dcd82f5a4ac27d920f6425513a23.zip | |
Merge tag 'for-v3.13/clock-fixes-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into xxx-dt
Several OMAP2+ DSS-related clock fixes for v3.13 from Tomi Valkeinen.
Basic test logs at:
http://www.pwsan.com/omap/testlogs/clock_fixes_v3.13/20131024090906/
Diffstat (limited to 'arch/arm/mach-omap2/cclock44xx_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/cclock44xx_data.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/cclock44xx_data.c b/arch/arm/mach-omap2/cclock44xx_data.c index b237950eb8a3..ec0dc0b1755e 100644 --- a/arch/arm/mach-omap2/cclock44xx_data.c +++ b/arch/arm/mach-omap2/cclock44xx_data.c @@ -830,7 +830,8 @@ DEFINE_CLK_GATE(dss_tv_clk, "extalt_clkin_ck", &extalt_clkin_ck, 0x0, OMAP4430_CM_DSS_DSS_CLKCTRL, OMAP4430_OPTFCLKEN_TV_CLK_SHIFT, 0x0, NULL); -DEFINE_CLK_GATE(dss_dss_clk, "dpll_per_m5x2_ck", &dpll_per_m5x2_ck, 0x0, +DEFINE_CLK_GATE(dss_dss_clk, "dpll_per_m5x2_ck", &dpll_per_m5x2_ck, + CLK_SET_RATE_PARENT, OMAP4430_CM_DSS_DSS_CLKCTRL, OMAP4430_OPTFCLKEN_DSSCLK_SHIFT, 0x0, NULL); |
