[U-Boot] [PATCH v4 1/4] USB: move ehci.h and ehci-core.h into /include/usb/
Signed-off-by: Jana Rapava Cc: Marek Vasut Cc: Remy Bohmer Cc: Fabio Estevam --- Changes for v2: - changed to proper patch Changes for v3: - merged other USB patches from u-boot-pxa/efikasb - offset-based access changed to struct-based access - use {clrset,clr,set}bits_le32() calls - CodingStyle and naming cleanup Changes for v4: - split into patchset - move ehci.h and ehci-core.h into /include/usb/ drivers/usb/host/ehci-core.h | 29 -- drivers/usb/host/ehci-fsl.c |4 +- drivers/usb/host/ehci-hcd.c |2 +- drivers/usb/host/ehci-kirkwood.c |4 +- drivers/usb/host/ehci-mpc512x.c |4 +- drivers/usb/host/ehci-pci.c |4 +- drivers/usb/host/ehci-ppc4xx.c |4 +- drivers/usb/host/ehci.h | 203 -- include/usb/ehci-core.h | 29 ++ include/usb/ehci.h | 203 ++ 10 files changed, 243 insertions(+), 243 deletions(-) delete mode 100644 drivers/usb/host/ehci-core.h delete mode 100644 drivers/usb/host/ehci.h create mode 100644 include/usb/ehci-core.h create mode 100644 include/usb/ehci.h diff --git a/drivers/usb/host/ehci-core.h b/drivers/usb/host/ehci-core.h deleted file mode 100644 index 39e5c5e..000 --- a/drivers/usb/host/ehci-core.h +++ /dev/null @@ -1,29 +0,0 @@ -/*- - * Copyright (c) 2007-2008, Juniper Networks, Inc. - * Copyright (c) 2008, Excito Elektronik i Skåne AB - * All rights reserved. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation version 2 of - * the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#ifndef USB_EHCI_CORE_H -#define USB_EHCI_CORE_H - -extern int rootdev; -extern struct ehci_hccr *hccr; -extern volatile struct ehci_hcor *hcor; - -#endif diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c index 6e0043a..19b97ee 100644 --- a/drivers/usb/host/ehci-fsl.c +++ b/drivers/usb/host/ehci-fsl.c @@ -27,8 +27,8 @@ #include #include -#include "ehci.h" -#include "ehci-core.h" +#include +#include /* * Create the appropriate control structures to manage diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 2197119..bdadd46 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -27,7 +27,7 @@ #include #include -#include "ehci.h" +#include int rootdev; struct ehci_hccr *hccr;/* R/O registers, not need for volatile */ diff --git a/drivers/usb/host/ehci-kirkwood.c b/drivers/usb/host/ehci-kirkwood.c index 5570fc6..ab75acd 100644 --- a/drivers/usb/host/ehci-kirkwood.c +++ b/drivers/usb/host/ehci-kirkwood.c @@ -25,8 +25,8 @@ #include #include #include -#include "ehci.h" -#include "ehci-core.h" +#include +#include #include #define rdl(off) readl(KW_USB20_BASE + (off)) diff --git a/drivers/usb/host/ehci-mpc512x.c b/drivers/usb/host/ehci-mpc512x.c index d360108..8d2c93b 100644 --- a/drivers/usb/host/ehci-mpc512x.c +++ b/drivers/usb/host/ehci-mpc512x.c @@ -32,8 +32,8 @@ #include #include -#include "ehci.h" -#include "ehci-core.h" +#include +#include static void fsl_setup_phy(volatile struct ehci_hcor *); static void fsl_platform_set_host_mode(volatile struct usb_ehci *ehci); diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index 020ab11..e1f84d9 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c @@ -22,8 +22,8 @@ #include #include -#include "ehci.h" -#include "ehci-core.h" +#include +#include #ifdef CONFIG_PCI_EHCI_DEVICE static struct pci_device_id ehci_pci_ids[] = { diff --git a/drivers/usb/host/ehci-ppc4xx.c b/drivers/usb/host/ehci-ppc4xx.c index 1179919..1a1fae1 100644 --- a/drivers/usb/host/ehci-ppc4xx.c +++ b/drivers/usb/host/ehci-ppc4xx.c @@ -22,8 +22,8 @@ #include #include -#include "ehci.h" -#include "ehci-core.h" +#include +#include /* * Create the appropriate control structures to manage diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h deleted file mode 100644 index 3d0ad0c..000 --- a/drivers/usb/host/ehci.h +++ /dev/null @@ -1,203 +0,0 @@ -/*- - * Copyright (c) 2007-2008, Juniper Networks, Inc. - * Copyright (c) 2008, Michael Trimarchi - * All rights reserved. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by t
Re: [U-Boot] [PATCH v4 1/4] USB: move ehci.h and ehci-core.h into /include/usb/
Jana, On Sun, Sep 25, 2011 at 2:25 PM, Jana Rapava wrote: ... > drivers/usb/host/ehci-core.h | 29 -- > drivers/usb/host/ehci-fsl.c | 4 +- > drivers/usb/host/ehci-hcd.c | 2 +- > drivers/usb/host/ehci-kirkwood.c | 4 +- > drivers/usb/host/ehci-mpc512x.c | 4 +- > drivers/usb/host/ehci-pci.c | 4 +- > drivers/usb/host/ehci-ppc4xx.c | 4 +- > drivers/usb/host/ehci.h | 203 > -- > include/usb/ehci-core.h | 29 ++ > include/usb/ehci.h | 203 > ++ > 10 files changed, 243 insertions(+), 243 deletions(-) > delete mode 100644 drivers/usb/host/ehci-core.h > delete mode 100644 drivers/usb/host/ehci.h > create mode 100644 include/usb/ehci-core.h > create mode 100644 include/usb/ehci.h This will break some drivers as you missed to update: drivers/usb/host/ehci-ixp4xx.c drivers/usb/host/ehci-mxc.c drivers/usb/host/ehci-vct.c Why don´t you just resend my original patch (put my name in the From: field) as part of this series? http://comments.gmane.org/gmane.comp.boot-loaders.u-boot/109335 My original patch is complete. Regards, Fabio Estevam ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v4 1/4] USB: move ehci.h and ehci-core.h into /include/usb/
Why don´t you just resend my original patch (put my name in the From: > field) as part of this series? > http://comments.gmane.org/gmane.comp.boot-loaders.u-boot/109335 > Thanks, I'll be glad to use it. Regards, Jana Rapava ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v4 1/4] USB: move ehci.h and ehci-core.h into /include/usb/
On Sunday, September 25, 2011 07:25:07 PM Jana Rapava wrote: > Signed-off-by: Jana Rapava > Cc: Marek Vasut > Cc: Remy Bohmer > Cc: Fabio Estevam > --- > Changes for v2: > - changed to proper patch > Changes for v3: > - merged other USB patches from u-boot-pxa/efikasb > - offset-based access changed to struct-based access > - use {clrset,clr,set}bits_le32() calls > - CodingStyle and naming cleanup > Changes for v4: >- split into patchset >- move ehci.h and ehci-core.h into /include/usb/ > Uh, I have totally no idea which is the last set of patches here now anymore. Anyway, is there any update or is this plain stuck ? Cheers ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v4 1/4] USB: move ehci.h and ehci-core.h into /include/usb/
2011/10/9 Marek Vasut > On Sunday, September 25, 2011 07:25:07 PM Jana Rapava wrote: > > Signed-off-by: Jana Rapava > > Cc: Marek Vasut > > Cc: Remy Bohmer > > Cc: Fabio Estevam > > --- > > Changes for v2: > > - changed to proper patch > > Changes for v3: > > - merged other USB patches from u-boot-pxa/efikasb > > - offset-based access changed to struct-based access > > - use {clrset,clr,set}bits_le32() calls > > - CodingStyle and naming cleanup > > Changes for v4: > >- split into patchset > >- move ehci.h and ehci-core.h into /include/usb/ > > > > Uh, > > I have totally no idea which is the last set of patches here now anymore. > Anyway, is there any update or is this plain stuck ? > > Cheers > Last set of patches is there: [0/4] http://lists.denx.de/pipermail/u-boot/2011-September/102729.html [1/4] http://lists.denx.de/pipermail/u-boot/2011-September/102720.html [2/4] http://lists.denx.de/pipermail/u-boot/2011-September/102719.html [3/4] http://lists.denx.de/pipermail/u-boot/2011-September/102721.html [4/4] http://lists.denx.de/pipermail/u-boot/2011-September/102803.html I haven't found time to work on this recently, I have some problems in school which I absolutely have to solve first. Regards, Jana Rapava ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v4 1/4] USB: move ehci.h and ehci-core.h into /include/usb/
Jana, On Sun, Oct 9, 2011 at 5:22 PM, Jana Rapava wrote: > I haven't found time to work on this recently, I have some problems in > school which I absolutely have to solve first. I have just resent an updated 1/4 after getting feedback from the list. Let's wait and see if it gets merged and then you resend your series without 1/4. Regards, Fabio Estevam ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v4 1/4] USB: move ehci.h and ehci-core.h into /include/usb/
On Sunday, October 09, 2011 10:22:03 PM Jana Rapava wrote: > 2011/10/9 Marek Vasut > > > On Sunday, September 25, 2011 07:25:07 PM Jana Rapava wrote: > > > Signed-off-by: Jana Rapava > > > Cc: Marek Vasut > > > Cc: Remy Bohmer > > > Cc: Fabio Estevam > > > --- > > > > > > Changes for v2: > > > - changed to proper patch > > > > > > Changes for v3: > > > - merged other USB patches from u-boot-pxa/efikasb > > > - offset-based access changed to struct-based access > > > - use {clrset,clr,set}bits_le32() calls > > > - CodingStyle and naming cleanup > > > > > > Changes for v4: > > >- split into patchset > > >- move ehci.h and ehci-core.h into /include/usb/ > > > > Uh, > > > > I have totally no idea which is the last set of patches here now anymore. > > Anyway, is there any update or is this plain stuck ? > > > > Cheers > > Last set of patches is there: > [0/4] http://lists.denx.de/pipermail/u-boot/2011-September/102729.html > [1/4] http://lists.denx.de/pipermail/u-boot/2011-September/102720.html > [2/4] http://lists.denx.de/pipermail/u-boot/2011-September/102719.html > [3/4] http://lists.denx.de/pipermail/u-boot/2011-September/102721.html > [4/4] http://lists.denx.de/pipermail/u-boot/2011-September/102803.html > > I haven't found time to work on this recently, I have some problems in > school which I absolutely have to solve first. > Regards, > Jana Rapava Remy, bump ? ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v4 1/4] USB: move ehci.h and ehci-core.h into /include/usb/
On Friday, October 14, 2011 05:49:50 PM Fabio Estevam wrote: > Jana, > > On Sun, Oct 9, 2011 at 5:22 PM, Jana Rapava wrote: > > I haven't found time to work on this recently, I have some problems in > > school which I absolutely have to solve first. > > I have just resent an updated 1/4 after getting feedback from the list. > > Let's wait and see if it gets merged and then you resend your series > without 1/4. I'm quite eagerly waiting for this to be mainlined, honestly. It'd close one whole chapter in the efika storyline. Cheers ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot