From: kishon@ti.com (Kishon Vijay Abraham I) Date: Mon, 8 Apr 2013 17:25:05 +0530 Subject: [PATCH] ARM: OMAP4: PM: fix PM regression introduced by recent clock cleanup In-Reply-To: References: Message-ID: <5162B019.6050407@ti.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi, On Wednesday 13 February 2013 01:58 AM, Paul Walmsley wrote: > > Commit 17b7e7d33530e2bbd3bdc90f4db09b91cfdde2bb ("ARM: OMAP4: > clock/hwmod data: start to remove some IP block control "clocks"") > introduced a regression preventing the L3INIT clockdomain of OMAP4 > systems from entering idle. This in turn prevented these systems from > entering full chip clock-stop. > > The regression was caused by the incorrect removal of a so-called > "optional functional clock" from the OMAP4 clock data. This wasn't > caught for two reasons. First, I missed the retention entry failure > in the branch test logs: > > http://www.pwsan.com/omap/testlogs/cleanup_a_3.9/20130126014242/pm/4460pandaes/4460pandaes_log.txt > > Second, the integration data for the OCP2SCP PHY IP block, added by > commit 0c6688753f9912c6a7013549ec31c8844020bbc1 ("ARM: OMAP4: hwmod > data: add remaining USB-related IP blocks"), should have associated this > clock with the IP block, but did not. > > Fix by adding back the so-called "optional" functional clock to the > clock data, and by linking that clock to the OCP2SCP PHY IP block > integration hwmod data. This patch breaks MUSB in OMAP4 panda. The 48M clock is modeled as main clk [1] for ocp2scp so after doing get_sync, this optional clock gets enabled. But after this patch, the optional clock seems to be not enabled after get_sync. http://lists.infradead.org/pipermail/linux-arm-kernel/2012-September/118285.html (this patch is not directly merged but I guess the discussion here is taken care of) Thanks Kishon