Skip to contentSkip to conversation

usb: Move ehci.h and ehci-core.h to include/usb directory

PATCH Superseded Fabio Estevam 3 participants 5 messages Sep 24, 2011 – Oct 6, 2011

Subsystems (3)
USB Arm i.MX and Layerscape USB ehci driver

v1 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/1 usb: Move ehci.h and ehci-core.h to include/usb directory

Move ehci.h and ehci-core.h to include/usb directory.

Cc Remy Bohmer <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>
---
 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-ixp4xx.c   |    4 +-
 drivers/usb/host/ehci-kirkwood.c |    4 +-
 drivers/usb/host/ehci-mpc512x.c  |    4 +-
 drivers/usb/host/ehci-mxc.c      |    4 +-
 drivers/usb/host/ehci-pci.c      |    4 +-
 drivers/usb/host/ehci-ppc4xx.c   |    4 +-
 drivers/usb/host/ehci-vct.c      |    4 +-
 drivers/usb/host/ehci.h          |  203 --------------------------------------
 include/usb/ehci-core.h          |   29 ++++++
 include/usb/ehci.h               |  203 ++++++++++++++++++++++++++++++++++++++
 13 files changed, 249 insertions(+), 249 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
drivers/usb/host/ehci-core.h deleted +0 -29
deleted file mode 100644
index 39e5c5e..0000000
@@ -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
drivers/usb/host/ehci-fsl.c +2 -2
index 6e0043a..19b97ee 100644
@@ -27,8 +27,8 @@
 #include <asm/io.h>
 #include <usb/ehci-fsl.h>
 
-#include "ehci.h"
-#include "ehci-core.h"
+#include <usb/ehci.h>
+#include <usb/ehci-core.h>
 
 /*
  * Create the appropriate control structures to manage
drivers/usb/host/ehci-hcd.c +1 -1
index 2197119..bdadd46 100644
@@ -27,7 +27,7 @@
 #include <malloc.h>
 #include <watchdog.h>
 
-#include "ehci.h"
+#include <usb/ehci.h>
 
 int rootdev;
 struct ehci_hccr *hccr;	/* R/O registers, not need for volatile */
drivers/usb/host/ehci-ixp4xx.c +2 -2
index b8f15ae..d15237b 100644
@@ -22,8 +22,8 @@
 #include <common.h>
 #include <usb.h>
 
-#include "ehci.h"
-#include "ehci-core.h"
+#include <usb/ehci.h>
+#include <usb/ehci-core.h>
 /*
  * Create the appropriate control structures to manage
  * a new EHCI host controller.
drivers/usb/host/ehci-kirkwood.c +2 -2
index 5570fc6..ab75acd 100644
@@ -25,8 +25,8 @@
 #include <common.h>
 #include <asm/io.h>
 #include <usb.h>
-#include "ehci.h"
-#include "ehci-core.h"
+#include <usb/ehci.h>
+#include <usb/ehci-core.h>
 #include <asm/arch/kirkwood.h>
 
 #define rdl(off)	readl(KW_USB20_BASE + (off))
drivers/usb/host/ehci-mpc512x.c +2 -2
index d360108..8d2c93b 100644
@@ -32,8 +32,8 @@
 #include <asm/io.h>
 #include <usb/ehci-fsl.h>
 
-#include "ehci.h"
-#include "ehci-core.h"
+#include <usb/ehci.h>
+#include <usb/ehci-core.h>
 
 static void fsl_setup_phy(volatile struct ehci_hcor *);
 static void fsl_platform_set_host_mode(volatile struct usb_ehci *ehci);
drivers/usb/host/ehci-mxc.c +2 -2
index a0cfbb7..fde1f0f 100644
@@ -24,8 +24,8 @@
 #include <usb/ehci-fsl.h>
 #include <errno.h>
 
-#include "ehci.h"
-#include "ehci-core.h"
+#include <usb/ehci.h>
+#include <usb/ehci-core.h>
 
 #define USBCTRL_OTGBASE_OFFSET	0x600
drivers/usb/host/ehci-pci.c +2 -2
index 020ab11..e1f84d9 100644
@@ -22,8 +22,8 @@
 #include <pci.h>
 #include <usb.h>
 
-#include "ehci.h"
-#include "ehci-core.h"
+#include <usb/ehci.h>
+#include <usb/ehci-core.h>
 
 #ifdef CONFIG_PCI_EHCI_DEVICE
 static struct pci_device_id ehci_pci_ids[] = {
drivers/usb/host/ehci-ppc4xx.c +2 -2
index 1179919..1a1fae1 100644
@@ -22,8 +22,8 @@
 #include <common.h>
 #include <usb.h>
 
-#include "ehci.h"
-#include "ehci-core.h"
+#include <usb/ehci.h>
+#include <usb/ehci-core.h>
 
 /*
  * Create the appropriate control structures to manage
drivers/usb/host/ehci-vct.c +2 -2
index 3063dd1..e73cf38 100644
@@ -20,8 +20,8 @@
 #include <common.h>
 #include <usb.h>
 
-#include "ehci.h"
-#include "ehci-core.h"
+#include <usb/ehci.h>
+#include <usb/ehci-core.h>
 
 int vct_ehci_hcd_init(u32 *hccr, u32 *hcor);
drivers/usb/host/ehci.h deleted +0 -203

203 lines not on this page · raw message

include/usb/ehci-core.h new file +29 -0
new file mode 100644
index 0000000..39e5c5e
@@ -0,0 +1,29 @@
+/*-
+ * 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
include/usb/ehci.h new file +203 -0

203 lines not on this page · raw message

Signature · 1 line
1.7.1
#1 lore raw

PATCH 1/1 usb: Move ehci.h and ehci-core.h to include/usb directory

Quoted 4 lines · Fabio Estevam

Move ehci.h and ehci-core.h to include/usb directory.

Cc Remy Bohmer <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>

Like we discussed earlier, something similar should soon go in as a part of a bigger series. Therefore I'd prefer to keep that together.

Cheers

author reviewer
#2 lore raw

PATCH 1/1 usb: Move ehci.h and ehci-core.h to include/usb directory

Marek

2011/9/24 Marek Vasut <[email protected]>:

Quoted 8 lines · Fabio Estevam
Quoted 4 lines

Move ehci.h and ehci-core.h to include/usb directory.

Cc Remy Bohmer <[email protected]>
Signed-off-by Fabio Estevam <fabio.estevam@fr,eescale.com>

Like we discussed earlier, something similar should soon go in as a part of a bigger series. Therefore I'd prefer to keep that together.

Ok, but Jana?s patch will break three drivers:

drivers/usb/host/ehci-ixp4xx.c
drivers/usb/host/ehci-mxc.c
drivers/usb/host/ehci-vct.c

It would be better to just send my original patch as part of his series.

#3 lore raw

PATCH 1/1 usb: Move ehci.h and ehci-core.h to include/usb directory

Quoted 12 lines · Fabio Estevam

Marek

2011/9/24 Marek Vasut <[email protected]>:

Quoted 8 lines · Fabio Estevam
Quoted 4 lines

Move ehci.h and ehci-core.h to include/usb directory.

Cc Remy Bohmer <[email protected]>
Signed-off-by Fabio Estevam <fabio.estevam@fr,eescale.com>

Like we discussed earlier, something similar should soon go in as a part of a bigger series. Therefore I'd prefer to keep that together.

Quoted 7 lines

Ok, but Jana?s patch will break three drivers:

drivers/usb/host/ehci-ixp4xx.c
drivers/usb/host/ehci-mxc.c
drivers/usb/host/ehci-vct.c

It would be better to just send my original patch as part of his series.

Yea I see ... well you two should discuss it. It's up to you two how you'll negotiate the result.

Cheers

#4 lore raw

PATCH 1/1 usb: Move ehci.h and ehci-core.h to include/usb directory

In reply to Fabio Estevam

Dear Fabio Estevam,

Quoted 17 lines · In message <[email protected]> you wrote:

--===============1089964336==

Move ehci.h and ehci-core.h to include/usb directory.

Cc Remy Bohmer <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>
---
 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-ixp4xx.c   |    4 +-
 drivers/usb/host/ehci-kirkwood.c |    4 +-
 drivers/usb/host/ehci-mpc512x.c  |    4 +-
 drivers/usb/host/ehci-mxc.c      |    4 +-
 drivers/usb/host/ehci-pci.c      |    4 +-
 drivers/usb/host/ehci-ppc4xx.c   |    4 +-
 drivers/usb/host/ehci-vct.c      |    4 +-
Quoted 8 lines
 drivers/usb/host/ehci.h          |  203 --------------------------------------
 include/usb/ehci-core.h          |   29 ++++++
 include/usb/ehci.h               |  203 ++++++++++++++++++++++++++++++++++++++
 13 files changed, 249 insertions(+), 249 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

Please use git for renames, not delete/add.

Also, Checkpatch says:

total: 0 errors, 7 warnings, 320 lines checked

Please clean up and resubmit. Thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
One difference between a man and a machine is that a machine is quiet
when well oiled.