From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752492AbaBYJSy (ORCPT ); Tue, 25 Feb 2014 04:18:54 -0500 Received: from mail-wg0-f51.google.com ([74.125.82.51]:51463 "EHLO mail-wg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751317AbaBYJSt (ORCPT ); Tue, 25 Feb 2014 04:18:49 -0500 Date: Tue, 25 Feb 2014 09:18:39 +0000 From: Lee Jones To: Roger Quadros 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 Subject: Re: [PATCH v8 03/14] mfd: omap-usb-host: Use clock names as per function for reference clocks Message-ID: <20140225091839.GE19099@lee--X1> 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> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <530C5C29.1090503@ti.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > >> 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? -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lee Jones Subject: Re: [PATCH v8 03/14] mfd: omap-usb-host: Use clock names as per function for reference clocks Date: Tue, 25 Feb 2014 09:18:39 +0000 Message-ID: <20140225091839.GE19099@lee--X1> 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> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Content-Disposition: inline In-Reply-To: <530C5C29.1090503@ti.com> Sender: linux-omap-owner@vger.kernel.org To: Roger Quadros 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: devicetree@vger.kernel.org > >> Use a meaningful name for the reference clocks so that it indicate= s 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-ho= st.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; > >> } > >> =20 > >> - omap->xclk60mhsp1_ck =3D devm_clk_get(dev, "xclk60mhsp1_ck"); > >> + omap->xclk60mhsp1_ck =3D devm_clk_get(dev, "refclk_60m_ext_p1"); > >> if (IS_ERR(omap->xclk60mhsp1_ck)) { > >> ret =3D 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; > >> } > >=20 > > Will anything break if I were to apply the MFD patches seperately? > >=20 >=20 > Nothing will break for OMAP3, but OMAP4 USB host will break (e.g. Pan= da board). > OMAP5 USB host was never working so it doesn't matter there. >=20 > To make sure nothing breaks, we need at least these 2 patches to go i= n together with mfd changes. >=20 > [PATCH v8 08/14] ARM: dts: omap4: Update omap-usb-host node > [PATCH v8 09/14] ARM: dts: omap5: Update omap-usb-host node >=20 > 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 acceptab= le way of working I'm afraid. What would happen if we were to fall into the middle of the two patches when bisecting? --=20 Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org =E2=94=82 Open source software for ARM SoCs =46ollow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-omap" i= n the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 From: lee.jones@linaro.org (Lee Jones) Date: Tue, 25 Feb 2014 09:18:39 +0000 Subject: [PATCH v8 03/14] mfd: omap-usb-host: Use clock names as per function for reference clocks In-Reply-To: <530C5C29.1090503@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> Message-ID: <20140225091839.GE19099@lee--X1> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org > >> 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? -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog