Re: [PATCH 3/4] ARM: OMAP: Make FS USB omap1 only
* Felipe Balbi [120522 00:14]: > On Mon, May 21, 2012 at 12:01:09PM -0700, Tony Lindgren wrote: > > As the FS USB code is not being actively used for omap2+ > > there's no point keeping it around for omap2+. > > > > Let's make the FS USB platform init code omap1 only so > > we can remove the last user of omap_read/write for omap2+, > > and simplify things for further USB, DMA, and device tree > > related work. > > > > While at it, also group the mach includes for the related > > drivers. > > > > Cc: linux-...@vger.kernel.org > > Cc: Felipe Balbi > > Cc: Kyungmin Park > > Signed-off-by: Tony Lindgren > > Acked-by: Felipe Balbi > > Are you planning to send this on v3.5 or v3.6 ? I guess it's too late > for v3.5 ?!? First one I can merge as a fix, patches 2 and 3 for v3.6, then patch 4 up to you, I suggest v3.6. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/4] ARM: OMAP: Make FS USB omap1 only
On Mon, May 21, 2012 at 12:01:09PM -0700, Tony Lindgren wrote: > As the FS USB code is not being actively used for omap2+ > there's no point keeping it around for omap2+. > > Let's make the FS USB platform init code omap1 only so > we can remove the last user of omap_read/write for omap2+, > and simplify things for further USB, DMA, and device tree > related work. > > While at it, also group the mach includes for the related > drivers. > > Cc: linux-...@vger.kernel.org > Cc: Felipe Balbi > Cc: Kyungmin Park > Signed-off-by: Tony Lindgren Acked-by: Felipe Balbi Are you planning to send this on v3.5 or v3.6 ? I guess it's too late for v3.5 ?!? > --- > arch/arm/mach-omap1/board-ams-delta.c |2 > arch/arm/mach-omap1/board-generic.c |4 - > arch/arm/mach-omap1/board-h2.c |2 > arch/arm/mach-omap1/board-h3.c |2 > arch/arm/mach-omap1/board-htcherald.c |2 > arch/arm/mach-omap1/board-innovator.c |2 > arch/arm/mach-omap1/board-nokia770.c|2 > arch/arm/mach-omap1/board-osk.c |2 > arch/arm/mach-omap1/board-palmte.c |2 > arch/arm/mach-omap1/board-palmtt.c |2 > arch/arm/mach-omap1/board-palmz71.c |2 > arch/arm/mach-omap1/board-sx1.c |2 > arch/arm/mach-omap1/board-voiceblue.c |3 > arch/arm/mach-omap1/clock_data.c|3 > arch/arm/mach-omap1/include/mach/usb.h | 165 ++ > arch/arm/mach-omap1/usb.c | 116 ++ > arch/arm/plat-omap/Makefile |2 > arch/arm/plat-omap/include/plat/board.h | 38 -- > arch/arm/plat-omap/include/plat/usb.h | 196 > --- > arch/arm/plat-omap/usb.c| 145 --- > drivers/usb/gadget/Kconfig |2 > drivers/usb/gadget/omap_udc.c |3 > drivers/usb/host/Kconfig|2 > drivers/usb/host/ohci-omap.c|7 + > drivers/usb/otg/isp1301_omap.c |2 > 25 files changed, 310 insertions(+), 400 deletions(-) > create mode 100644 arch/arm/mach-omap1/include/mach/usb.h > delete mode 100644 arch/arm/plat-omap/usb.c > > diff --git a/arch/arm/mach-omap1/board-ams-delta.c > b/arch/arm/mach-omap1/board-ams-delta.c > index f2f8a58..c534698 100644 > --- a/arch/arm/mach-omap1/board-ams-delta.c > +++ b/arch/arm/mach-omap1/board-ams-delta.c > @@ -37,12 +37,12 @@ > #include > #include > #include > -#include > #include > > #include > #include > #include > +#include > > #include "iomap.h" > #include "common.h" > diff --git a/arch/arm/mach-omap1/board-generic.c > b/arch/arm/mach-omap1/board-generic.c > index e75e2d5..6ec385e 100644 > --- a/arch/arm/mach-omap1/board-generic.c > +++ b/arch/arm/mach-omap1/board-generic.c > @@ -23,8 +23,10 @@ > #include > > #include > -#include > #include > + > +#include > + > #include "common.h" > > /* assume no Mini-AB port */ > diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c > index a28e989..44a4ab1 100644 > --- a/arch/arm/mach-omap1/board-h2.c > +++ b/arch/arm/mach-omap1/board-h2.c > @@ -40,11 +40,11 @@ > #include > #include > #include > -#include > #include > #include > > #include > +#include > > #include "common.h" > #include "board-h2.h" > diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c > index 108a864..86cb5a0 100644 > --- a/arch/arm/mach-omap1/board-h3.c > +++ b/arch/arm/mach-omap1/board-h3.c > @@ -40,13 +40,13 @@ > > #include > #include > -#include > #include > #include > #include > > #include > #include > +#include > > #include "common.h" > #include "board-h3.h" > diff --git a/arch/arm/mach-omap1/board-htcherald.c > b/arch/arm/mach-omap1/board-htcherald.c > index 118a9d4..b3f6e94 100644 > --- a/arch/arm/mach-omap1/board-htcherald.c > +++ b/arch/arm/mach-omap1/board-htcherald.c > @@ -44,10 +44,10 @@ > #include > #include > #include > -#include > #include > > #include > +#include > > #include "common.h" > > diff --git a/arch/arm/mach-omap1/board-innovator.c > b/arch/arm/mach-omap1/board-innovator.c > index 7970223..f21c296 100644 > --- a/arch/arm/mach-omap1/board-innovator.c > +++ b/arch/arm/mach-omap1/board-innovator.c > @@ -35,11 +35,11 @@ > #include > #include > #include > -#include > #include > #include > > #include > +#include > > #include "iomap.h" > #include "common.h" > diff --git a/arch/arm/mach-omap1/board-nokia770.c > b/arch/arm/mach-omap1/board-nokia770.c > index 7212ae9..4007a372 100644 > --- a/arch/arm/mach-omap1/board-nokia770.c > +++ b/arch/arm/mach-omap1/board-nokia770.c > @@ -26,7 +26,6 @@ > #include > > #include > -#include > #include > #include > #include > @@ -34,6 +33,7 @@ > #include > > #include > +#include > > #include "common.h" > > diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mac
[PATCH 3/4] ARM: OMAP: Make FS USB omap1 only
As the FS USB code is not being actively used for omap2+ there's no point keeping it around for omap2+. Let's make the FS USB platform init code omap1 only so we can remove the last user of omap_read/write for omap2+, and simplify things for further USB, DMA, and device tree related work. While at it, also group the mach includes for the related drivers. Cc: linux-...@vger.kernel.org Cc: Felipe Balbi Cc: Kyungmin Park Signed-off-by: Tony Lindgren --- arch/arm/mach-omap1/board-ams-delta.c |2 arch/arm/mach-omap1/board-generic.c |4 - arch/arm/mach-omap1/board-h2.c |2 arch/arm/mach-omap1/board-h3.c |2 arch/arm/mach-omap1/board-htcherald.c |2 arch/arm/mach-omap1/board-innovator.c |2 arch/arm/mach-omap1/board-nokia770.c|2 arch/arm/mach-omap1/board-osk.c |2 arch/arm/mach-omap1/board-palmte.c |2 arch/arm/mach-omap1/board-palmtt.c |2 arch/arm/mach-omap1/board-palmz71.c |2 arch/arm/mach-omap1/board-sx1.c |2 arch/arm/mach-omap1/board-voiceblue.c |3 arch/arm/mach-omap1/clock_data.c|3 arch/arm/mach-omap1/include/mach/usb.h | 165 ++ arch/arm/mach-omap1/usb.c | 116 ++ arch/arm/plat-omap/Makefile |2 arch/arm/plat-omap/include/plat/board.h | 38 -- arch/arm/plat-omap/include/plat/usb.h | 196 --- arch/arm/plat-omap/usb.c| 145 --- drivers/usb/gadget/Kconfig |2 drivers/usb/gadget/omap_udc.c |3 drivers/usb/host/Kconfig|2 drivers/usb/host/ohci-omap.c|7 + drivers/usb/otg/isp1301_omap.c |2 25 files changed, 310 insertions(+), 400 deletions(-) create mode 100644 arch/arm/mach-omap1/include/mach/usb.h delete mode 100644 arch/arm/plat-omap/usb.c diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index f2f8a58..c534698 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c @@ -37,12 +37,12 @@ #include #include #include -#include #include #include #include #include +#include #include "iomap.h" #include "common.h" diff --git a/arch/arm/mach-omap1/board-generic.c b/arch/arm/mach-omap1/board-generic.c index e75e2d5..6ec385e 100644 --- a/arch/arm/mach-omap1/board-generic.c +++ b/arch/arm/mach-omap1/board-generic.c @@ -23,8 +23,10 @@ #include #include -#include #include + +#include + #include "common.h" /* assume no Mini-AB port */ diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index a28e989..44a4ab1 100644 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c @@ -40,11 +40,11 @@ #include #include #include -#include #include #include #include +#include #include "common.h" #include "board-h2.h" diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c index 108a864..86cb5a0 100644 --- a/arch/arm/mach-omap1/board-h3.c +++ b/arch/arm/mach-omap1/board-h3.c @@ -40,13 +40,13 @@ #include #include -#include #include #include #include #include #include +#include #include "common.h" #include "board-h3.h" diff --git a/arch/arm/mach-omap1/board-htcherald.c b/arch/arm/mach-omap1/board-htcherald.c index 118a9d4..b3f6e94 100644 --- a/arch/arm/mach-omap1/board-htcherald.c +++ b/arch/arm/mach-omap1/board-htcherald.c @@ -44,10 +44,10 @@ #include #include #include -#include #include #include +#include #include "common.h" diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c index 7970223..f21c296 100644 --- a/arch/arm/mach-omap1/board-innovator.c +++ b/arch/arm/mach-omap1/board-innovator.c @@ -35,11 +35,11 @@ #include #include #include -#include #include #include #include +#include #include "iomap.h" #include "common.h" diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c index 7212ae9..4007a372 100644 --- a/arch/arm/mach-omap1/board-nokia770.c +++ b/arch/arm/mach-omap1/board-nokia770.c @@ -26,7 +26,6 @@ #include #include -#include #include #include #include @@ -34,6 +33,7 @@ #include #include +#include #include "common.h" diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c index da8d872..8784705 100644 --- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c @@ -45,11 +45,11 @@ #include #include -#include #include #include #include +#include #include "common.h" diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c index 949b62a..26bcb9d 100644 --- a/arch/arm/mach-omap1/board-palmte.c +++ b/arch/arm/mach-omap1/board-palmte.c @@ -35,7 +35,6 @@ #include #include -#include #include #include
