[PATCH v3 4/4] ARM: shmobile: BOCK-W: enable USB in defconfig

[Simon Horman]

On Sat, Apr 20, 2013 at 12:23:52AM +0400, Sergei Shtylyov wrote:
> On 04/19/2013 06:14 AM, Simon Horman wrote:
> >On Fri, Apr 19, 2013 at 02:50:05AM +0400, Sergei Shtylyov wrote:
> >>Hello.
> >>
> >>On 04/18/2013 06:05 PM, Simon Horman wrote:
> >>
> >>>>Enable USB platform EHCI/OHCI and common PHY drivers in 'bockw_defconfig'.
> >>>>Enable USB storage driver and SCSI disk driver that it needs as well...
> >>>>
> >>>>Signed-off-by: Sergei Shtylyov <sergei.shtylyov at cogentembedded.com>
> >>>I realise that this is not going to be useful until the rest
> >>>of the series has been merged. But regardless I have pre-emptively
> >>>queued it up for v3.11 in the defconfig-bockw branch.
> >>>>---
> >>>>  arch/arm/configs/bockw_defconfig |   11 ++++++++++-
> >>>>  1 file changed, 10 insertions(+), 1 deletion(-)
> >>>>
> >>>>Index: renesas/arch/arm/configs/bockw_defconfig
> >>>>===================================================================
> >>>>--- renesas.orig/arch/arm/configs/bockw_defconfig
> >>>>+++ renesas/arch/arm/configs/bockw_defconfig
> >>>>@@ -48,6 +48,8 @@ CONFIG_DEVTMPFS_MOUNT=y
> >>>>  # CONFIG_STANDALONE is not set
> >>>>  # CONFIG_PREVENT_FIRMWARE_BUILD is not set
> >>>>  # CONFIG_FW_LOADER is not set
> >>>>+CONFIG_SCSI=y
> >>>>+CONFIG_BLK_DEV_SD=y
> >>>>  CONFIG_NETDEVICES=y
> >>>>  # CONFIG_NET_CADENCE is not set
> >>>>  # CONFIG_NET_VENDOR_BROADCOM is not set
> >>>>@@ -71,7 +73,14 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=6
> >>>>  CONFIG_SERIAL_SH_SCI_CONSOLE=y
> >>>>  # CONFIG_HW_RANDOM is not set
> >>>>  # CONFIG_HWMON is not set
> >>>>-# CONFIG_USB_SUPPORT is not set
> >>>>+CONFIG_USB=y
> >>>>+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
> >>>>+CONFIG_USB_EHCI_HCD=y
> >>>>+CONFIG_USB_OHCI_HCD=y
> >>>>+CONFIG_USB_OHCI_HCD_PLATFORM=y
> >>>>+CONFIG_USB_EHCI_HCD_PLATFORM=y
> >>>>+CONFIG_USB_STORAGE=y
> >>>>+CONFIG_USB_RCAR_PHY=y
> >>>>
> >>    Unfortunately, you've made a mistake in this last line of the patch:
> >>you've truncated it to just "CONFIG_USB_RCAR". :-(
> >>    Will you correct it?
> >Sorry about that, I will fix it.
> 
>     Sorry to say, but you fixed it the wrong way; now it's:
> 
> +CONFIG_USB_RCAR=y
> 
> instead of:
> 
> +CONFIG_USB_RCAR_PHY=y

Sorry for my carelessness.
I will forcibly push the following:

>From 26b78f5c9ad1e4809f6d0a5547e4eab222f53f23 Mon Sep 17 00:00:00 2001
From: Sergei Shtylyov <sergei.shtylyov at cogentembedded.com>
Date: Wed, 17 Apr 2013 01:35:09 +0400
Subject: [PATCH] ARM: shmobile: BOCK-W: enable USB in defconfig

Enable USB platform EHCI/OHCI and common PHY drivers in 'bockw_defconfig'.
Enable USB storage driver and SCSI disk driver that it needs as well...

Signed-off-by: Sergei Shtylyov <sergei.shtylyov at cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas at verge.net.au>
---
 arch/arm/configs/bockw_defconfig | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/arch/arm/configs/bockw_defconfig b/arch/arm/configs/bockw_defconfig
index a4bc76d..d662608 100644
--- a/arch/arm/configs/bockw_defconfig
+++ b/arch/arm/configs/bockw_defconfig
@@ -49,6 +49,8 @@ CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 # CONFIG_FW_LOADER is not set
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
 CONFIG_NETDEVICES=y
 # CONFIG_NET_CADENCE is not set
 # CONFIG_NET_VENDOR_BROADCOM is not set
@@ -74,7 +76,14 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
 # CONFIG_HWMON is not set
 CONFIG_I2C=y
 CONFIG_I2C_RCAR=y
-# CONFIG_USB_SUPPORT is not set
+CONFIG_USB=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
+CONFIG_USB_EHCI_HCD_PLATFORM=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_RCAR_PHY=y
 CONFIG_MMC=y
 CONFIG_MMC_SDHI=y
 CONFIG_UIO=y
-- 
1.8.2.1