* [PATCH] usb: dwc3: OCTEON: add support for device tree
@ 2016-09-08 3:11 Steven J. Hill
2016-09-08 7:54 ` Felipe Balbi
0 siblings, 1 reply; 2+ messages in thread
From: Steven J. Hill @ 2016-09-08 3:11 UTC (permalink / raw)
To: linux-usb; +Cc: linux-kernel, linux-mips, David Daney
This patch adds support to parse probe data for
the dwc3-octeon driver using device tree. The
DWC3 IP core is found on OCTEON III processors.
Signed-off-by: Steven J. Hill <Steven.Hill@cavium.com>
---
drivers/usb/dwc3/Kconfig | 10 +++++
drivers/usb/dwc3/Makefile | 1 +
drivers/usb/dwc3/dwc3-octeon.c | 96 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 107 insertions(+)
create mode 100644 drivers/usb/dwc3/dwc3-octeon.c
diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig
index a64ce1c..99db6008 100644
--- a/drivers/usb/dwc3/Kconfig
+++ b/drivers/usb/dwc3/Kconfig
@@ -105,4 +105,14 @@ config USB_DWC3_ST
inside (i.e. STiH407).
Say 'Y' or 'M' if you have one such device.
+config USB_DWC3_OCTEON
+ tristate "Cavium OCTEON III Platforms"
+ depends on CAVIUM_OCTEON_SOC
+ depends on OF
+ default USB_DWC3
+ help
+ Cavium OCTEON III SoCs with one DesignWare Core USB3 IP
+ inside (i.e. cn71xx and cn78xx).
+ Say 'Y' or 'M' if you have one such device.
+
endif
diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile
index 22420e1..f1a7a3e 100644
--- a/drivers/usb/dwc3/Makefile
+++ b/drivers/usb/dwc3/Makefile
@@ -39,3 +39,4 @@ obj-$(CONFIG_USB_DWC3_PCI) += dwc3-pci.o
obj-$(CONFIG_USB_DWC3_KEYSTONE) += dwc3-keystone.o
obj-$(CONFIG_USB_DWC3_OF_SIMPLE) += dwc3-of-simple.o
obj-$(CONFIG_USB_DWC3_ST) += dwc3-st.o
+obj-$(CONFIG_USB_DWC3_OCTEON) += dwc3-octeon.o
diff --git a/drivers/usb/dwc3/dwc3-octeon.c b/drivers/usb/dwc3/dwc3-octeon.c
new file mode 100644
index 0000000..4339dd6
--- /dev/null
+++ b/drivers/usb/dwc3/dwc3-octeon.c
@@ -0,0 +1,96 @@
+/**
+ * dwc3-octeon.c - Cavium OCTEON III DWC3 Specific Glue Layer
+ *
+ * Copyright (C) 2016 Cavium Networks
+ *
+ * Author: Steven J. Hill <steven.hill@cavium.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 of
+ * the License as published by the Free Software Foundation.
+ *
+ * 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.
+ *
+ * Inspired by dwc3-exynos.c and dwc3-st.c files.
+ */
+
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/of.h>
+#include <linux/dma-mapping.h>
+
+struct dwc3_octeon {
+ struct device *dev;
+ void __iomem *usbctl;
+ int index;
+};
+
+static int dwc3_octeon_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct resource *res;
+ struct dwc3_octeon *octeon;
+ int ret;
+
+ octeon = devm_kzalloc(dev, sizeof(*octeon), GFP_KERNEL);
+ if (!octeon)
+ return - ENOMEM;
+
+ /*
+ * Right now device-tree probed devices don't get dma_mask set.
+ * Since shared usb code relies on it, set it here for now.
+ */
+ ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(64));
+ if (ret)
+ return ret;
+
+ platform_set_drvdata(pdev, octeon);
+ octeon->dev = dev;
+
+ /* Resources for lower level OCTEON USB control. */
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ octeon->usbctl = devm_ioremap_resource(dev, res);
+ if (IS_ERR(octeon->usbctl))
+ return PTR_ERR(octeon->usbctl);
+
+ /* Controller index. */
+ octeon->index = ((u64)octeon->usbctl >> 24) & 1;
+
+ return 0;
+}
+
+static int dwc3_octeon_remove(struct platform_device *pdev)
+{
+ struct dwc3_octeon *octeon = platform_get_drvdata(pdev);
+
+ octeon->usbctl = NULL;
+ octeon->index = -1;
+
+ return 0;
+}
+
+static const struct of_device_id octeon_dwc3_match[] = {
+ { .compatible = "cavium,octeon-7130-usb-uctl", },
+ {},
+};
+MODULE_DEVICE_TABLE(of, octeon_dwc3_match);
+
+static struct platform_driver dwc3_octeon_driver = {
+ .probe = dwc3_octeon_probe,
+ .remove = dwc3_octeon_remove,
+ .driver = {
+ .name = "octeon-dwc3",
+ .of_match_table = octeon_dwc3_match,
+ .pm = NULL,
+ },
+};
+module_platform_driver(dwc3_octeon_driver);
+
+MODULE_ALIAS("platform:octeon-dwc3");
+MODULE_AUTHOR("Steven J. Hill <steven.hill@cavium.com");
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("DesignWare USB3 OCTEON Glue Layer");
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] usb: dwc3: OCTEON: add support for device tree
2016-09-08 3:11 [PATCH] usb: dwc3: OCTEON: add support for device tree Steven J. Hill
@ 2016-09-08 7:54 ` Felipe Balbi
0 siblings, 0 replies; 2+ messages in thread
From: Felipe Balbi @ 2016-09-08 7:54 UTC (permalink / raw)
To: Steven J. Hill, linux-usb; +Cc: linux-kernel, linux-mips, David Daney
[-- Attachment #1: Type: text/plain, Size: 2047 bytes --]
Hi Steven,
"Steven J. Hill" <steven.hill@cavium.com> writes:
> This patch adds support to parse probe data for
> the dwc3-octeon driver using device tree. The
> DWC3 IP core is found on OCTEON III processors.
>
> Signed-off-by: Steven J. Hill <Steven.Hill@cavium.com>
> ---
> drivers/usb/dwc3/Kconfig | 10 +++++
> drivers/usb/dwc3/Makefile | 1 +
> drivers/usb/dwc3/dwc3-octeon.c | 96 ++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 107 insertions(+)
> create mode 100644 drivers/usb/dwc3/dwc3-octeon.c
>
> diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig
> index a64ce1c..99db6008 100644
> --- a/drivers/usb/dwc3/Kconfig
> +++ b/drivers/usb/dwc3/Kconfig
> @@ -105,4 +105,14 @@ config USB_DWC3_ST
> inside (i.e. STiH407).
> Say 'Y' or 'M' if you have one such device.
>
> +config USB_DWC3_OCTEON
> + tristate "Cavium OCTEON III Platforms"
> + depends on CAVIUM_OCTEON_SOC
we really don't want SoC dependencies. At a minimum, you should have:
depends on CAVIUM_OCTEON_SOC || COMPILE_TEST
> +static int dwc3_octeon_probe(struct platform_device *pdev)
> +{
> + struct device *dev = &pdev->dev;
> + struct resource *res;
> + struct dwc3_octeon *octeon;
> + int ret;
> +
> + octeon = devm_kzalloc(dev, sizeof(*octeon), GFP_KERNEL);
> + if (!octeon)
> + return - ENOMEM;
> +
> + /*
> + * Right now device-tree probed devices don't get dma_mask set.
> + * Since shared usb code relies on it, set it here for now.
> + */
this doesn't look correct to me. Are you, perhaps, just missing
dma-ranges and dma-coherent properties?
> +static int dwc3_octeon_remove(struct platform_device *pdev)
> +{
> + struct dwc3_octeon *octeon = platform_get_drvdata(pdev);
> +
> + octeon->usbctl = NULL;
> + octeon->index = -1;
octeon is going to be freed when ->remove() gets executed. You really
don't need to do these. In fact, setting usbctl to NULL will break
iounmap(). It seems to be me you don't need a remove at all.
--
balbi
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 800 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-09-08 7:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-08 3:11 [PATCH] usb: dwc3: OCTEON: add support for device tree Steven J. Hill
2016-09-08 7:54 ` Felipe Balbi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).