diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-02-09 19:55:41 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-02-09 19:55:41 -0800 |
| commit | 3ad4a33158b7a2589149bc5ab29a6723d755c4ba (patch) | |
| tree | 2deb617dc621d487dbf2810fb65a2f891dc7b5ed /arch/arm/mach-omap2/omap_hwmod.c | |
| parent | 88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7 (diff) | |
| parent | 169c82a294e3722eb1e82b7dac58b35fe2119b80 (diff) | |
| download | olio-linux-3.10-3ad4a33158b7a2589149bc5ab29a6723d755c4ba.tar.xz olio-linux-3.10-3ad4a33158b7a2589149bc5ab29a6723d755c4ba.zip | |
Merge tag 'omap-devel-a-for-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.9/am33xx
Fixes and IP block support for the TI AM33xx family of SoCs. These
are prerequisites for power management and some PWM driver changes.
Basic test logs are available from:
http://www.pwsan.com/omap/testlogs/am33xx_fixes_a_3.9/20130208084835/
although it must be noted that I am unable to test these patches on
AM33xx due to an unknown problem with v3.8-rc kernels:
http://www.mail-archive.com/linux-omap@vger.kernel.org/msg83525.html
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 4653efb87a2..6549439d8d5 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -3041,11 +3041,8 @@ static int _am33xx_assert_hardreset(struct omap_hwmod *oh, static int _am33xx_deassert_hardreset(struct omap_hwmod *oh, struct omap_hwmod_rst_info *ohri) { - if (ohri->st_shift) - pr_err("omap_hwmod: %s: %s: hwmod data error: OMAP4 does not support st_shift\n", - oh->name, ohri->name); - return am33xx_prm_deassert_hardreset(ohri->rst_shift, + ohri->st_shift, oh->clkdm->pwrdm.ptr->prcm_offs, oh->prcm.omap4.rstctrl_offs, oh->prcm.omap4.rstst_offs); |