From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 1/6] ehci: Make has_tt configurable via platform data
Date: Thu, 24 Jun 2010 11:45:46 +0200 [thread overview]
Message-ID: <1277372751-15797-2-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1277372751-15797-1-git-send-email-s.hauer@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/usb/usb_ehci_core.c | 18 ++++++++++++------
include/usb/ehci.h | 10 ++++++++++
2 files changed, 22 insertions(+), 6 deletions(-)
create mode 100644 include/usb/ehci.h
diff --git a/drivers/usb/usb_ehci_core.c b/drivers/usb/usb_ehci_core.c
index d7efaad..f3611cd 100644
--- a/drivers/usb/usb_ehci_core.c
+++ b/drivers/usb/usb_ehci_core.c
@@ -31,6 +31,7 @@
#include <xfuncs.h>
#include <clock.h>
#include <errno.h>
+#include <usb/ehci.h>
#include <asm/mmu.h>
#include "usb_ehci.h"
@@ -43,6 +44,7 @@ struct ehci_priv {
struct QH *qh_list;
void *qhp;
int portreset;
+ unsigned long flags;
};
#define to_ehci(ptr) container_of(ptr, struct ehci_priv, host)
@@ -112,13 +114,8 @@ static struct descriptor {
255 /* bInterval */
},
};
-#define CONFIG_EHCI_IS_TDI // FIXME
-#if defined(CONFIG_EHCI_IS_TDI)
-#define ehci_is_TDI() (1)
-#else
-#define ehci_is_TDI() (0)
-#endif
+#define ehci_is_TDI() (ehci->flags & EHCI_HAS_TT)
#ifdef CONFIG_MMU
/*
@@ -861,10 +858,19 @@ static int ehci_probe(struct device_d *dev)
struct usb_host *host;
struct ehci_priv *ehci;
uint32_t reg;
+ struct ehci_platform_data *pdata = dev->platform_data;
ehci = xmalloc(sizeof(struct ehci_priv));
host = &ehci->host;
+ if (pdata)
+ ehci->flags = pdata->flags;
+ else
+ /* default to EHCI_HAS_TT to not change behaviour of boards
+ * with platform_data
+ */
+ ehci->flags = EHCI_HAS_TT;
+
host->init = ehci_init;
host->submit_int_msg = submit_int_msg;
host->submit_control_msg = submit_control_msg;
diff --git a/include/usb/ehci.h b/include/usb/ehci.h
new file mode 100644
index 0000000..3304b60
--- /dev/null
+++ b/include/usb/ehci.h
@@ -0,0 +1,10 @@
+#ifndef __USB_EHCI_H
+#define __USB_EHCI_H
+
+#define EHCI_HAS_TT (1 << 0)
+
+struct ehci_platform_data {
+ unsigned long flags;
+};
+
+#endif /* __USB_EHCI_H */
--
1.7.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2010-06-24 9:45 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-24 9:45 USB related patches Sascha Hauer
2010-06-24 9:45 ` Sascha Hauer [this message]
2010-06-24 9:45 ` [PATCH 2/6] ehci: Handle hub port reset properly Sascha Hauer
2010-06-24 9:45 ` [PATCH 3/6] usb: Check return value of host controller init Sascha Hauer
2010-06-24 9:45 ` [PATCH 4/6] ehci: use is_timeout for timeout instead of udelay counter Sascha Hauer
2010-06-24 9:45 ` [PATCH 5/6] ehci: Force a ehci_halt before trying to reset Sascha Hauer
2010-06-24 9:45 ` [PATCH 6/6] ehci: remove unused code Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1277372751-15797-2-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox