diff mbox

[1/2] ARM: multi_v7_defconfig: Replace CONFIG_USB_ISP1760_HCD by CONFIG_USB_ISP1760

Message ID 1432637918-8946-1-git-send-email-geert+renesas@glider.be (mailing list archive)
State Accepted
Delegated to: Simon Horman
Headers show

Commit Message

Geert Uytterhoeven May 26, 2015, 10:58 a.m. UTC
Since commit 100832abf065bc18 ("usb: isp1760: Make HCD support
optional"), CONFIG_USB_ISP1760_HCD is automatically selected when
needed.  Enabling that option in the defconfig is now a no-op, and no
longer enables ISP1760 HCD support.

Re-enable the ISP1760 driver in the defconfig by enabling
USB_ISP1760_HOST_ROLE instead.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm/configs/multi_v7_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Simon Horman May 28, 2015, 12:39 a.m. UTC | #1
On Tue, May 26, 2015 at 12:58:37PM +0200, Geert Uytterhoeven wrote:
> Since commit 100832abf065bc18 ("usb: isp1760: Make HCD support
> optional"), CONFIG_USB_ISP1760_HCD is automatically selected when
> needed.  Enabling that option in the defconfig is now a no-op, and no
> longer enables ISP1760 HCD support.
> 
> Re-enable the ISP1760 driver in the defconfig by enabling
> USB_ISP1760_HOST_ROLE instead.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Thanks, I have queued this up for v4.3.

I would not object at all if the ARM SoC maintainers wish to
take this earlier and I'd be happy to prepare a pull request
to that effect once the change has sat in next. Unfortunately
I anticipate that will be after the standard rc6 deadline.
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Arnd Bergmann May 28, 2015, 8:07 a.m. UTC | #2
On Thursday 28 May 2015 09:39:08 Simon Horman wrote:
> On Tue, May 26, 2015 at 12:58:37PM +0200, Geert Uytterhoeven wrote:
> > Since commit 100832abf065bc18 ("usb: isp1760: Make HCD support
> > optional"), CONFIG_USB_ISP1760_HCD is automatically selected when
> > needed.  Enabling that option in the defconfig is now a no-op, and no
> > longer enables ISP1760 HCD support.
> > 
> > Re-enable the ISP1760 driver in the defconfig by enabling
> > USB_ISP1760_HOST_ROLE instead.
> > 
> > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> 
> Thanks, I have queued this up for v4.3.
> 
> I would not object at all if the ARM SoC maintainers wish to
> take this earlier and I'd be happy to prepare a pull request
> to that effect once the change has sat in next. Unfortunately
> I anticipate that will be after the standard rc6 deadline.

I would consider patch 1 as a bug-fix, and put that into 4.1 or
4.2, depending on timing. Patch 2 looks like 4.3 material.

	Arnd 
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Simon Horman May 29, 2015, 12:40 a.m. UTC | #3
On Thu, May 28, 2015 at 10:07:20AM +0200, Arnd Bergmann wrote:
> On Thursday 28 May 2015 09:39:08 Simon Horman wrote:
> > On Tue, May 26, 2015 at 12:58:37PM +0200, Geert Uytterhoeven wrote:
> > > Since commit 100832abf065bc18 ("usb: isp1760: Make HCD support
> > > optional"), CONFIG_USB_ISP1760_HCD is automatically selected when
> > > needed.  Enabling that option in the defconfig is now a no-op, and no
> > > longer enables ISP1760 HCD support.
> > > 
> > > Re-enable the ISP1760 driver in the defconfig by enabling
> > > USB_ISP1760_HOST_ROLE instead.
> > > 
> > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> > 
> > Thanks, I have queued this up for v4.3.
> > 
> > I would not object at all if the ARM SoC maintainers wish to
> > take this earlier and I'd be happy to prepare a pull request
> > to that effect once the change has sat in next. Unfortunately
> > I anticipate that will be after the standard rc6 deadline.
> 
> I would consider patch 1 as a bug-fix, and put that into 4.1 or
> 4.2, depending on timing. Patch 2 looks like 4.3 material.

Thanks Arnd, would you care to take pick it up directly for 4.1 (or 4.2)?
If so I'll drop it from my tree.
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Arnd Bergmann May 29, 2015, 12:32 p.m. UTC | #4
On Friday 29 May 2015 09:40:13 Simon Horman wrote:
> On Thu, May 28, 2015 at 10:07:20AM +0200, Arnd Bergmann wrote:
> > On Thursday 28 May 2015 09:39:08 Simon Horman wrote:
> > > On Tue, May 26, 2015 at 12:58:37PM +0200, Geert Uytterhoeven wrote:
> > > > Since commit 100832abf065bc18 ("usb: isp1760: Make HCD support
> > > > optional"), CONFIG_USB_ISP1760_HCD is automatically selected when
> > > > needed.  Enabling that option in the defconfig is now a no-op, and no
> > > > longer enables ISP1760 HCD support.
> > > > 
> > > > Re-enable the ISP1760 driver in the defconfig by enabling
> > > > USB_ISP1760_HOST_ROLE instead.
> > > > 
> > > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> > > 
> > > Thanks, I have queued this up for v4.3.
> > > 
> > > I would not object at all if the ARM SoC maintainers wish to
> > > take this earlier and I'd be happy to prepare a pull request
> > > to that effect once the change has sat in next. Unfortunately
> > > I anticipate that will be after the standard rc6 deadline.
> > 
> > I would consider patch 1 as a bug-fix, and put that into 4.1 or
> > 4.2, depending on timing. Patch 2 looks like 4.3 material.
> 
> Thanks Arnd, would you care to take pick it up directly for 4.1 (or 4.2)?
> If so I'll drop it from my tree.

I've applied it to the fixes branch now.

Thanks everyone!

	Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index a6bbfeef3e36612a..e3fc9799972367c3 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -475,7 +475,7 @@  CONFIG_USB_EHCI_EXYNOS=y
 CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_EHCI_HCD_STI=y
 CONFIG_USB_EHCI_HCD_PLATFORM=y
-CONFIG_USB_ISP1760_HCD=y
+CONFIG_USB_ISP1760=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_STI=y
 CONFIG_USB_OHCI_HCD_PLATFORM=y