diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-03-19 11:20:16 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-03-19 11:20:16 -0700 |
| commit | d736f64a1a10fa7ed5761e4954112825c18320c4 (patch) | |
| tree | 8e0d9d6316a7dcbf091b1c67265a71cca474f395 /arch/arm/mach-omap2/omap_hwmod_44xx_data.c | |
| parent | a937536b868b8369b98967929045f1df54234323 (diff) | |
| parent | 92702df3570e1ccfa050e135e50c450502251b79 (diff) | |
| download | olio-linux-3.10-d736f64a1a10fa7ed5761e4954112825c18320c4.tar.xz olio-linux-3.10-d736f64a1a10fa7ed5761e4954112825c18320c4.zip | |
Merge tag 'omap-fixes-a-for-3.9-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.9-rc3/fixes
Miscellaneous OMAP fixes for v3.9-rc. These primarily deal with OMAP2+ power
management regressions. There's also a fix for the OMAP1 OHCI controller.
Basic build, boot, and PM test logs are at:
http://www.pwsan.com/omap/testlogs/fixes_a_3.9-rc/20130314101856/
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod_44xx_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index 0e47d2e1687..9e0576569e0 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -2714,6 +2714,10 @@ static struct omap_ocp2scp_dev ocp2scp_dev_attr[] = { { } }; +static struct omap_hwmod_opt_clk ocp2scp_usb_phy_opt_clks[] = { + { .role = "48mhz", .clk = "ocp2scp_usb_phy_phy_48m" }, +}; + /* ocp2scp_usb_phy */ static struct omap_hwmod omap44xx_ocp2scp_usb_phy_hwmod = { .name = "ocp2scp_usb_phy", @@ -2728,6 +2732,8 @@ static struct omap_hwmod omap44xx_ocp2scp_usb_phy_hwmod = { }, }, .dev_attr = ocp2scp_dev_attr, + .opt_clks = ocp2scp_usb_phy_opt_clks, + .opt_clks_cnt = ARRAY_SIZE(ocp2scp_usb_phy_opt_clks), }; /* |