| Message ID | 1387462990-12039-4-git-send-email-mporter@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Dec 19, 2013 at 09:23:04AM -0500, Matt Porter wrote: > Remove unused Samsung-specific machine include and Kconfig > dependency on S3C. > > Signed-off-by: Matt Porter <mporter@linaro.org> > Reviewed-by: Markus Mayer <markus.mayer@linaro.org> > Reviewed-by: Tim Kryger <tim.kryger@linaro.org> > --- > drivers/usb/gadget/Kconfig | 7 +++---- > drivers/usb/gadget/s3c-hsotg.c | 2 -- > 2 files changed, 3 insertions(+), 6 deletions(-) > > diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig > index a91e642..181e760 100644 > --- a/drivers/usb/gadget/Kconfig > +++ b/drivers/usb/gadget/Kconfig > @@ -294,11 +294,10 @@ config USB_PXA27X > gadget drivers to also be dynamically linked. > > config USB_S3C_HSOTG > - tristate "S3C HS/OtG USB Device controller" > - depends on S3C_DEV_USB_HSOTG > + tristate "Designware/S3C HS/OtG USB Device controller" causes build failure in x86. Sorry dropping from my queue.
On Monday 23 of December 2013 10:25:57 Felipe Balbi wrote: > On Thu, Dec 19, 2013 at 09:23:04AM -0500, Matt Porter wrote: > > Remove unused Samsung-specific machine include and Kconfig > > dependency on S3C. > > > > Signed-off-by: Matt Porter <mporter@linaro.org> > > Reviewed-by: Markus Mayer <markus.mayer@linaro.org> > > Reviewed-by: Tim Kryger <tim.kryger@linaro.org> > > --- > > drivers/usb/gadget/Kconfig | 7 +++---- > > drivers/usb/gadget/s3c-hsotg.c | 2 -- > > 2 files changed, 3 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig > > index a91e642..181e760 100644 > > --- a/drivers/usb/gadget/Kconfig > > +++ b/drivers/usb/gadget/Kconfig > > @@ -294,11 +294,10 @@ config USB_PXA27X > > gadget drivers to also be dynamically linked. > > > > config USB_S3C_HSOTG > > - tristate "S3C HS/OtG USB Device controller" > > - depends on S3C_DEV_USB_HSOTG > > + tristate "Designware/S3C HS/OtG USB Device controller" > > causes build failure in x86. Sorry dropping from my queue. Maybe depends on ARM would be a good enough stepping stone? Best regards, Tomasz
On Mon, Dec 23, 2013 at 05:30:41PM +0100, Tomasz Figa wrote: > On Monday 23 of December 2013 10:25:57 Felipe Balbi wrote: > > On Thu, Dec 19, 2013 at 09:23:04AM -0500, Matt Porter wrote: > > > Remove unused Samsung-specific machine include and Kconfig > > > dependency on S3C. > > > > > > Signed-off-by: Matt Porter <mporter@linaro.org> > > > Reviewed-by: Markus Mayer <markus.mayer@linaro.org> > > > Reviewed-by: Tim Kryger <tim.kryger@linaro.org> > > > --- > > > drivers/usb/gadget/Kconfig | 7 +++---- > > > drivers/usb/gadget/s3c-hsotg.c | 2 -- > > > 2 files changed, 3 insertions(+), 6 deletions(-) > > > > > > diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig > > > index a91e642..181e760 100644 > > > --- a/drivers/usb/gadget/Kconfig > > > +++ b/drivers/usb/gadget/Kconfig > > > @@ -294,11 +294,10 @@ config USB_PXA27X > > > gadget drivers to also be dynamically linked. > > > > > > config USB_S3C_HSOTG > > > - tristate "S3C HS/OtG USB Device controller" > > > - depends on S3C_DEV_USB_HSOTG > > > + tristate "Designware/S3C HS/OtG USB Device controller" > > > > causes build failure in x86. Sorry dropping from my queue. > > Maybe depends on ARM would be a good enough stepping stone? Yes, we could then move from readsl/writesl to ioread_read/io_write_rep next time around as that fixes the portability issue. Felipe, since depending on ARM is a trivial fix for this, can you take an updated version at this point? -Matt
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index a91e642..181e760 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -294,11 +294,10 @@ config USB_PXA27X gadget drivers to also be dynamically linked. config USB_S3C_HSOTG - tristate "S3C HS/OtG USB Device controller" - depends on S3C_DEV_USB_HSOTG + tristate "Designware/S3C HS/OtG USB Device controller" help - The Samsung S3C64XX USB2.0 high-speed gadget controller - integrated into the S3C64XX series SoC. + The Designware USB2.0 high-speed gadget controller + integrated into many SoCs. config USB_S3C2410 tristate "S3C2410 USB Device Controller" diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c index 9875d9c..db797f2 100644 --- a/drivers/usb/gadget/s3c-hsotg.c +++ b/drivers/usb/gadget/s3c-hsotg.c @@ -36,8 +36,6 @@ #include <linux/usb/phy.h> #include <linux/platform_data/s3c-hsotg.h> -#include <mach/map.h> - #include "s3c-hsotg.h" static const char * const s3c_hsotg_supply_names[] = {