From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roger Quadros Subject: Re: [PATCH v8 03/14] mfd: omap-usb-host: Use clock names as per function for reference clocks Date: Tue, 25 Feb 2014 11:25:48 +0200 Message-ID: <530C619C.9050303@ti.com> References: <1392896409-5101-1-git-send-email-rogerq@ti.com> <1392896409-5101-4-git-send-email-rogerq@ti.com> <20140225085234.GB19099@lee--X1> <530C5C29.1090503@ti.com> <20140225091839.GE19099@lee--X1> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20140225091839.GE19099@lee--X1> Sender: linux-kernel-owner@vger.kernel.org To: Lee Jones Cc: tony@atomide.com, bcousson@baylibre.com, balbi@ti.com, nm@ti.com, khilman@linaro.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-usb@vger.kernel.org, Samuel Ortiz List-Id: linux-omap@vger.kernel.org On 02/25/2014 11:18 AM, Lee Jones wrote: >>>> Use a meaningful name for the reference clocks so that it indicates the function. >>>> >>>> CC: Lee Jones >>>> CC: Samuel Ortiz >>>> Signed-off-by: Roger Quadros >>>> --- >>>> drivers/mfd/omap-usb-host.c | 12 ++++++------ >>>> 1 file changed, 6 insertions(+), 6 deletions(-) >>>> >>>> diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c >>>> index 865c276..651e249 100644 >>>> --- a/drivers/mfd/omap-usb-host.c >>>> +++ b/drivers/mfd/omap-usb-host.c >>>> @@ -718,24 +718,24 @@ static int usbhs_omap_probe(struct platform_device *pdev) >>>> goto err_mem; >>>> } >>>> >>>> - omap->xclk60mhsp1_ck = devm_clk_get(dev, "xclk60mhsp1_ck"); >>>> + omap->xclk60mhsp1_ck = devm_clk_get(dev, "refclk_60m_ext_p1"); >>>> if (IS_ERR(omap->xclk60mhsp1_ck)) { >>>> ret = PTR_ERR(omap->xclk60mhsp1_ck); >>>> - dev_err(dev, "xclk60mhsp1_ck failed error:%d\n", ret); >>>> + dev_err(dev, "refclk_60m_ext_p1 failed error:%d\n", ret); >>>> goto err_mem; >>>> } >>> >>> Will anything break if I were to apply the MFD patches seperately? >>> >> >> Nothing will break for OMAP3, but OMAP4 USB host will break (e.g. Panda board). >> OMAP5 USB host was never working so it doesn't matter there. >> >> To make sure nothing breaks, we need at least these 2 patches to go in together with mfd changes. >> >> [PATCH v8 08/14] ARM: dts: omap4: Update omap-usb-host node >> [PATCH v8 09/14] ARM: dts: omap5: Update omap-usb-host node >> >> Any suggestions about how we can proceed? > > Yes, unfortunately you have to squash each of the patches into one > patch. Applying a patch which breaks a build, then applying another one > immediately after which subsequently fixes the break is not an acceptable > way of working I'm afraid. What would happen if we were to fall into > the middle of the two patches when bisecting? > OK, I'll squash patches 8 and 9 into patch 3. cheers, -roger