From: Lars-Peter Clausen <lars@metafoo.de>
To: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org, linux-kernel@vger.kernel.org,
Lars-Peter Clausen <lars@metafoo.de>,
Greg Kroah-Hartman <gregkh@suse.de>,
David Brownell <dbrownell@users.sourceforge.net>,
linux-usb@vger.kernel.org
Subject: [RFC][PATCH 19/26] USB: Add JZ4740 ohci support
Date: Wed, 2 Jun 2010 21:12:25 +0200 [thread overview]
Message-ID: <1275505950-17334-3-git-send-email-lars@metafoo.de> (raw)
In-Reply-To: <1275505397-16758-1-git-send-email-lars@metafoo.de>
This patch adds ohci glue code for JZ4740 SoCs ohci module.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Cc: linux-usb@vger.kernel.org
---
drivers/usb/Kconfig | 1 +
drivers/usb/host/ohci-hcd.c | 5 +
drivers/usb/host/ohci-jz4740.c | 264 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 270 insertions(+), 0 deletions(-)
create mode 100644 drivers/usb/host/ohci-jz4740.c
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 6a58cb1..39a6bfd 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -46,6 +46,7 @@ config USB_ARCH_HAS_OHCI
default y if PPC_MPC52xx
# MIPS:
default y if SOC_AU1X00
+ default y if MACH_JZ4740
# SH:
default y if CPU_SUBTYPE_SH7720
default y if CPU_SUBTYPE_SH7721
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index fc57655..05b071c 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -1095,6 +1095,11 @@ MODULE_LICENSE ("GPL");
#define TMIO_OHCI_DRIVER ohci_hcd_tmio_driver
#endif
+#ifdef CONFIG_MACH_JZ4740
+#include "ohci-jz4740.c"
+#define PLATFORM_DRIVER ohci_hcd_jz4740_driver
+#endif
+
#if !defined(PCI_DRIVER) && \
!defined(PLATFORM_DRIVER) && \
!defined(OMAP1_PLATFORM_DRIVER) && \
diff --git a/drivers/usb/host/ohci-jz4740.c b/drivers/usb/host/ohci-jz4740.c
new file mode 100644
index 0000000..0371b17
--- /dev/null
+++ b/drivers/usb/host/ohci-jz4740.c
@@ -0,0 +1,264 @@
+
+#include <linux/platform_device.h>
+#include <linux/clk.h>
+#include <linux/regulator/consumer.h>
+
+struct jz4740_ohci_hcd {
+ struct ohci_hcd ohci_hcd;
+
+ struct regulator *vbus;
+ bool vbus_enabled;
+ struct clk *clk;
+};
+
+static inline struct jz4740_ohci_hcd *hcd_to_jz4740_hcd(struct usb_hcd *hcd)
+{
+ return (struct jz4740_ohci_hcd *)(hcd->hcd_priv);
+}
+
+static inline struct usb_hcd *jz4740_hcd_to_hcd(struct jz4740_ohci_hcd *jz4740_ohci)
+{
+ return container_of((void *)jz4740_ohci, struct usb_hcd, hcd_priv);
+}
+
+static int ohci_jz4740_start(struct usb_hcd *hcd)
+{
+ struct ohci_hcd *ohci = hcd_to_ohci(hcd);
+ int ret;
+
+ ret = ohci_init(ohci);
+ if (ret < 0)
+ return ret;
+
+ ohci->num_ports = 1;
+
+ ret = ohci_run(ohci);
+ if (ret < 0) {
+ dev_err(hcd->self.controller, "Can not start %s",
+ hcd->self.bus_name);
+ ohci_stop(hcd);
+ return ret;
+ }
+ return 0;
+}
+
+static int ohci_jz4740_set_vbus_power(struct jz4740_ohci_hcd *jz4740_ohci,
+ bool enabled)
+{
+ int ret = 0;
+
+ if (!jz4740_ohci->vbus)
+ return 0;
+
+ if (enabled && !jz4740_ohci->vbus_enabled) {
+ ret = regulator_enable(jz4740_ohci->vbus);
+ if (ret)
+ dev_err(jz4740_hcd_to_hcd(jz4740_ohci)->self.controller,
+ "Could not power vbus\n");
+ } else if (!enabled && jz4740_ohci->vbus_enabled) {
+ ret = regulator_disable(jz4740_ohci->vbus);
+ }
+
+ if (ret == 0)
+ jz4740_ohci->vbus_enabled = enabled;
+
+ return ret;
+}
+
+static int ohci_jz4740_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
+ u16 wIndex, char *buf, u16 wLength)
+{
+ struct jz4740_ohci_hcd *jz4740_ohci = hcd_to_jz4740_hcd(hcd);
+ int ret;
+
+ switch (typeReq) {
+ case SetHubFeature:
+ if (wValue == USB_PORT_FEAT_POWER)
+ ret = ohci_jz4740_set_vbus_power(jz4740_ohci, true);
+ break;
+ case ClearHubFeature:
+ if (wValue == USB_PORT_FEAT_POWER)
+ ret = ohci_jz4740_set_vbus_power(jz4740_ohci, false);
+ break;
+ }
+
+ if (ret)
+ return ret;
+
+ return ohci_hub_control(hcd, typeReq, wValue, wIndex, buf, wLength);
+}
+
+
+static const struct hc_driver ohci_jz4740_hc_driver = {
+ .description = hcd_name,
+ .product_desc = "JZ4740 OHCI",
+ .hcd_priv_size = sizeof(struct jz4740_ohci_hcd),
+
+ /*
+ * generic hardware linkage
+ */
+ .irq = ohci_irq,
+ .flags = HCD_USB11 | HCD_MEMORY,
+
+ /*
+ * basic lifecycle operations
+ */
+ .start = ohci_jz4740_start,
+ .stop = ohci_stop,
+ .shutdown = ohci_shutdown,
+
+ /*
+ * managing i/o requests and associated device resources
+ */
+ .urb_enqueue = ohci_urb_enqueue,
+ .urb_dequeue = ohci_urb_dequeue,
+ .endpoint_disable = ohci_endpoint_disable,
+
+ /*
+ * scheduling support
+ */
+ .get_frame_number = ohci_get_frame,
+
+ /*
+ * root hub support
+ */
+ .hub_status_data = ohci_hub_status_data,
+ .hub_control = ohci_jz4740_hub_control,
+#ifdef CONFIG_PM
+ .bus_suspend = ohci_bus_suspend,
+ .bus_resume = ohci_bus_resume,
+#endif
+ .start_port_reset = ohci_start_port_reset,
+};
+
+
+static __devinit int jz4740_ohci_probe(struct platform_device *pdev)
+{
+ int ret;
+ struct usb_hcd *hcd;
+ struct jz4740_ohci_hcd *jz4740_ohci;
+ struct resource *res;
+ int irq;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+
+ if (!res) {
+ dev_err(&pdev->dev, "Failed to get platform resource\n");
+ return -ENOENT;
+ }
+
+ irq = platform_get_irq(pdev, 0);
+ if (irq < 0) {
+ dev_err(&pdev->dev, "Failed to get platform irq\n");
+ return irq;
+ }
+
+ hcd = usb_create_hcd(&ohci_jz4740_hc_driver, &pdev->dev, "jz4740");
+ if (!hcd) {
+ dev_err(&pdev->dev, "Failed to create hcd.\n");
+ return -ENOMEM;
+ }
+
+ jz4740_ohci = hcd_to_jz4740_hcd(hcd);
+
+ res = request_mem_region(res->start, resource_size(res), hcd_name);
+
+ if (!res) {
+ dev_err(&pdev->dev, "Failed to request mem region.\n");
+ ret = -EBUSY;
+ goto err_free;
+ }
+
+ hcd->rsrc_start = res->start;
+ hcd->rsrc_len = resource_size(res);
+ hcd->regs = ioremap(res->start, resource_size(res));
+
+ if (!hcd->regs) {
+ dev_err(&pdev->dev, "Failed to ioremap registers.\n");
+ ret = -EBUSY;
+ goto err_release_mem;
+ }
+
+ jz4740_ohci->clk = clk_get(&pdev->dev, "uhc");
+ if (IS_ERR(jz4740_ohci->clk)) {
+ ret = PTR_ERR(jz4740_ohci->clk);
+ dev_err(&pdev->dev, "Failed to get clock: %d\n", ret);
+ goto err_iounmap;
+ }
+
+ jz4740_ohci->vbus = regulator_get(&pdev->dev, "vbus");
+ if (IS_ERR(jz4740_ohci->vbus))
+ jz4740_ohci->vbus = NULL;
+
+
+ clk_set_rate(jz4740_ohci->clk, 48000000);
+ clk_enable(jz4740_ohci->clk);
+ if (jz4740_ohci->vbus)
+ ohci_jz4740_set_vbus_power(jz4740_ohci, true);
+
+ platform_set_drvdata(pdev, hcd);
+
+ ohci_hcd_init(hcd_to_ohci(hcd));
+
+ ret = usb_add_hcd(hcd, irq, IRQF_DISABLED);
+ if (ret) {
+ dev_err(&pdev->dev, "Failed to add hcd: %d\n", ret);
+ goto err_disable;
+ }
+
+ return 0;
+
+err_disable:
+ platform_set_drvdata(pdev, NULL);
+ if (jz4740_ohci->vbus) {
+ regulator_disable(jz4740_ohci->vbus);
+ regulator_put(jz4740_ohci->vbus);
+ }
+ clk_disable(jz4740_ohci->clk);
+
+ clk_put(jz4740_ohci->clk);
+err_iounmap:
+ iounmap(hcd->regs);
+err_release_mem:
+ release_mem_region(res->start, resource_size(res));
+err_free:
+ usb_put_hcd(hcd);
+
+ return ret;
+}
+
+static __devexit int jz4740_ohci_remove(struct platform_device *pdev)
+{
+ struct usb_hcd *hcd = platform_get_drvdata(pdev);
+ struct jz4740_ohci_hcd *jz4740_ohci = hcd_to_jz4740_hcd(hcd);
+
+ usb_remove_hcd(hcd);
+
+ platform_set_drvdata(pdev, NULL);
+
+ if (jz4740_ohci->vbus) {
+ regulator_disable(jz4740_ohci->vbus);
+ regulator_put(jz4740_ohci->vbus);
+ }
+
+ clk_disable(jz4740_ohci->clk);
+ clk_put(jz4740_ohci->clk);
+
+ iounmap(hcd->regs);
+ release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+
+ usb_put_hcd(hcd);
+
+ return 0;
+}
+
+static struct platform_driver ohci_hcd_jz4740_driver = {
+ .probe = jz4740_ohci_probe,
+ .remove = __devexit_p(jz4740_ohci_remove),
+ .driver = {
+ .name = "jz4740-ohci",
+ .owner = THIS_MODULE,
+ },
+};
+
+MODULE_ALIAS("platfrom:jz4740-ohci");
--
1.5.6.5
next prev parent reply other threads:[~2010-06-02 19:14 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-02 19:02 [RFC][PATCH 00/26] *** SUBJECT HERE *** Lars-Peter Clausen
2010-06-02 19:02 ` [RFC][PATCH 01/26] MIPS: Add base support for Ingenic JZ4740 System-on-a-Chip Lars-Peter Clausen
2010-06-03 14:27 ` Florian Fainelli
2010-06-03 17:03 ` Lars-Peter Clausen
2010-06-02 19:02 ` [RFC][PATCH 02/26] MIPS: jz4740: Add IRQ handler code Lars-Peter Clausen
2010-06-03 14:29 ` Florian Fainelli
2010-06-02 19:02 ` [RFC][PATCH 03/26] MIPS: JZ4740: Add clock API support Lars-Peter Clausen
2010-06-02 22:45 ` Graham Gower
2010-06-03 17:20 ` Lars-Peter Clausen
2010-06-02 19:02 ` [RFC][PATCH 04/26] MIPS: JZ4740: Add timer support Lars-Peter Clausen
2010-06-02 19:02 ` [RFC][PATCH 05/26] MIPS: JZ4740: Add clocksource/clockevent support Lars-Peter Clausen
2010-06-02 19:02 ` [RFC][PATCH 06/26] MIPS: JZ4740: Add power-management and system reset support Lars-Peter Clausen
2010-06-02 19:02 ` [RFC][PATCH 07/26] MIPS: JZ4740: Add setup code Lars-Peter Clausen
2010-06-02 19:02 ` [RFC][PATCH 08/26] MIPS: JZ4740: Add gpio support Lars-Peter Clausen
2010-06-02 19:10 ` [RFC][PATCH 09/26] MIPS: JZ4740: Add DMA support Lars-Peter Clausen
2010-06-02 19:10 ` [RFC][PATCH 10/26] MIPS: JZ4740: Add PWM support Lars-Peter Clausen
2010-06-02 19:10 ` [RFC][PATCH 11/26] MIPS: JZ4740: Add serial support Lars-Peter Clausen
2010-06-02 19:10 ` [RFC][PATCH 12/26] MIPS: JZ4740: Add prom support Lars-Peter Clausen
2010-06-02 19:10 ` [RFC][PATCH 13/26] MIPS: JZ4740: Add platform devices Lars-Peter Clausen
2010-06-02 19:10 ` [RFC][PATCH 14/26] MIPS: JZ4740: Add Kbuild files Lars-Peter Clausen
2010-06-04 0:47 ` Ralf Baechle
2010-06-02 19:10 ` [RFC][PATCH 15/26] RTC: Add JZ4740 RTC driver Lars-Peter Clausen
2010-06-05 15:48 ` [rtc-linux] " Wan ZongShun
2010-06-05 17:26 ` Lars-Peter Clausen
2010-06-02 19:10 ` [RFC][PATCH 16/26] fbdev: Add JZ4740 framebuffer driver Lars-Peter Clausen
2010-06-02 19:36 ` Andrew Morton
2010-06-02 20:05 ` Lars-Peter Clausen
2010-06-02 19:12 ` [RFC][PATCH 17/26] MTD: Nand: Add JZ4740 NAND driver Lars-Peter Clausen
2010-06-13 9:40 ` Artem Bityutskiy
2010-06-02 19:12 ` [RFC][PATCH 18/26] MMC: Add JZ4740 mmc driver Lars-Peter Clausen
2010-06-02 19:12 ` Lars-Peter Clausen [this message]
2010-06-02 19:12 ` [RFC][PATCH 20/26] alsa: ASoC: Add JZ4740 codec driver Lars-Peter Clausen
2010-06-03 5:45 ` [alsa-devel] " Wan ZongShun
2010-06-03 12:03 ` Mark Brown
2010-06-03 12:32 ` Liam Girdwood
2010-06-03 12:50 ` Liam Girdwood
2010-06-03 16:58 ` Lars-Peter Clausen
2010-06-03 17:49 ` Mark Brown
2010-06-03 23:57 ` Lars-Peter Clausen
2010-06-03 23:59 ` Mark Brown
2010-06-02 19:12 ` [RFC][PATCH 21/26] alsa: ASoC: Add JZ4740 ASoC support Lars-Peter Clausen
2010-06-03 3:36 ` [alsa-devel] " Wan ZongShun
2010-06-03 12:48 ` Liam Girdwood
2010-06-03 16:50 ` Lars-Peter Clausen
2010-06-03 17:03 ` Liam Girdwood
2010-06-03 17:16 ` Lars-Peter Clausen
2010-06-03 17:25 ` Liam Girdwood
2010-06-03 17:37 ` Lars-Peter Clausen
2010-06-03 18:14 ` [alsa-devel] " Troy Kisky
2010-11-14 13:29 ` hi!!!! dkisky
2010-06-03 17:55 ` [RFC][PATCH 21/26] alsa: ASoC: Add JZ4740 ASoC support Mark Brown
2010-06-03 19:27 ` Lars-Peter Clausen
2010-06-02 19:12 ` [RFC][PATCH 22/26] hwmon: Add JZ4740 ADC driver Lars-Peter Clausen
2010-06-05 17:22 ` Jonathan Cameron
2010-06-05 19:08 ` Lars-Peter Clausen
2010-06-05 21:07 ` [lm-sensors] " Jonathan Cameron
2010-06-05 22:12 ` Lars-Peter Clausen
2010-06-02 19:12 ` [RFC][PATCH 23/26] power: Add JZ4740 battery driver Lars-Peter Clausen
2010-06-14 15:51 ` Anton Vorontsov
2010-06-15 17:28 ` Lars-Peter Clausen
2010-06-15 17:34 ` Ralf Baechle
2010-06-16 12:20 ` Mark Brown
2010-06-19 3:48 ` Lars-Peter Clausen
2010-06-02 19:12 ` [RFC][PATCH 24/26] MIPS: JZ4740: Add qi_lb60 board support Lars-Peter Clausen
2010-06-02 19:15 ` [RFC][PATCH 25/26] MIPS: Add defconfig for the qi_lb60 board Lars-Peter Clausen
2010-06-02 19:15 ` [RFC][PATCH 26/26] alsa: ASoC: JZ4740: Add qi_lb60 board driver Lars-Peter Clausen
2010-06-03 17:57 ` Mark Brown
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=1275505950-17334-3-git-send-email-lars@metafoo.de \
--to=lars@metafoo.de \
--cc=dbrownell@users.sourceforge.net \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-usb@vger.kernel.org \
--cc=ralf@linux-mips.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
all inboxes | Powered by JetHome®