* [PATCH 1/2] ARM: vt8500: Update vt8500-ehci driver to support device tree.
@ 2012-07-19 13:31 ` Tony Prisk
0 siblings, 0 replies; 19+ messages in thread
From: Tony Prisk @ 2012-07-19 13:31 UTC (permalink / raw)
To: Arnd Bergmann, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
vt8500-wm8505-linux-kernel-/JYPxA39Uh5TLH3MbocFFw,
devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ
Signed-off-by: Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>
---
drivers/usb/host/ehci-vt8500.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/drivers/usb/host/ehci-vt8500.c b/drivers/usb/host/ehci-vt8500.c
index c1eda73..4ba8f0c 100644
--- a/drivers/usb/host/ehci-vt8500.c
+++ b/drivers/usb/host/ehci-vt8500.c
@@ -16,6 +16,7 @@
*
*/
+#include <linux/of.h>
#include <linux/platform_device.h>
static int ehci_update_device(struct usb_hcd *hcd, struct usb_device *udev)
@@ -162,6 +163,12 @@ static int vt8500_ehci_drv_remove(struct platform_device *pdev)
return 0;
}
+static const struct of_device_id vt8500_ehci_ids[] = {
+ { .compatible = "via,vt8500-ehci", },
+ { .compatible = "wm,prizm-ehci", },
+ {}
+};
+
static struct platform_driver vt8500_ehci_driver = {
.probe = vt8500_ehci_drv_probe,
.remove = vt8500_ehci_drv_remove,
@@ -169,7 +176,9 @@ static struct platform_driver vt8500_ehci_driver = {
.driver = {
.name = "vt8500-ehci",
.owner = THIS_MODULE,
+ .of_match_table = of_match_ptr(vt8500_ehci_ids),
}
};
MODULE_ALIAS("platform:vt8500-ehci");
+MODULE_DEVICE_TABLE(of, vt8500_ehci_ids);
--
1.7.2.5
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 1/2] ARM: vt8500: Update vt8500-ehci driver to support device tree.
@ 2012-07-19 13:31 ` Tony Prisk
0 siblings, 0 replies; 19+ messages in thread
From: Tony Prisk @ 2012-07-19 13:31 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
---
drivers/usb/host/ehci-vt8500.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/drivers/usb/host/ehci-vt8500.c b/drivers/usb/host/ehci-vt8500.c
index c1eda73..4ba8f0c 100644
--- a/drivers/usb/host/ehci-vt8500.c
+++ b/drivers/usb/host/ehci-vt8500.c
@@ -16,6 +16,7 @@
*
*/
+#include <linux/of.h>
#include <linux/platform_device.h>
static int ehci_update_device(struct usb_hcd *hcd, struct usb_device *udev)
@@ -162,6 +163,12 @@ static int vt8500_ehci_drv_remove(struct platform_device *pdev)
return 0;
}
+static const struct of_device_id vt8500_ehci_ids[] = {
+ { .compatible = "via,vt8500-ehci", },
+ { .compatible = "wm,prizm-ehci", },
+ {}
+};
+
static struct platform_driver vt8500_ehci_driver = {
.probe = vt8500_ehci_drv_probe,
.remove = vt8500_ehci_drv_remove,
@@ -169,7 +176,9 @@ static struct platform_driver vt8500_ehci_driver = {
.driver = {
.name = "vt8500-ehci",
.owner = THIS_MODULE,
+ .of_match_table = of_match_ptr(vt8500_ehci_ids),
}
};
MODULE_ALIAS("platform:vt8500-ehci");
+MODULE_DEVICE_TABLE(of, vt8500_ehci_ids);
--
1.7.2.5
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 2/2] ARM: vt8500: Add support for UHCI companion controller
2012-07-19 13:31 ` Tony Prisk
@ 2012-07-19 13:31 ` Tony Prisk
-1 siblings, 0 replies; 19+ messages in thread
From: Tony Prisk @ 2012-07-19 13:31 UTC (permalink / raw)
To: Arnd Bergmann, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
vt8500-wm8505-linux-kernel-/JYPxA39Uh5TLH3MbocFFw,
devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ
Add support for the UHCI companion controller in arch-vt8500.
This patch is based almost entirely off uhci-grlib.c with
additions for device tree support.
Signed-off-by: Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>
---
drivers/usb/host/Kconfig | 4 +-
drivers/usb/host/uhci-hcd.c | 5 +
drivers/usb/host/uhci-vt8500.c | 158 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 165 insertions(+), 2 deletions(-)
create mode 100644 drivers/usb/host/uhci-vt8500.c
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 83e58df..1c4de8f 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -450,7 +450,7 @@ config USB_OHCI_LITTLE_ENDIAN
config USB_UHCI_HCD
tristate "UHCI HCD (most Intel and VIA) support"
- depends on USB && (PCI || SPARC_LEON)
+ depends on USB && (PCI || SPARC_LEON || ARCH_VT8500)
---help---
The Universal Host Controller Interface is a standard by Intel for
accessing the USB hardware in the PC (which is also called the USB
@@ -468,7 +468,7 @@ config USB_UHCI_HCD
config USB_UHCI_SUPPORT_NON_PCI_HC
bool
depends on USB_UHCI_HCD
- default y if SPARC_LEON
+ default y if (SPARC_LEON || ARCH_VT8500)
config USB_UHCI_BIG_ENDIAN_MMIO
bool
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index e4db350..28f885d 100644
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -846,6 +846,11 @@ static const char hcd_name[] = "uhci_hcd";
#define PLATFORM_DRIVER uhci_grlib_driver
#endif
+#ifdef CONFIG_ARCH_VT8500
+#include "uhci-vt8500.c"
+#define PLATFORM_DRIVER uhci_vt8500_driver
+#endif
+
#if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER)
#error "missing bus glue for uhci-hcd"
#endif
diff --git a/drivers/usb/host/uhci-vt8500.c b/drivers/usb/host/uhci-vt8500.c
new file mode 100644
index 0000000..d349c82
--- /dev/null
+++ b/drivers/usb/host/uhci-vt8500.c
@@ -0,0 +1,158 @@
+/*
+ * UHCI HCD (Host Controller Driver) for VT8500/WM8505/WM8650
+ *
+ * Copyright (c) 2011 Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>
+ *
+ * This file is based on uhci-grlib.c
+ */
+
+#include <linux/of.h>
+#include <linux/platform_device.h>
+
+static int uhci_vt8500_init(struct usb_hcd *hcd)
+{
+ struct uhci_hcd *uhci = hcd_to_uhci(hcd);
+
+ uhci->rh_numports = uhci_count_ports(hcd);
+
+ /* Set up pointers to to generic functions */
+ uhci->reset_hc = uhci_generic_reset_hc;
+ uhci->check_and_reset_hc = uhci_generic_check_and_reset_hc;
+
+ /* No special actions need to be taken for the functions below */
+ uhci->configure_hc = NULL;
+ uhci->resume_detect_interrupts_are_broken = NULL;
+ uhci->global_suspend_mode_is_broken = NULL;
+
+ /* Reset if the controller isn't already safely quiescent. */
+ check_and_reset_hc(uhci);
+ return 0;
+}
+
+static const struct hc_driver uhci_vt8500_hc_driver = {
+ .description = hcd_name,
+ .product_desc = "WonderMedia UHCI Host Controller",
+ .hcd_priv_size = sizeof(struct uhci_hcd),
+
+ /* Generic hardware linkage */
+ .irq = uhci_irq,
+ .flags = HCD_MEMORY | HCD_USB11,
+
+ /* Basic lifecycle operations */
+ .reset = uhci_vt8500_init,
+ .start = uhci_start,
+#ifdef CONFIG_PM
+ .pci_suspend = NULL,
+ .pci_resume = NULL,
+ .bus_suspend = uhci_rh_suspend,
+ .bus_resume = uhci_rh_resume,
+#endif
+ .stop = uhci_stop,
+
+ .urb_enqueue = uhci_urb_enqueue,
+ .urb_dequeue = uhci_urb_dequeue,
+
+ .endpoint_disable = uhci_hcd_endpoint_disable,
+ .get_frame_number = uhci_hcd_get_frame_number,
+
+ .hub_status_data = uhci_hub_status_data,
+ .hub_control = uhci_hub_control,
+};
+
+
+static int __devinit uhci_hcd_vt8500_probe(struct platform_device *pdev)
+{
+ struct usb_hcd *hcd;
+ struct uhci_hcd *uhci;
+ struct resource *res;
+ int ret;
+
+ if (usb_disabled())
+ return -ENODEV;
+
+ hcd = usb_create_hcd(&uhci_vt8500_hc_driver, &pdev->dev,
+ pdev->name);
+ if (!hcd)
+ return -ENOMEM;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ hcd->rsrc_start = res->start;
+ hcd->rsrc_len = resource_size(res);
+
+ if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
+ pr_err("%s: request_mem_region failed\n", __func__);
+ ret = -EBUSY;
+ goto err_rmr;
+ }
+
+ hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
+ if (!hcd->regs) {
+ pr_err("%s: ioremap failed\n", __func__);
+ ret = -ENOMEM;
+ goto err_irq;
+ }
+
+ uhci = hcd_to_uhci(hcd);
+
+ uhci->regs = hcd->regs;
+
+ ret = usb_add_hcd(hcd, pdev->resource[1].start, IRQF_DISABLED |
+ IRQF_SHARED);
+ if (ret)
+ goto err_uhci;
+
+ return 0;
+
+err_uhci:
+ iounmap(hcd->regs);
+err_irq:
+ release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+err_rmr:
+ usb_put_hcd(hcd);
+
+ return ret;
+}
+
+static int uhci_hcd_vt8500_remove(struct platform_device *pdev)
+{
+ struct usb_hcd *hcd = platform_get_drvdata(pdev);
+
+ usb_remove_hcd(hcd);
+ iounmap(hcd->regs);
+ release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+ usb_put_hcd(hcd);
+ platform_set_drvdata(pdev, NULL);
+
+ return 0;
+}
+
+/* Make sure the controller is quiescent and that we're not using it
+ * any more. This is mainly for the benefit of programs which, like kexec,
+ * expect the hardware to be idle: not doing DMA or generating IRQs.
+ *
+ * This routine may be called in a damaged or failing kernel. Hence we
+ * do not acquire the spinlock before shutting down the controller.
+ */
+static void uhci_hcd_vt8500_shutdown(struct platform_device *op)
+{
+ struct usb_hcd *hcd = dev_get_drvdata(&op->dev);
+
+ uhci_hc_died(hcd_to_uhci(hcd));
+}
+
+static const struct of_device_id vt8500_uhci_ids[] = {
+ { .compatible = "via,vt8500-uhci", },
+ { .compatible = "wm,prizm-uhci", },
+ {}
+};
+
+static struct platform_driver uhci_vt8500_driver = {
+ .probe = uhci_hcd_vt8500_probe,
+ .remove = uhci_hcd_vt8500_remove,
+ .shutdown = uhci_hcd_vt8500_shutdown,
+ .driver = {
+ .name = "vt8500-uhci",
+ .owner = THIS_MODULE,
+ .of_match_table = of_match_ptr(vt8500_uhci_ids),
+ },
+};
--
1.7.2.5
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 2/2] ARM: vt8500: Add support for UHCI companion controller
@ 2012-07-19 13:31 ` Tony Prisk
0 siblings, 0 replies; 19+ messages in thread
From: Tony Prisk @ 2012-07-19 13:31 UTC (permalink / raw)
To: linux-arm-kernel
Add support for the UHCI companion controller in arch-vt8500.
This patch is based almost entirely off uhci-grlib.c with
additions for device tree support.
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
---
drivers/usb/host/Kconfig | 4 +-
drivers/usb/host/uhci-hcd.c | 5 +
drivers/usb/host/uhci-vt8500.c | 158 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 165 insertions(+), 2 deletions(-)
create mode 100644 drivers/usb/host/uhci-vt8500.c
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 83e58df..1c4de8f 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -450,7 +450,7 @@ config USB_OHCI_LITTLE_ENDIAN
config USB_UHCI_HCD
tristate "UHCI HCD (most Intel and VIA) support"
- depends on USB && (PCI || SPARC_LEON)
+ depends on USB && (PCI || SPARC_LEON || ARCH_VT8500)
---help---
The Universal Host Controller Interface is a standard by Intel for
accessing the USB hardware in the PC (which is also called the USB
@@ -468,7 +468,7 @@ config USB_UHCI_HCD
config USB_UHCI_SUPPORT_NON_PCI_HC
bool
depends on USB_UHCI_HCD
- default y if SPARC_LEON
+ default y if (SPARC_LEON || ARCH_VT8500)
config USB_UHCI_BIG_ENDIAN_MMIO
bool
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index e4db350..28f885d 100644
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -846,6 +846,11 @@ static const char hcd_name[] = "uhci_hcd";
#define PLATFORM_DRIVER uhci_grlib_driver
#endif
+#ifdef CONFIG_ARCH_VT8500
+#include "uhci-vt8500.c"
+#define PLATFORM_DRIVER uhci_vt8500_driver
+#endif
+
#if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER)
#error "missing bus glue for uhci-hcd"
#endif
diff --git a/drivers/usb/host/uhci-vt8500.c b/drivers/usb/host/uhci-vt8500.c
new file mode 100644
index 0000000..d349c82
--- /dev/null
+++ b/drivers/usb/host/uhci-vt8500.c
@@ -0,0 +1,158 @@
+/*
+ * UHCI HCD (Host Controller Driver) for VT8500/WM8505/WM8650
+ *
+ * Copyright (c) 2011 Tony Prisk <linux@prisktech.co.nz>
+ *
+ * This file is based on uhci-grlib.c
+ */
+
+#include <linux/of.h>
+#include <linux/platform_device.h>
+
+static int uhci_vt8500_init(struct usb_hcd *hcd)
+{
+ struct uhci_hcd *uhci = hcd_to_uhci(hcd);
+
+ uhci->rh_numports = uhci_count_ports(hcd);
+
+ /* Set up pointers to to generic functions */
+ uhci->reset_hc = uhci_generic_reset_hc;
+ uhci->check_and_reset_hc = uhci_generic_check_and_reset_hc;
+
+ /* No special actions need to be taken for the functions below */
+ uhci->configure_hc = NULL;
+ uhci->resume_detect_interrupts_are_broken = NULL;
+ uhci->global_suspend_mode_is_broken = NULL;
+
+ /* Reset if the controller isn't already safely quiescent. */
+ check_and_reset_hc(uhci);
+ return 0;
+}
+
+static const struct hc_driver uhci_vt8500_hc_driver = {
+ .description = hcd_name,
+ .product_desc = "WonderMedia UHCI Host Controller",
+ .hcd_priv_size = sizeof(struct uhci_hcd),
+
+ /* Generic hardware linkage */
+ .irq = uhci_irq,
+ .flags = HCD_MEMORY | HCD_USB11,
+
+ /* Basic lifecycle operations */
+ .reset = uhci_vt8500_init,
+ .start = uhci_start,
+#ifdef CONFIG_PM
+ .pci_suspend = NULL,
+ .pci_resume = NULL,
+ .bus_suspend = uhci_rh_suspend,
+ .bus_resume = uhci_rh_resume,
+#endif
+ .stop = uhci_stop,
+
+ .urb_enqueue = uhci_urb_enqueue,
+ .urb_dequeue = uhci_urb_dequeue,
+
+ .endpoint_disable = uhci_hcd_endpoint_disable,
+ .get_frame_number = uhci_hcd_get_frame_number,
+
+ .hub_status_data = uhci_hub_status_data,
+ .hub_control = uhci_hub_control,
+};
+
+
+static int __devinit uhci_hcd_vt8500_probe(struct platform_device *pdev)
+{
+ struct usb_hcd *hcd;
+ struct uhci_hcd *uhci;
+ struct resource *res;
+ int ret;
+
+ if (usb_disabled())
+ return -ENODEV;
+
+ hcd = usb_create_hcd(&uhci_vt8500_hc_driver, &pdev->dev,
+ pdev->name);
+ if (!hcd)
+ return -ENOMEM;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ hcd->rsrc_start = res->start;
+ hcd->rsrc_len = resource_size(res);
+
+ if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
+ pr_err("%s: request_mem_region failed\n", __func__);
+ ret = -EBUSY;
+ goto err_rmr;
+ }
+
+ hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
+ if (!hcd->regs) {
+ pr_err("%s: ioremap failed\n", __func__);
+ ret = -ENOMEM;
+ goto err_irq;
+ }
+
+ uhci = hcd_to_uhci(hcd);
+
+ uhci->regs = hcd->regs;
+
+ ret = usb_add_hcd(hcd, pdev->resource[1].start, IRQF_DISABLED |
+ IRQF_SHARED);
+ if (ret)
+ goto err_uhci;
+
+ return 0;
+
+err_uhci:
+ iounmap(hcd->regs);
+err_irq:
+ release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+err_rmr:
+ usb_put_hcd(hcd);
+
+ return ret;
+}
+
+static int uhci_hcd_vt8500_remove(struct platform_device *pdev)
+{
+ struct usb_hcd *hcd = platform_get_drvdata(pdev);
+
+ usb_remove_hcd(hcd);
+ iounmap(hcd->regs);
+ release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+ usb_put_hcd(hcd);
+ platform_set_drvdata(pdev, NULL);
+
+ return 0;
+}
+
+/* Make sure the controller is quiescent and that we're not using it
+ * any more. This is mainly for the benefit of programs which, like kexec,
+ * expect the hardware to be idle: not doing DMA or generating IRQs.
+ *
+ * This routine may be called in a damaged or failing kernel. Hence we
+ * do not acquire the spinlock before shutting down the controller.
+ */
+static void uhci_hcd_vt8500_shutdown(struct platform_device *op)
+{
+ struct usb_hcd *hcd = dev_get_drvdata(&op->dev);
+
+ uhci_hc_died(hcd_to_uhci(hcd));
+}
+
+static const struct of_device_id vt8500_uhci_ids[] = {
+ { .compatible = "via,vt8500-uhci", },
+ { .compatible = "wm,prizm-uhci", },
+ {}
+};
+
+static struct platform_driver uhci_vt8500_driver = {
+ .probe = uhci_hcd_vt8500_probe,
+ .remove = uhci_hcd_vt8500_remove,
+ .shutdown = uhci_hcd_vt8500_shutdown,
+ .driver = {
+ .name = "vt8500-uhci",
+ .owner = THIS_MODULE,
+ .of_match_table = of_match_ptr(vt8500_uhci_ids),
+ },
+};
--
1.7.2.5
^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH 1/2] ARM: vt8500: Update vt8500-ehci driver to support device tree.
2012-07-19 13:31 ` Tony Prisk
@ 2012-07-19 14:23 ` Arnd Bergmann
-1 siblings, 0 replies; 19+ messages in thread
From: Arnd Bergmann @ 2012-07-19 14:23 UTC (permalink / raw)
To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
Cc: vt8500-wm8505-linux-kernel-/JYPxA39Uh5TLH3MbocFFw,
devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ
On Thursday 19 July 2012, Tony Prisk wrote:
>
> Signed-off-by: Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>
> ---
> drivers/usb/host/ehci-vt8500.c | 9 +++++++++
> 1 files changed, 9 insertions(+), 0 deletions(-)
The addition is straightforward and looks correct, but I would suggest you
also add the new "compatible" values to
Documentation/devicetree/bindings/usb-ehci.txt
Arnd
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 1/2] ARM: vt8500: Update vt8500-ehci driver to support device tree.
@ 2012-07-19 14:23 ` Arnd Bergmann
0 siblings, 0 replies; 19+ messages in thread
From: Arnd Bergmann @ 2012-07-19 14:23 UTC (permalink / raw)
To: linux-arm-kernel
On Thursday 19 July 2012, Tony Prisk wrote:
>
> Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
> ---
> drivers/usb/host/ehci-vt8500.c | 9 +++++++++
> 1 files changed, 9 insertions(+), 0 deletions(-)
The addition is straightforward and looks correct, but I would suggest you
also add the new "compatible" values to
Documentation/devicetree/bindings/usb-ehci.txt
Arnd
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/2] ARM: vt8500: Add support for UHCI companion controller
2012-07-19 13:31 ` Tony Prisk
@ 2012-07-19 14:27 ` Arnd Bergmann
-1 siblings, 0 replies; 19+ messages in thread
From: Arnd Bergmann @ 2012-07-19 14:27 UTC (permalink / raw)
To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
Cc: vt8500-wm8505-linux-kernel-/JYPxA39Uh5TLH3MbocFFw,
devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ
On Thursday 19 July 2012, Tony Prisk wrote:
> Add support for the UHCI companion controller in arch-vt8500.
> This patch is based almost entirely off uhci-grlib.c with
> additions for device tree support.
>
> Signed-off-by: Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>
It looks like this file is basically completely generic, so could you
just call it uhci-of instead so we can use it for all uhci implementations
that have no special requirements?
Arnd
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 2/2] ARM: vt8500: Add support for UHCI companion controller
@ 2012-07-19 14:27 ` Arnd Bergmann
0 siblings, 0 replies; 19+ messages in thread
From: Arnd Bergmann @ 2012-07-19 14:27 UTC (permalink / raw)
To: linux-arm-kernel
On Thursday 19 July 2012, Tony Prisk wrote:
> Add support for the UHCI companion controller in arch-vt8500.
> This patch is based almost entirely off uhci-grlib.c with
> additions for device tree support.
>
> Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
It looks like this file is basically completely generic, so could you
just call it uhci-of instead so we can use it for all uhci implementations
that have no special requirements?
Arnd
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/2] ARM: vt8500: Update vt8500-ehci driver to support device tree.
2012-07-19 13:31 ` Tony Prisk
@ 2012-07-19 14:45 ` Alexey Charkov
-1 siblings, 0 replies; 19+ messages in thread
From: Alexey Charkov @ 2012-07-19 14:45 UTC (permalink / raw)
To: vt8500-wm8505-linux-kernel
Cc: Tony Prisk, devicetree-discuss, linux-arm-kernel, Arnd Bergmann
2012/7/19 Tony Prisk <linux@prisktech.co.nz>:
> Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
> ---
> drivers/usb/host/ehci-vt8500.c | 9 +++++++++
> 1 files changed, 9 insertions(+), 0 deletions(-)
Have you tried to use ehci-platform on VIA/WMT devices? If it works
(which I would expect), I believe it's better to include OF support
into ehci-platform and drop ehci-vt8500 completely after existing
boards are converted to Device Tree. When writing ehci-vt8500, I
mostly only copied stuff from the PCI version and made it initialize
from the platform bus (nothing specific to vt8500).
Thanks,
Alexey
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 1/2] ARM: vt8500: Update vt8500-ehci driver to support device tree.
@ 2012-07-19 14:45 ` Alexey Charkov
0 siblings, 0 replies; 19+ messages in thread
From: Alexey Charkov @ 2012-07-19 14:45 UTC (permalink / raw)
To: linux-arm-kernel
2012/7/19 Tony Prisk <linux@prisktech.co.nz>:
> Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
> ---
> drivers/usb/host/ehci-vt8500.c | 9 +++++++++
> 1 files changed, 9 insertions(+), 0 deletions(-)
Have you tried to use ehci-platform on VIA/WMT devices? If it works
(which I would expect), I believe it's better to include OF support
into ehci-platform and drop ehci-vt8500 completely after existing
boards are converted to Device Tree. When writing ehci-vt8500, I
mostly only copied stuff from the PCI version and made it initialize
from the platform bus (nothing specific to vt8500).
Thanks,
Alexey
^ permalink raw reply [flat|nested] 19+ messages in thread
* RE: [PATCH 1/2] ARM: vt8500: Update vt8500-ehci driver to support device tree.
2012-07-19 14:45 ` Alexey Charkov
@ 2012-07-19 14:51 ` Tony Prisk
-1 siblings, 0 replies; 19+ messages in thread
From: Tony Prisk @ 2012-07-19 14:51 UTC (permalink / raw)
To: Alexey Charkov, vt8500-wm8505-linux-kernel-/JYPxA39Uh5TLH3MbocFFw
Cc: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
From: Alexey Charkov [alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org]
Sent: 20 July 2012 02:45
To: vt8500-wm8505-linux-kernel-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org
Cc: Arnd Bergmann; linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org; devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org; Tony Prisk
Subject: Re: [PATCH 1/2] ARM: vt8500: Update vt8500-ehci driver to support device tree.
2012/7/19 Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>:
> Signed-off-by: Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>
> ---
> drivers/usb/host/ehci-vt8500.c | 9 +++++++++
> 1 files changed, 9 insertions(+), 0 deletions(-)
Have you tried to use ehci-platform on VIA/WMT devices? If it works
(which I would expect), I believe it's better to include OF support
into ehci-platform and drop ehci-vt8500 completely after existing
boards are converted to Device Tree. When writing ehci-vt8500, I
mostly only copied stuff from the PCI version and made it initialize
from the platform bus (nothing specific to vt8500).
Thanks,
Alexey
-----
Alexey,
The biggest problem I have at the moment is that its very hard to test anything
as I only have a WM8650 which isn't supported in mainline.
I think I have a local copy of 'our' repo on my laptop - If I do, I'll try changing the
platform_device to use ehci_platform and see if it works.
Arnd,
There isn't any reason why it couldn't be uhci_of. I was simply trying to preserve
our existing platform support without having to introduce more patches for the
board files. The existing uhci-grlib is probably a better candidate though as I noticed
its been updated to support OF since I wrote this driver, and this driver is based off
that one.
Regards
Tony P
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 1/2] ARM: vt8500: Update vt8500-ehci driver to support device tree.
@ 2012-07-19 14:51 ` Tony Prisk
0 siblings, 0 replies; 19+ messages in thread
From: Tony Prisk @ 2012-07-19 14:51 UTC (permalink / raw)
To: linux-arm-kernel
From: Alexey Charkov [alchark at gmail.com]
Sent: 20 July 2012 02:45
To: vt8500-wm8505-linux-kernel at googlegroups.com
Cc: Arnd Bergmann; linux-arm-kernel at lists.infradead.org; devicetree-discuss at lists.ozlabs.org; Tony Prisk
Subject: Re: [PATCH 1/2] ARM: vt8500: Update vt8500-ehci driver to support device tree.
2012/7/19 Tony Prisk <linux@prisktech.co.nz>:
> Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
> ---
> drivers/usb/host/ehci-vt8500.c | 9 +++++++++
> 1 files changed, 9 insertions(+), 0 deletions(-)
Have you tried to use ehci-platform on VIA/WMT devices? If it works
(which I would expect), I believe it's better to include OF support
into ehci-platform and drop ehci-vt8500 completely after existing
boards are converted to Device Tree. When writing ehci-vt8500, I
mostly only copied stuff from the PCI version and made it initialize
from the platform bus (nothing specific to vt8500).
Thanks,
Alexey
-----
Alexey,
The biggest problem I have at the moment is that its very hard to test anything
as I only have a WM8650 which isn't supported in mainline.
I think I have a local copy of 'our' repo on my laptop - If I do, I'll try changing the
platform_device to use ehci_platform and see if it works.
Arnd,
There isn't any reason why it couldn't be uhci_of. I was simply trying to preserve
our existing platform support without having to introduce more patches for the
board files. The existing uhci-grlib is probably a better candidate though as I noticed
its been updated to support OF since I wrote this driver, and this driver is based off
that one.
Regards
Tony P
^ permalink raw reply [flat|nested] 19+ messages in thread
* RE: [PATCH 1/2] ARM: vt8500: Update vt8500-ehci driver to support device tree.
2012-07-19 14:45 ` Alexey Charkov
@ 2012-07-19 15:31 ` Tony Prisk
-1 siblings, 0 replies; 19+ messages in thread
From: Tony Prisk @ 2012-07-19 15:31 UTC (permalink / raw)
To: Alexey Charkov, vt8500-wm8505-linux-kernel-/JYPxA39Uh5TLH3MbocFFw
Cc: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
From: Alexey Charkov [alchark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org]
Sent: 20 July 2012 02:45
To: vt8500-wm8505-linux-kernel-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org
Cc: Arnd Bergmann; linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org; devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org; Tony Prisk
Subject: Re: [PATCH 1/2] ARM: vt8500: Update vt8500-ehci driver to support device tree.
2012/7/19 Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>:
> Signed-off-by: Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>
> ---
> drivers/usb/host/ehci-vt8500.c | 9 +++++++++
> 1 files changed, 9 insertions(+), 0 deletions(-)
Have you tried to use ehci-platform on VIA/WMT devices? If it works
(which I would expect), I believe it's better to include OF support
into ehci-platform and drop ehci-vt8500 completely after existing
boards are converted to Device Tree. When writing ehci-vt8500, I
mostly only copied stuff from the PCI version and made it initialize
from the platform bus (nothing specific to vt8500).
Thanks,
Alexey
-----
The ehci-platform device requires platform_data be passed at probe.
While its generic enought , it puts requirements on the device-tree to setup
the private data, which would be messy to get approved I suspect.
Regards
Tony P
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 1/2] ARM: vt8500: Update vt8500-ehci driver to support device tree.
@ 2012-07-19 15:31 ` Tony Prisk
0 siblings, 0 replies; 19+ messages in thread
From: Tony Prisk @ 2012-07-19 15:31 UTC (permalink / raw)
To: linux-arm-kernel
From: Alexey Charkov [alchark at gmail.com]
Sent: 20 July 2012 02:45
To: vt8500-wm8505-linux-kernel at googlegroups.com
Cc: Arnd Bergmann; linux-arm-kernel at lists.infradead.org; devicetree-discuss at lists.ozlabs.org; Tony Prisk
Subject: Re: [PATCH 1/2] ARM: vt8500: Update vt8500-ehci driver to support device tree.
2012/7/19 Tony Prisk <linux@prisktech.co.nz>:
> Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
> ---
> drivers/usb/host/ehci-vt8500.c | 9 +++++++++
> 1 files changed, 9 insertions(+), 0 deletions(-)
Have you tried to use ehci-platform on VIA/WMT devices? If it works
(which I would expect), I believe it's better to include OF support
into ehci-platform and drop ehci-vt8500 completely after existing
boards are converted to Device Tree. When writing ehci-vt8500, I
mostly only copied stuff from the PCI version and made it initialize
from the platform bus (nothing specific to vt8500).
Thanks,
Alexey
-----
The ehci-platform device requires platform_data be passed at probe.
While its generic enought , it puts requirements on the device-tree to setup
the private data, which would be messy to get approved I suspect.
Regards
Tony P
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 1/2] ARM: vt8500: Update vt8500-ehci driver to support device tree.
@ 2012-07-21 2:00 ` Tony Prisk
0 siblings, 0 replies; 19+ messages in thread
From: Tony Prisk @ 2012-07-21 2:00 UTC (permalink / raw)
To: linux-usb
Cc: Tony Prisk, VT8500 mailing list, Grant Likely, Rob Herring,
Rob Landley, Alan Stern, Greg Kroah-Hartman, Russell King,
Nicolas Pitre, Arnd Bergmann, Hauke Mehrtens, Felipe Balbi,
Neil Zhang, devicetree-discuss, linux-doc, linux-kernel,
linux-arm-kernel
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
---
.../devicetree/bindings/usb/vt8500-ehci.txt | 10 ++++++++++
drivers/usb/host/ehci-vt8500.c | 9 +++++++++
2 files changed, 19 insertions(+), 0 deletions(-)
create mode 100644 Documentation/devicetree/bindings/usb/vt8500-ehci.txt
diff --git a/Documentation/devicetree/bindings/usb/vt8500-ehci.txt b/Documentation/devicetree/bindings/usb/vt8500-ehci.txt
new file mode 100644
index 0000000..74f75c6
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/vt8500-ehci.txt
@@ -0,0 +1,10 @@
+VIA VT8500 and Wondermedia WM8xxx SoC USB controllers.
+
+Required properties:
+ - compatible: Should be "via,vt8500-ehci" or "wm,prizm-ehci".
+
+usb: ehci@D8007100 {
+ compatible = "wm,prizm-ehci", "usb-ehci";
+ reg = <0xD8007100 0x200>;
+ interrupts = <1>;
+};
diff --git a/drivers/usb/host/ehci-vt8500.c b/drivers/usb/host/ehci-vt8500.c
index c1eda73..4ba8f0c 100644
--- a/drivers/usb/host/ehci-vt8500.c
+++ b/drivers/usb/host/ehci-vt8500.c
@@ -16,6 +16,7 @@
*
*/
+#include <linux/of.h>
#include <linux/platform_device.h>
static int ehci_update_device(struct usb_hcd *hcd, struct usb_device *udev)
@@ -162,6 +163,12 @@ static int vt8500_ehci_drv_remove(struct platform_device *pdev)
return 0;
}
+static const struct of_device_id vt8500_ehci_ids[] = {
+ { .compatible = "via,vt8500-ehci", },
+ { .compatible = "wm,prizm-ehci", },
+ {}
+};
+
static struct platform_driver vt8500_ehci_driver = {
.probe = vt8500_ehci_drv_probe,
.remove = vt8500_ehci_drv_remove,
@@ -169,7 +176,9 @@ static struct platform_driver vt8500_ehci_driver = {
.driver = {
.name = "vt8500-ehci",
.owner = THIS_MODULE,
+ .of_match_table = of_match_ptr(vt8500_ehci_ids),
}
};
MODULE_ALIAS("platform:vt8500-ehci");
+MODULE_DEVICE_TABLE(of, vt8500_ehci_ids);
--
1.7.2.5
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 1/2] ARM: vt8500: Update vt8500-ehci driver to support device tree.
@ 2012-07-21 2:00 ` Tony Prisk
0 siblings, 0 replies; 19+ messages in thread
From: Tony Prisk @ 2012-07-21 2:00 UTC (permalink / raw)
To: linux-usb-u79uwXL29TY76Z2rM5mHXA
Cc: Nicolas Pitre, Russell King, linux-doc-u79uwXL29TY76Z2rM5mHXA,
Greg Kroah-Hartman, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Rob Herring, Alan Stern,
Felipe Balbi, Hauke Mehrtens, VT8500 mailing list, Neil Zhang,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
Signed-off-by: Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>
---
.../devicetree/bindings/usb/vt8500-ehci.txt | 10 ++++++++++
drivers/usb/host/ehci-vt8500.c | 9 +++++++++
2 files changed, 19 insertions(+), 0 deletions(-)
create mode 100644 Documentation/devicetree/bindings/usb/vt8500-ehci.txt
diff --git a/Documentation/devicetree/bindings/usb/vt8500-ehci.txt b/Documentation/devicetree/bindings/usb/vt8500-ehci.txt
new file mode 100644
index 0000000..74f75c6
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/vt8500-ehci.txt
@@ -0,0 +1,10 @@
+VIA VT8500 and Wondermedia WM8xxx SoC USB controllers.
+
+Required properties:
+ - compatible: Should be "via,vt8500-ehci" or "wm,prizm-ehci".
+
+usb: ehci@D8007100 {
+ compatible = "wm,prizm-ehci", "usb-ehci";
+ reg = <0xD8007100 0x200>;
+ interrupts = <1>;
+};
diff --git a/drivers/usb/host/ehci-vt8500.c b/drivers/usb/host/ehci-vt8500.c
index c1eda73..4ba8f0c 100644
--- a/drivers/usb/host/ehci-vt8500.c
+++ b/drivers/usb/host/ehci-vt8500.c
@@ -16,6 +16,7 @@
*
*/
+#include <linux/of.h>
#include <linux/platform_device.h>
static int ehci_update_device(struct usb_hcd *hcd, struct usb_device *udev)
@@ -162,6 +163,12 @@ static int vt8500_ehci_drv_remove(struct platform_device *pdev)
return 0;
}
+static const struct of_device_id vt8500_ehci_ids[] = {
+ { .compatible = "via,vt8500-ehci", },
+ { .compatible = "wm,prizm-ehci", },
+ {}
+};
+
static struct platform_driver vt8500_ehci_driver = {
.probe = vt8500_ehci_drv_probe,
.remove = vt8500_ehci_drv_remove,
@@ -169,7 +176,9 @@ static struct platform_driver vt8500_ehci_driver = {
.driver = {
.name = "vt8500-ehci",
.owner = THIS_MODULE,
+ .of_match_table = of_match_ptr(vt8500_ehci_ids),
}
};
MODULE_ALIAS("platform:vt8500-ehci");
+MODULE_DEVICE_TABLE(of, vt8500_ehci_ids);
--
1.7.2.5
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 1/2] ARM: vt8500: Update vt8500-ehci driver to support device tree.
@ 2012-07-21 2:00 ` Tony Prisk
0 siblings, 0 replies; 19+ messages in thread
From: Tony Prisk @ 2012-07-21 2:00 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
---
.../devicetree/bindings/usb/vt8500-ehci.txt | 10 ++++++++++
drivers/usb/host/ehci-vt8500.c | 9 +++++++++
2 files changed, 19 insertions(+), 0 deletions(-)
create mode 100644 Documentation/devicetree/bindings/usb/vt8500-ehci.txt
diff --git a/Documentation/devicetree/bindings/usb/vt8500-ehci.txt b/Documentation/devicetree/bindings/usb/vt8500-ehci.txt
new file mode 100644
index 0000000..74f75c6
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/vt8500-ehci.txt
@@ -0,0 +1,10 @@
+VIA VT8500 and Wondermedia WM8xxx SoC USB controllers.
+
+Required properties:
+ - compatible: Should be "via,vt8500-ehci" or "wm,prizm-ehci".
+
+usb: ehci at D8007100 {
+ compatible = "wm,prizm-ehci", "usb-ehci";
+ reg = <0xD8007100 0x200>;
+ interrupts = <1>;
+};
diff --git a/drivers/usb/host/ehci-vt8500.c b/drivers/usb/host/ehci-vt8500.c
index c1eda73..4ba8f0c 100644
--- a/drivers/usb/host/ehci-vt8500.c
+++ b/drivers/usb/host/ehci-vt8500.c
@@ -16,6 +16,7 @@
*
*/
+#include <linux/of.h>
#include <linux/platform_device.h>
static int ehci_update_device(struct usb_hcd *hcd, struct usb_device *udev)
@@ -162,6 +163,12 @@ static int vt8500_ehci_drv_remove(struct platform_device *pdev)
return 0;
}
+static const struct of_device_id vt8500_ehci_ids[] = {
+ { .compatible = "via,vt8500-ehci", },
+ { .compatible = "wm,prizm-ehci", },
+ {}
+};
+
static struct platform_driver vt8500_ehci_driver = {
.probe = vt8500_ehci_drv_probe,
.remove = vt8500_ehci_drv_remove,
@@ -169,7 +176,9 @@ static struct platform_driver vt8500_ehci_driver = {
.driver = {
.name = "vt8500-ehci",
.owner = THIS_MODULE,
+ .of_match_table = of_match_ptr(vt8500_ehci_ids),
}
};
MODULE_ALIAS("platform:vt8500-ehci");
+MODULE_DEVICE_TABLE(of, vt8500_ehci_ids);
--
1.7.2.5
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 1/2] ARM: vt8500: Update vt8500-ehci driver to support device tree.
@ 2012-07-19 16:07 ` Tony Prisk
0 siblings, 0 replies; 19+ messages in thread
From: Tony Prisk @ 2012-07-19 16:07 UTC (permalink / raw)
To: Arnd Bergmann, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
vt8500-wm8505-linux-kernel-/JYPxA39Uh5TLH3MbocFFw,
devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ
Signed-off-by: Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>
---
.../devicetree/bindings/usb/vt8500-ehci.txt | 12 ++++++++++++
drivers/usb/host/ehci-vt8500.c | 9 +++++++++
2 files changed, 21 insertions(+), 0 deletions(-)
create mode 100644 Documentation/devicetree/bindings/usb/vt8500-ehci.txt
diff --git a/Documentation/devicetree/bindings/usb/vt8500-ehci.txt b/Documentation/devicetree/bindings/usb/vt8500-ehci.txt
new file mode 100644
index 0000000..c14b38c
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/vt8500-ehci.txt
@@ -0,0 +1,12 @@
+VIA VT8500 and Wondermedia WM8xxx SoC USB controllers.
+
+EHCI
+
+Required properties:
+ - compatible: Should be "via,vt8500-ehci" or "wm,prizm-ehci".
+
+usb: ehci@D8007100 {
+ compatible = "wm,prizm-ehci", "usb-ehci";
+ reg = <0xD8007100 0x200>;
+ interrupts = <1>;
+};
diff --git a/drivers/usb/host/ehci-vt8500.c b/drivers/usb/host/ehci-vt8500.c
index c1eda73..4ba8f0c 100644
--- a/drivers/usb/host/ehci-vt8500.c
+++ b/drivers/usb/host/ehci-vt8500.c
@@ -16,6 +16,7 @@
*
*/
+#include <linux/of.h>
#include <linux/platform_device.h>
static int ehci_update_device(struct usb_hcd *hcd, struct usb_device *udev)
@@ -162,6 +163,12 @@ static int vt8500_ehci_drv_remove(struct platform_device *pdev)
return 0;
}
+static const struct of_device_id vt8500_ehci_ids[] = {
+ { .compatible = "via,vt8500-ehci", },
+ { .compatible = "wm,prizm-ehci", },
+ {}
+};
+
static struct platform_driver vt8500_ehci_driver = {
.probe = vt8500_ehci_drv_probe,
.remove = vt8500_ehci_drv_remove,
@@ -169,7 +176,9 @@ static struct platform_driver vt8500_ehci_driver = {
.driver = {
.name = "vt8500-ehci",
.owner = THIS_MODULE,
+ .of_match_table = of_match_ptr(vt8500_ehci_ids),
}
};
MODULE_ALIAS("platform:vt8500-ehci");
+MODULE_DEVICE_TABLE(of, vt8500_ehci_ids);
--
1.7.2.5
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 1/2] ARM: vt8500: Update vt8500-ehci driver to support device tree.
@ 2012-07-19 16:07 ` Tony Prisk
0 siblings, 0 replies; 19+ messages in thread
From: Tony Prisk @ 2012-07-19 16:07 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
---
.../devicetree/bindings/usb/vt8500-ehci.txt | 12 ++++++++++++
drivers/usb/host/ehci-vt8500.c | 9 +++++++++
2 files changed, 21 insertions(+), 0 deletions(-)
create mode 100644 Documentation/devicetree/bindings/usb/vt8500-ehci.txt
diff --git a/Documentation/devicetree/bindings/usb/vt8500-ehci.txt b/Documentation/devicetree/bindings/usb/vt8500-ehci.txt
new file mode 100644
index 0000000..c14b38c
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/vt8500-ehci.txt
@@ -0,0 +1,12 @@
+VIA VT8500 and Wondermedia WM8xxx SoC USB controllers.
+
+EHCI
+
+Required properties:
+ - compatible: Should be "via,vt8500-ehci" or "wm,prizm-ehci".
+
+usb: ehci at D8007100 {
+ compatible = "wm,prizm-ehci", "usb-ehci";
+ reg = <0xD8007100 0x200>;
+ interrupts = <1>;
+};
diff --git a/drivers/usb/host/ehci-vt8500.c b/drivers/usb/host/ehci-vt8500.c
index c1eda73..4ba8f0c 100644
--- a/drivers/usb/host/ehci-vt8500.c
+++ b/drivers/usb/host/ehci-vt8500.c
@@ -16,6 +16,7 @@
*
*/
+#include <linux/of.h>
#include <linux/platform_device.h>
static int ehci_update_device(struct usb_hcd *hcd, struct usb_device *udev)
@@ -162,6 +163,12 @@ static int vt8500_ehci_drv_remove(struct platform_device *pdev)
return 0;
}
+static const struct of_device_id vt8500_ehci_ids[] = {
+ { .compatible = "via,vt8500-ehci", },
+ { .compatible = "wm,prizm-ehci", },
+ {}
+};
+
static struct platform_driver vt8500_ehci_driver = {
.probe = vt8500_ehci_drv_probe,
.remove = vt8500_ehci_drv_remove,
@@ -169,7 +176,9 @@ static struct platform_driver vt8500_ehci_driver = {
.driver = {
.name = "vt8500-ehci",
.owner = THIS_MODULE,
+ .of_match_table = of_match_ptr(vt8500_ehci_ids),
}
};
MODULE_ALIAS("platform:vt8500-ehci");
+MODULE_DEVICE_TABLE(of, vt8500_ehci_ids);
--
1.7.2.5
^ permalink raw reply related [flat|nested] 19+ messages in thread
end of thread, other threads:[~2012-07-21 2:11 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-19 13:31 [PATCH 1/2] ARM: vt8500: Update vt8500-ehci driver to support device tree Tony Prisk
2012-07-19 13:31 ` Tony Prisk
[not found] ` <1342704684-4858-1-git-send-email-linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>
2012-07-19 13:31 ` [PATCH 2/2] ARM: vt8500: Add support for UHCI companion controller Tony Prisk
2012-07-19 13:31 ` Tony Prisk
[not found] ` <1342704684-4858-2-git-send-email-linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>
2012-07-19 14:27 ` Arnd Bergmann
2012-07-19 14:27 ` Arnd Bergmann
2012-07-19 14:23 ` [PATCH 1/2] ARM: vt8500: Update vt8500-ehci driver to support device tree Arnd Bergmann
2012-07-19 14:23 ` Arnd Bergmann
2012-07-19 14:45 ` Alexey Charkov
2012-07-19 14:45 ` Alexey Charkov
[not found] ` <CABjd4YxfynH5f0dTwOh3EpiNr2vLq_2yJqys=Ztm_XV2oY4nsw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-07-19 14:51 ` Tony Prisk
2012-07-19 14:51 ` Tony Prisk
2012-07-19 15:31 ` Tony Prisk
2012-07-19 15:31 ` Tony Prisk
2012-07-19 16:07 Tony Prisk
2012-07-19 16:07 ` Tony Prisk
2012-07-21 2:00 Tony Prisk
2012-07-21 2:00 ` Tony Prisk
2012-07-21 2:00 ` Tony Prisk
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.