[PATCH 0/3] usb: add CSR SiRFSoC usb controller and phy support

[PATCH 0/3] usb: add CSR SiRFSoC usb controller and phy support

[Barry Song]

This patchset adds CSR SiRFSoC usb controller and phy support.
For USB controller, CSR licensed chipidea IP core.

Rong Wang (3):
  usb: chipidea: add CSR SiRFSoC ci13xxx usb driver
  usb: phy: add driver for CSR SiRFSoC internal phy
  arm/dts: atlas6: fix the stuff of USB controller and phy

 arch/arm/boot/dts/atlas6.dtsi       |   18 ++--
 drivers/usb/Kconfig                 |    1 +
 drivers/usb/chipidea/Kconfig        |   25 ++++
 drivers/usb/chipidea/Makefile       |    5 +-
 drivers/usb/chipidea/ci13xxx_sirf.c |  223 +++++++++++++++++++++++++++++++++++
 drivers/usb/phy/Kconfig             |   10 ++
 drivers/usb/phy/Makefile            |    1 +
 drivers/usb/phy/phy-sirf-usb.c      |  198 +++++++++++++++++++++++++++++++
 8 files changed, 471 insertions(+), 10 deletions(-)
 create mode 100644 drivers/usb/chipidea/ci13xxx_sirf.c
 create mode 100644 drivers/usb/phy/phy-sirf-usb.c

-- 
1.7.5.4

[PATCH 1/3] usb: chipidea: add CSR SiRFSoC ci13xxx usb driver

[Barry Song]

From: Rong Wang <Rong.Wang@csr.com>

CSR SiRF SoCs licensed chipidea ci13xxx USB IP, this patch
makes the chipidea drivers support CSR SiRF SoCS.

It also changes the Kconfig, only compile MSM and IMX if related
drivers are enabled. Otherwise, we always need to enable all
clients of chipidea drivers.

Cc: Marek Vasut <marex@denx.de>
Cc: Richard Zhao <richard.zhao@freescale.com>
Signed-off-by: Rong Wang <Rong.Wang@csr.com>
Signed-off-by: Barry Song <Baohua.Song@csr.com>
---
 drivers/usb/Kconfig                 |    1 +
 drivers/usb/chipidea/Kconfig        |   25 ++++
 drivers/usb/chipidea/Makefile       |    5 +-
 drivers/usb/chipidea/ci13xxx_sirf.c |  223 +++++++++++++++++++++++++++++++++++
 4 files changed, 252 insertions(+), 2 deletions(-)
 create mode 100644 drivers/usb/chipidea/ci13xxx_sirf.c

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 92e1dc9..9cbe1e0 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -49,6 +49,7 @@ config USB_ARCH_HAS_EHCI
 	default y if ARCH_MMP
 	default y if MACH_LOONGSON1
 	default y if PLAT_ORION
+	default y if ARCH_SIRF
 	default PCI
 
 # some non-PCI HCDs implement xHCI
diff --git a/drivers/usb/chipidea/Kconfig b/drivers/usb/chipidea/Kconfig
index b2df442..847b9f7 100644
--- a/drivers/usb/chipidea/Kconfig
+++ b/drivers/usb/chipidea/Kconfig
@@ -31,4 +31,29 @@ config USB_CHIPIDEA_DEBUG
 	help
 	  Say Y here to enable debugging output of the ChipIdea driver.
 
+if USB_CHIPIDEA_UDC && USB_CHIPIDEA_HOST
+
+config USB_CHIPIDEA_SIRF
+	depends on ARCH_SIRF
+	bool "SiRF USB controller ChipIdea driver binding"
+	default y
+	help
+	  Say Y here to enable sirf usb ChipIdea driver binding.
+
+config USB_CHIPIDEA_MSM
+	depends on ARCH_MSM
+	bool "MSM USB controller ChipIdea driver binding"
+	default y
+	help
+	  Say Y here to enable msm usb ChipIdea driver binding.
+
+config USB_CHIPIDEA_IMX
+	depends on ARCH_MXC || ARCH_MXS
+	bool "i.MX USB controller ChipIdea driver binding"
+	default y
+	help
+	  Say Y here to enable imx usb ChipIdea driver binding.
+
+endif
+
 endif
diff --git a/drivers/usb/chipidea/Makefile b/drivers/usb/chipidea/Makefile
index 4ab83e9..7004fde 100644
--- a/drivers/usb/chipidea/Makefile
+++ b/drivers/usb/chipidea/Makefile
@@ -9,7 +9,7 @@ ci_hdrc-$(CONFIG_USB_CHIPIDEA_DEBUG)	+= debug.o
 
 # Glue/Bridge layers go here
 
-obj-$(CONFIG_USB_CHIPIDEA)	+= ci13xxx_msm.o
+obj-$(CONFIG_USB_CHIPIDEA_MSM)	+= ci13xxx_msm.o
 
 # PCI doesn't provide stubs, need to check
 ifneq ($(CONFIG_PCI),)
@@ -17,5 +17,6 @@ ifneq ($(CONFIG_PCI),)
 endif
 
 ifneq ($(CONFIG_OF_DEVICE),)
-	obj-$(CONFIG_USB_CHIPIDEA)	+= ci13xxx_imx.o usbmisc_imx.o
+	obj-$(CONFIG_USB_CHIPIDEA_IMX)	+= ci13xxx_imx.o usbmisc_imx.o
+	obj-$(CONFIG_USB_CHIPIDEA_SIRF)	+= ci13xxx_sirf.o
 endif
diff --git a/drivers/usb/chipidea/ci13xxx_sirf.c b/drivers/usb/chipidea/ci13xxx_sirf.c
new file mode 100644
index 0000000..1d84a2f
--- /dev/null
+++ b/drivers/usb/chipidea/ci13xxx_sirf.c
@@ -0,0 +1,223 @@
+/*
+ * USB Controller Driver for CSR SiRF SoC
+ *
+ * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company.
+ * Rong Wang<Rong.Wang@csr.com>
+ *
+ * Licensed under GPLv2 or later.
+ */
+#include <linux/module.h>
+#include <linux/io.h>
+#include <linux/bitops.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
+#include <linux/of_address.h>
+#include <linux/of_platform.h>
+#include <linux/clk.h>
+#include <linux/dma-mapping.h>
+#include <linux/delay.h>
+#include <linux/reset.h>
+
+#include <linux/usb/chipidea.h>
+#include "ci.h"
+
+#define RSC_USB_UART_SHARE	0x0
+#define USB1_MODE_SEL		BIT(2)
+#define pdev_to_phy(pdev)	((struct usb_phy *)platform_get_drvdata(pdev))
+
+static int sirfsoc_vbus_gpio;
+
+struct ci13xxx_sirf_data {
+	struct platform_device	*ci_pdev;
+	struct clk		*clk;
+};
+
+static inline int ci13xxx_sirf_drive_vbus(int value)
+{
+	return gpio_direction_output(sirfsoc_vbus_gpio, value ? 0 : 1);
+}
+
+static void ci13xxx_sirf_notify_event(struct ci13xxx *ci, unsigned event)
+{
+	switch (event) {
+	case CI13XXX_CONTROLLER_RESET_EVENT:
+		ci13xxx_sirf_drive_vbus(1);
+		break;
+	case CI13XXX_CONTROLLER_STOPPED_EVENT:
+		ci13xxx_sirf_drive_vbus(0);
+		break;
+	default:
+		dev_info(ci->dev, "Unknown Event\n");
+		break;
+	}
+}
+
+static struct ci13xxx_platform_data ci13xxx_sirf_platdata = {
+	.name			= "ci13xxx_sirf",
+	.flags			= CI13XXX_DISABLE_STREAMING,
+	.capoffset		= DEF_CAPOFFSET,
+	.notify_event		= ci13xxx_sirf_notify_event,
+};
+
+static struct of_device_id rsc_ids[] = {
+	{ .compatible = "sirf,prima2-rsc", },
+	{ /* sentinel */ }
+};
+
+static int ci13xxx_sirf_probe(struct platform_device *pdev)
+{
+	struct platform_device *plat_ci, *phy_pdev;
+	struct device_node *rsc_np, *phy_np;
+	struct ci13xxx_sirf_data *data;
+	struct usb_phy *phy;
+	void __iomem *rsc_vbase;
+	int ret;
+
+	data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
+	if (!data) {
+		dev_err(&pdev->dev, "Failed to allocate ci13xxx_sirf_data!\n");
+		return -ENOMEM;
+	}
+
+	/* 1. set usb controller clock */
+	data->clk = devm_clk_get(&pdev->dev, NULL);
+	if (IS_ERR(data->clk)) {
+		dev_err(&pdev->dev,
+			"Failed to get clock, err=%ld\n", PTR_ERR(data->clk));
+		return PTR_ERR(data->clk);
+	}
+	ret = clk_prepare_enable(data->clk);
+	if (ret) {
+		dev_err(&pdev->dev,
+			"Failed to prepare or enable clock, err=%d\n", ret);
+		return ret;
+	}
+
+	/* 2. software reset */
+	ret = device_reset(&pdev->dev);
+	if (ret)
+		dev_info(&pdev->dev,
+			"Failed to reset device, err=%d\n", ret);
+
+	/* 3. vbus configuration */
+	sirfsoc_vbus_gpio = of_get_named_gpio(pdev->dev.of_node,
+							"vbus-gpios", 0);
+	if (sirfsoc_vbus_gpio < 0) {
+		dev_err(&pdev->dev, "Can't get vbus gpio from DT\n");
+		ret = -ENODEV;
+		goto err;
+	}
+	ret = gpio_request(sirfsoc_vbus_gpio, "ci13xxx_sirf");
+	if (ret) {
+		dev_err(&pdev->dev, "Failed to get gpio control\n");
+		goto err;
+	}
+
+	/* 4. rsc control */
+	rsc_np = of_find_matching_node(NULL, rsc_ids);
+	if (!rsc_np) {
+		dev_err(&pdev->dev, "Failed to get rsc device node\n");
+		ret = -ENODEV;
+		goto err;
+	}
+	rsc_vbase = of_iomap(rsc_np, 0);
+	if (!rsc_vbase) {
+		dev_err(&pdev->dev, "Failed to iomap rsc memory\n");
+		ret = -ENOMEM;
+		goto err;
+	}
+	writel(readl(rsc_vbase + RSC_USB_UART_SHARE) | USB1_MODE_SEL,
+					rsc_vbase + RSC_USB_UART_SHARE);
+
+	/* 5. set device dma mask */
+	if (!pdev->dev.dma_mask) {
+		pdev->dev.dma_mask = devm_kzalloc(&pdev->dev,
+				      sizeof(*pdev->dev.dma_mask), GFP_KERNEL);
+		if (!pdev->dev.dma_mask) {
+			dev_err(&pdev->dev, "Failed to alloc dma_mask!\n");
+			ret = -ENOMEM;
+			goto err;
+		}
+		*pdev->dev.dma_mask = DMA_BIT_MASK(32);
+		dma_set_coherent_mask(&pdev->dev, *pdev->dev.dma_mask);
+	}
+
+	/* 6. get phy for controller */
+	phy_np = of_parse_phandle(pdev->dev.of_node, "sirf,ci13xxx-usbphy", 0);
+	if (!phy_np) {
+		dev_err(&pdev->dev, "Failed to get phy device node\n");
+		ret = -ENODEV;
+		goto err;
+	}
+	phy_pdev = of_find_device_by_node(phy_np);
+	if (!phy_pdev) {
+		dev_err(&pdev->dev, "Failed to get phy platform device\n");
+		ret = -ENODEV;
+		goto err;
+	}
+	phy = pdev_to_phy(phy_pdev);
+	if (!phy || !try_module_get(phy_pdev->dev.driver->owner)) {
+		dev_err(&pdev->dev, "Failed to get phy control\n");
+		ret = -ENODEV;
+		goto err;
+	}
+	usb_phy_init(phy);
+	ci13xxx_sirf_platdata.phy = phy;
+
+	/* 7. register to ci13xxx core */
+	plat_ci = ci13xxx_add_device(&pdev->dev,
+				pdev->resource, pdev->num_resources,
+				&ci13xxx_sirf_platdata);
+	if (IS_ERR(plat_ci)) {
+		dev_err(&pdev->dev, "ci13xxx_add_device failed!\n");
+		return PTR_ERR(plat_ci);
+	}
+
+	platform_set_drvdata(pdev, plat_ci);
+
+	pm_runtime_no_callbacks(&pdev->dev);
+	pm_runtime_enable(&pdev->dev);
+
+	dev_info(&pdev->dev, "Ready\n");
+	return 0;
+
+err:
+	clk_disable_unprepare(data->clk);
+	return ret;
+}
+
+static int ci13xxx_sirf_remove(struct platform_device *pdev)
+{
+	struct ci13xxx_sirf_data *data = platform_get_drvdata(pdev);
+
+	pm_runtime_disable(&pdev->dev);
+	ci13xxx_remove_device(data->ci_pdev);
+
+	clk_disable_unprepare(data->clk);
+
+	return 0;
+}
+
+static const struct of_device_id ci13xxx_sirf_dt_ids[] = {
+	{ .compatible = "sirf,ci13xxx-usbcontroller", },
+	{ /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, ci13xxx_sirf_dt_ids);
+
+static struct platform_driver ci13xxx_sirf_driver = {
+	.probe = ci13xxx_sirf_probe,
+	.remove = ci13xxx_sirf_remove,
+	.driver = {
+		.name = "sirf-usbcontroller",
+		.owner = THIS_MODULE,
+		.of_match_table = ci13xxx_sirf_dt_ids,
+	 },
+};
+module_platform_driver(ci13xxx_sirf_driver);
+
+MODULE_ALIAS("platform:sirf-ci13xxx-usbcontroller");
+MODULE_AUTHOR("Rong Wang <Rong.Wang@csr.com>");
+MODULE_DESCRIPTION("CI13XXX SiRF USB Binding");
+MODULE_LICENSE("GPL v2");
-- 
1.7.5.4

[PATCH 2/3] usb: phy: add driver for CSR SiRFSoC internal phy

[Barry Song]

From: Rong Wang <Rong.Wang@csr.com>

This patch adds a driver for CSR SiRFSoC internal phy support
for USB Controller 1.

Signed-off-by: Rong Wang <Rong.Wang@csr.com>
Signed-off-by: Barry Song <Baohua.Song@csr.com>
---
 drivers/usb/phy/Kconfig        |   10 ++
 drivers/usb/phy/Makefile       |    1 +
 drivers/usb/phy/phy-sirf-usb.c |  198 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 209 insertions(+), 0 deletions(-)
 create mode 100644 drivers/usb/phy/phy-sirf-usb.c

diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig
index 7ef3eb8..ea30195 100644
--- a/drivers/usb/phy/Kconfig
+++ b/drivers/usb/phy/Kconfig
@@ -179,6 +179,16 @@ config USB_MXS_PHY
 
 	  MXS Phy is used by some of the i.MX SoCs, for example imx23/28/6x.
 
+config USB_SIRF_PHY
+	tristate "SiRF USB PHY support"
+	depends on ARCH_SIRF
+	help
+	  Say Y here if you want to build SiRF USB OTG transciever
+	  driver in kernel (including Prima and Atlas series). This driver
+	  implements role switch between EHCI host driver and gadget driver.
+
+	  To compile this driver as a module, choose M here.
+
 config USB_RCAR_PHY
 	tristate "Renesas R-Car USB phy support"
 	depends on USB || USB_GADGET
diff --git a/drivers/usb/phy/Makefile b/drivers/usb/phy/Makefile
index a9169cb..6caa29c 100644
--- a/drivers/usb/phy/Makefile
+++ b/drivers/usb/phy/Makefile
@@ -28,6 +28,7 @@ obj-$(CONFIG_USB_ISP1301)		+= phy-isp1301.o
 obj-$(CONFIG_USB_MSM_OTG)		+= phy-msm-usb.o
 obj-$(CONFIG_USB_MV_OTG)		+= phy-mv-usb.o
 obj-$(CONFIG_USB_MXS_PHY)		+= phy-mxs-usb.o
+obj-$(CONFIG_USB_SIRF_PHY)		+= phy-sirf-usb.o
 obj-$(CONFIG_USB_RCAR_PHY)		+= phy-rcar-usb.o
 obj-$(CONFIG_USB_ULPI)			+= phy-ulpi.o
 obj-$(CONFIG_USB_ULPI_VIEWPORT)		+= phy-ulpi-viewport.o
diff --git a/drivers/usb/phy/phy-sirf-usb.c b/drivers/usb/phy/phy-sirf-usb.c
new file mode 100644
index 0000000..708f40c
--- /dev/null
+++ b/drivers/usb/phy/phy-sirf-usb.c
@@ -0,0 +1,198 @@
+/*
+ * USB PHY Driver for CSR SiRF SoC
+ *
+ * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company.
+ * Rong Wang<Rong.Wang@csr.com>
+ *
+ * Licensed under GPLv2 or later.
+ */
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/clk.h>
+#include <linux/usb/otg.h>
+#include <linux/stmp_device.h>
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/io.h>
+
+struct sirf_phy {
+	struct usb_phy		phy;
+	struct clk		*clk;
+};
+
+#define DRIVER_NAME	"sirf-usbphy"
+#define to_sirf_phy(p)	container_of((p), struct sirf_phy, phy)
+#define USBPHY_POR	BIT(27)
+
+static inline void sirf_phy_por(void __iomem *base)
+{
+	writel(readl(base) | USBPHY_POR, base);
+	udelay(15);
+	writel(readl(base) & ~USBPHY_POR, base);
+}
+
+static int sirf_phy_init(struct usb_phy *phy)
+{
+	struct sirf_phy *sirf_phy = to_sirf_phy(phy);
+
+	clk_prepare_enable(sirf_phy->clk);
+	sirf_phy_por(phy->io_priv);
+
+	return 0;
+}
+
+static void sirf_phy_shutdown(struct usb_phy *phy)
+{
+	struct sirf_phy *sirf_phy = to_sirf_phy(phy);
+	clk_disable_unprepare(sirf_phy->clk);
+}
+
+static int sirf_phy_suspend(struct usb_phy *phy, int suspend)
+{
+	return 0;
+}
+
+static int sirf_phy_on_connect(struct usb_phy *phy,
+		enum usb_device_speed speed)
+{
+	return 0;
+}
+
+static int sirf_phy_on_disconnect(struct usb_phy *phy,
+		enum usb_device_speed speed)
+{
+	return 0;
+}
+
+static int
+sirf_phy_set_peripheral(struct usb_otg *otg, struct usb_gadget *gadget)
+{
+	dev_info(otg->phy->dev, "set_peripheral\n");
+	if (!otg)
+		return -ENODEV;
+
+	if (!gadget) {
+		otg->gadget = NULL;
+		return -ENODEV;
+	}
+
+	otg->gadget = gadget;
+	otg->phy->state = OTG_STATE_B_IDLE;
+	return 0;
+}
+
+static int sirf_phy_set_host(struct usb_otg *otg, struct usb_bus *host)
+{
+	dev_info(otg->phy->dev, "set_host\n");
+	if (!otg)
+		return -ENODEV;
+
+	if (!host) {
+		otg->host = NULL;
+		return -ENODEV;
+	}
+
+	otg->host = host;
+	return 0;
+}
+
+static int sirf_phy_probe(struct platform_device *pdev)
+{
+	struct resource *res;
+	void __iomem *base;
+	struct clk *clk;
+	struct sirf_phy *sirf_phy;
+	int ret;
+
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	base = devm_ioremap_resource(&pdev->dev, res);
+	if (IS_ERR(base))
+		return PTR_ERR(base);
+
+	clk = devm_clk_get(&pdev->dev, NULL);
+	if (IS_ERR(clk)) {
+		dev_err(&pdev->dev,
+			"Can't get the clock, err=%ld", PTR_ERR(clk));
+		return PTR_ERR(clk);
+	}
+
+	sirf_phy = devm_kzalloc(&pdev->dev, sizeof(*sirf_phy), GFP_KERNEL);
+	if (!sirf_phy) {
+		dev_err(&pdev->dev, "Failed to allocate USB PHY structure!\n");
+		return -ENOMEM;
+	}
+
+	sirf_phy->phy.otg = devm_kzalloc(&pdev->dev,
+				sizeof(*sirf_phy->phy.otg), GFP_KERNEL);
+	if (!sirf_phy->phy.otg) {
+		dev_err(&pdev->dev, "Failed to allocate USB OTG structure!\n");
+		return -ENOMEM;
+	}
+
+	sirf_phy->phy.io_priv		= base;
+	sirf_phy->phy.dev		= &pdev->dev;
+	sirf_phy->phy.label		= DRIVER_NAME;
+	sirf_phy->phy.init		= sirf_phy_init;
+	sirf_phy->phy.shutdown		= sirf_phy_shutdown;
+	sirf_phy->phy.set_suspend	= sirf_phy_suspend;
+	sirf_phy->phy.notify_connect	= sirf_phy_on_connect;
+	sirf_phy->phy.notify_disconnect	= sirf_phy_on_disconnect;
+
+	sirf_phy->phy.otg->phy			= &sirf_phy->phy;
+	sirf_phy->phy.otg->set_host		= sirf_phy_set_host;
+	sirf_phy->phy.otg->set_peripheral	= sirf_phy_set_peripheral;
+
+	ATOMIC_INIT_NOTIFIER_HEAD(&sirf_phy->phy.notifier);
+
+	sirf_phy->clk = clk;
+
+	platform_set_drvdata(pdev, &sirf_phy->phy);
+
+	ret = usb_add_phy_dev(&sirf_phy->phy);
+	if (ret)
+		return ret;
+	dev_info(&pdev->dev, "Ready\n");
+	return 0;
+}
+
+static int sirf_phy_remove(struct platform_device *pdev)
+{
+	struct sirf_phy *sirf_phy = platform_get_drvdata(pdev);
+
+	usb_remove_phy(&sirf_phy->phy);
+	return 0;
+}
+
+static const struct of_device_id sirf_phy_dt_ids[] = {
+	{ .compatible = "sirf,ci13xxx-usbphy", },
+	{ /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, sirf_phy_dt_ids);
+
+static struct platform_driver sirf_phy_driver = {
+	.probe = sirf_phy_probe,
+	.remove = sirf_phy_remove,
+	.driver = {
+		.name = DRIVER_NAME,
+		.owner = THIS_MODULE,
+		.of_match_table = sirf_phy_dt_ids,
+	 },
+};
+
+static int __init sirf_phy_module_init(void)
+{
+	return platform_driver_register(&sirf_phy_driver);
+}
+postcore_initcall(sirf_phy_module_init);
+
+static void __exit sirf_phy_module_exit(void)
+{
+	platform_driver_unregister(&sirf_phy_driver);
+}
+module_exit(sirf_phy_module_exit);
+
+MODULE_ALIAS("platform:sirf-ci13xxx-usbphy");
+MODULE_AUTHOR("Rong Wang <Rong.Wang@csr.com>");
+MODULE_DESCRIPTION("SiRF CI13XXX USB PHY driver");
+MODULE_LICENSE("GPL v2");
-- 
1.7.5.4

[PATCH 3/3] arm/dts: atlas6: fix the stuff of USB controller and phy

[Barry Song]

From: Rong Wang <Rong.Wang@csr.com>

this patch fixes the USB stuff in atlas6.dtsi, and matches with
sirfsoc usb controller and phy drivers to work.

Signed-off-by: Rong Wang <Rong.Wang@csr.com>
Signed-off-by: Barry Song <Baohua.Song@csr.com>
---
 arch/arm/boot/dts/atlas6.dtsi |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/arch/arm/boot/dts/atlas6.dtsi b/arch/arm/boot/dts/atlas6.dtsi
index 7d1a279..a84b760 100644
--- a/arch/arm/boot/dts/atlas6.dtsi
+++ b/arch/arm/boot/dts/atlas6.dtsi
@@ -643,18 +643,20 @@
 			#size-cells = <1>;
 			ranges = <0xb8000000 0xb8000000 0x40000>;
 
-			usb0: usb at b00e0000 {
-				compatible = "chipidea,ci13611a-prima2";
-				reg = <0xb8000000 0x10000>;
-				interrupts = <10>;
-				clocks = <&clks 40>;
+			usbphy: usbphy at b8010200 {
+				compatible = "sirf,ci13xxx-usbphy";
+				reg = <0xb8010200 0x100>;
+				clocks = <&clks 39>;
 			};
 
-			usb1: usb at b00f0000 {
-				compatible = "chipidea,ci13611a-prima2";
-				reg = <0xb8010000 0x10000>;
+			usbcontroller: usbcontroller at b8010000 {
+				compatible = "sirf,ci13xxx-usbcontroller";
+				reg = <0xb8010000 0x200>;
 				interrupts = <11>;
 				clocks = <&clks 41>;
+				resets = <&rstc 9>;
+				vbus-gpios = <&gpio 0 14>;
+				sirf,ci13xxx-usbphy = <&usbphy>;
 			};
 
 			security at b00f0000 {
-- 
1.7.5.4

[PATCH 1/3] usb: chipidea: add CSR SiRFSoC ci13xxx usb driver

[Arnd Bergmann]

On Sunday 09 June 2013 11:25:36 Barry Song wrote:
> From: Rong Wang <Rong.Wang@csr.com>
> 
> CSR SiRF SoCs licensed chipidea ci13xxx USB IP, this patch
> makes the chipidea drivers support CSR SiRF SoCS.
> 
> It also changes the Kconfig, only compile MSM and IMX if related
> drivers are enabled. Otherwise, we always need to enable all
> clients of chipidea drivers.

Can't you use the same driver as for imx and make it more generic?
I don't actually see anything in here that is really specific to SiRF
and most of the code is the same as for imx.

If there are bits that are truly SiRF specific, at least that can
be a much smaller part I think.

> +#define RSC_USB_UART_SHARE	0x0
> +#define USB1_MODE_SEL		BIT(2)
> +#define pdev_to_phy(pdev)	((struct usb_phy *)platform_get_drvdata(pdev))
> +
> +static int sirfsoc_vbus_gpio;

What do you need static data for? This seems like a bad idea because it
makes it impossible to support multiple such devices.

> +struct ci13xxx_sirf_data {
> +	struct platform_device	*ci_pdev;
> +	struct clk		*clk;
> +};
> +
> +static inline int ci13xxx_sirf_drive_vbus(int value)
> +{
> +	return gpio_direction_output(sirfsoc_vbus_gpio, value ? 0 : 1);
> +}
> +
> +static void ci13xxx_sirf_notify_event(struct ci13xxx *ci, unsigned event)
> +{
> +	switch (event) {
> +	case CI13XXX_CONTROLLER_RESET_EVENT:
> +		ci13xxx_sirf_drive_vbus(1);
> +		break;
> +	case CI13XXX_CONTROLLER_STOPPED_EVENT:
> +		ci13xxx_sirf_drive_vbus(0);
> +		break;
> +	default:
> +		dev_info(ci->dev, "Unknown Event\n");
> +		break;
> +	}
> +}
> +
> +static struct ci13xxx_platform_data ci13xxx_sirf_platdata = {
> +	.name			= "ci13xxx_sirf",
> +	.flags			= CI13XXX_DISABLE_STREAMING,
> +	.capoffset		= DEF_CAPOFFSET,
> +	.notify_event		= ci13xxx_sirf_notify_event,
> +};
> +
> +static struct of_device_id rsc_ids[] = {
> +	{ .compatible = "sirf,prima2-rsc", },
> +	{ /* sentinel */ }
> +};

This is the reset controller, right? You already use the reset API
below, why do you need to open-code the gpio

> +static int ci13xxx_sirf_probe(struct platform_device *pdev)
> +{
> +	struct platform_device *plat_ci, *phy_pdev;
> +	struct device_node *rsc_np, *phy_np;
> +	struct ci13xxx_sirf_data *data;
> +	struct usb_phy *phy;
> +	void __iomem *rsc_vbase;
> +	int ret;
> +
> +	data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
> +	if (!data) {
> +		dev_err(&pdev->dev, "Failed to allocate ci13xxx_sirf_data!\n");
> +		return -ENOMEM;
> +	}
> +
> +	/* 1. set usb controller clock */
> +	data->clk = devm_clk_get(&pdev->dev, NULL);
> +	if (IS_ERR(data->clk)) {
> +		dev_err(&pdev->dev,
> +			"Failed to get clock, err=%ld\n", PTR_ERR(data->clk));
> +		return PTR_ERR(data->clk);
> +	}
> +	ret = clk_prepare_enable(data->clk);
> +	if (ret) {
> +		dev_err(&pdev->dev,
> +			"Failed to prepare or enable clock, err=%d\n", ret);
> +		return ret;
> +	}
> +
> +	/* 2. software reset */
> +	ret = device_reset(&pdev->dev);
> +	if (ret)
> +		dev_info(&pdev->dev,
> +			"Failed to reset device, err=%d\n", ret);
> +
> +	/* 3. vbus configuration */
> +	sirfsoc_vbus_gpio = of_get_named_gpio(pdev->dev.of_node,
> +							"vbus-gpios", 0);
> +	if (sirfsoc_vbus_gpio < 0) {
> +		dev_err(&pdev->dev, "Can't get vbus gpio from DT\n");
> +		ret = -ENODEV;
> +		goto err;
> +	}
> +	ret = gpio_request(sirfsoc_vbus_gpio, "ci13xxx_sirf");
> +	if (ret) {
> +		dev_err(&pdev->dev, "Failed to get gpio control\n");
> +		goto err;
> +	}
> +

This seems totally generic so far, better put it into a common file.

> +	/* 4. rsc control */
> +	rsc_np = of_find_matching_node(NULL, rsc_ids);
> +	if (!rsc_np) {
> +		dev_err(&pdev->dev, "Failed to get rsc device node\n");
> +		ret = -ENODEV;
> +		goto err;
> +	}
> +	rsc_vbase = of_iomap(rsc_np, 0);
> +	if (!rsc_vbase) {
> +		dev_err(&pdev->dev, "Failed to iomap rsc memory\n");
> +		ret = -ENOMEM;
> +		goto err;
> +	}
> +	writel(readl(rsc_vbase + RSC_USB_UART_SHARE) | USB1_MODE_SEL,
> +					rsc_vbase + RSC_USB_UART_SHARE);

And this seems out of place.

> +	/* 6. get phy for controller */
> +	phy_np = of_parse_phandle(pdev->dev.of_node, "sirf,ci13xxx-usbphy", 0);
> +	if (!phy_np) {
> +		dev_err(&pdev->dev, "Failed to get phy device node\n");
> +		ret = -ENODEV;
> +		goto err;
> +	}

I think "sirf,ci13xxx-usbphy" is a particularly bad identifier for the
phy here. Please have a look at the generic phy binding that is being
proposed.

> +static const struct of_device_id ci13xxx_sirf_dt_ids[] = {
> +	{ .compatible = "sirf,ci13xxx-usbcontroller", },
> +	{ /* sentinel */ }
> +};
> +MODULE_DEVICE_TABLE(of, ci13xxx_sirf_dt_ids);

Please take the 'xxx' strings out of the 'compatible' string and use
the specific device you are doing this for. If there are multiple
ones, you can either list all of them or ensure they are all marked
as compatible with the original design.

	Arnd

[PATCH 1/3] usb: chipidea: add CSR SiRFSoC ci13xxx usb driver

[Barry Song]

Hi Arnd,

2013/6/9 Arnd Bergmann <arnd@arndb.de>:
> On Sunday 09 June 2013 11:25:36 Barry Song wrote:
>> From: Rong Wang <Rong.Wang@csr.com>
>>
>> CSR SiRF SoCs licensed chipidea ci13xxx USB IP, this patch
>> makes the chipidea drivers support CSR SiRF SoCS.
>>
>> It also changes the Kconfig, only compile MSM and IMX if related
>> drivers are enabled. Otherwise, we always need to enable all
>> clients of chipidea drivers.
>
> Can't you use the same driver as for imx and make it more generic?
> I don't actually see anything in here that is really specific to SiRF
> and most of the code is the same as for imx.

it seems you means a common driver like drivers/mmc/host/sdhci-pltfm.c
for mmc host.
it is a good idea.

>
> If there are bits that are truly SiRF specific, at least that can
> be a much smaller part I think.
>
>> +#define RSC_USB_UART_SHARE   0x0
>> +#define USB1_MODE_SEL                BIT(2)
>> +#define pdev_to_phy(pdev)    ((struct usb_phy *)platform_get_drvdata(pdev))
>> +
>> +static int sirfsoc_vbus_gpio;
>
> What do you need static data for? This seems like a bad idea because it
> makes it impossible to support multiple such devices.

this should be attached to the data struct. sorry for my carelessness.
rong did a very good job at first glance, then i took easy and missed
to read one line by one line before i sent and missed some issues.

>
>> +struct ci13xxx_sirf_data {
>> +     struct platform_device  *ci_pdev;
>> +     struct clk              *clk;
>> +};
>> +
>> +static inline int ci13xxx_sirf_drive_vbus(int value)
>> +{
>> +     return gpio_direction_output(sirfsoc_vbus_gpio, value ? 0 : 1);
>> +}
>> +
>> +static void ci13xxx_sirf_notify_event(struct ci13xxx *ci, unsigned event)
>> +{
>> +     switch (event) {
>> +     case CI13XXX_CONTROLLER_RESET_EVENT:
>> +             ci13xxx_sirf_drive_vbus(1);
>> +             break;
>> +     case CI13XXX_CONTROLLER_STOPPED_EVENT:
>> +             ci13xxx_sirf_drive_vbus(0);
>> +             break;
>> +     default:
>> +             dev_info(ci->dev, "Unknown Event\n");
>> +             break;
>> +     }
>> +}
>> +
>> +static struct ci13xxx_platform_data ci13xxx_sirf_platdata = {
>> +     .name                   = "ci13xxx_sirf",
>> +     .flags                  = CI13XXX_DISABLE_STREAMING,
>> +     .capoffset              = DEF_CAPOFFSET,
>> +     .notify_event           = ci13xxx_sirf_notify_event,
>> +};
>> +
>> +static struct of_device_id rsc_ids[] = {
>> +     { .compatible = "sirf,prima2-rsc", },
>> +     { /* sentinel */ }
>> +};
>
> This is the reset controller, right? You already use the reset API
> below, why do you need to open-code the gpio

it's not reset controller. this is a Resource Sharing Control Module
involved with pinmux, we have sirf pinctrl driver, so we should move
to that.
here the problem is the driver is still hardcoding the pinmux between
uart and usb.

>
>> +static int ci13xxx_sirf_probe(struct platform_device *pdev)
>> +{
>> +     struct platform_device *plat_ci, *phy_pdev;
>> +     struct device_node *rsc_np, *phy_np;
>> +     struct ci13xxx_sirf_data *data;
>> +     struct usb_phy *phy;
>> +     void __iomem *rsc_vbase;
>> +     int ret;
>> +
>> +     data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
>> +     if (!data) {
>> +             dev_err(&pdev->dev, "Failed to allocate ci13xxx_sirf_data!\n");
>> +             return -ENOMEM;
>> +     }
>> +
>> +     /* 1. set usb controller clock */
>> +     data->clk = devm_clk_get(&pdev->dev, NULL);
>> +     if (IS_ERR(data->clk)) {
>> +             dev_err(&pdev->dev,
>> +                     "Failed to get clock, err=%ld\n", PTR_ERR(data->clk));
>> +             return PTR_ERR(data->clk);
>> +     }
>> +     ret = clk_prepare_enable(data->clk);
>> +     if (ret) {
>> +             dev_err(&pdev->dev,
>> +                     "Failed to prepare or enable clock, err=%d\n", ret);
>> +             return ret;
>> +     }
>> +
>> +     /* 2. software reset */
>> +     ret = device_reset(&pdev->dev);
>> +     if (ret)
>> +             dev_info(&pdev->dev,
>> +                     "Failed to reset device, err=%d\n", ret);
>> +
>> +     /* 3. vbus configuration */
>> +     sirfsoc_vbus_gpio = of_get_named_gpio(pdev->dev.of_node,
>> +                                                     "vbus-gpios", 0);
>> +     if (sirfsoc_vbus_gpio < 0) {
>> +             dev_err(&pdev->dev, "Can't get vbus gpio from DT\n");
>> +             ret = -ENODEV;
>> +             goto err;
>> +     }
>> +     ret = gpio_request(sirfsoc_vbus_gpio, "ci13xxx_sirf");
>> +     if (ret) {
>> +             dev_err(&pdev->dev, "Failed to get gpio control\n");
>> +             goto err;
>> +     }
>> +
>
> This seems totally generic so far, better put it into a common file.

not so generic, it seems. i think we might need some comments here to
explain why.

>
>> +     /* 4. rsc control */
>> +     rsc_np = of_find_matching_node(NULL, rsc_ids);
>> +     if (!rsc_np) {
>> +             dev_err(&pdev->dev, "Failed to get rsc device node\n");
>> +             ret = -ENODEV;
>> +             goto err;
>> +     }
>> +     rsc_vbase = of_iomap(rsc_np, 0);
>> +     if (!rsc_vbase) {
>> +             dev_err(&pdev->dev, "Failed to iomap rsc memory\n");
>> +             ret = -ENOMEM;
>> +             goto err;
>> +     }
>> +     writel(readl(rsc_vbase + RSC_USB_UART_SHARE) | USB1_MODE_SEL,
>> +                                     rsc_vbase + RSC_USB_UART_SHARE);
>
> And this seems out of place.

this issue came from the pinmux issue i mentioned.

>
>> +     /* 6. get phy for controller */
>> +     phy_np = of_parse_phandle(pdev->dev.of_node, "sirf,ci13xxx-usbphy", 0);
>> +     if (!phy_np) {
>> +             dev_err(&pdev->dev, "Failed to get phy device node\n");
>> +             ret = -ENODEV;
>> +             goto err;
>> +     }
>
> I think "sirf,ci13xxx-usbphy" is a particularly bad identifier for the
> phy here. Please have a look at the generic phy binding that is being
> proposed.
>

ok.

>> +static const struct of_device_id ci13xxx_sirf_dt_ids[] = {
>> +     { .compatible = "sirf,ci13xxx-usbcontroller", },
>> +     { /* sentinel */ }
>> +};
>> +MODULE_DEVICE_TABLE(of, ci13xxx_sirf_dt_ids);
>
> Please take the 'xxx' strings out of the 'compatible' string and use
> the specific device you are doing this for. If there are multiple
> ones, you can either list all of them or ensure they are all marked
> as compatible with the original design.

agree. i would think the old name "chipidea,ci13611a-prima2" in dts
should be right.

>
>         Arnd

-barry

[PATCH 1/3] usb: chipidea: add CSR SiRFSoC ci13xxx usb driver

[Felipe Balbi]

On Sun, Jun 09, 2013 at 11:25:36AM +0800, Barry Song wrote:
> From: Rong Wang <Rong.Wang@csr.com>
> 
> CSR SiRF SoCs licensed chipidea ci13xxx USB IP, this patch
> makes the chipidea drivers support CSR SiRF SoCS.
> 
> It also changes the Kconfig, only compile MSM and IMX if related
> drivers are enabled. Otherwise, we always need to enable all
> clients of chipidea drivers.
> 
> Cc: Marek Vasut <marex@denx.de>
> Cc: Richard Zhao <richard.zhao@freescale.com>
> Signed-off-by: Rong Wang <Rong.Wang@csr.com>
> Signed-off-by: Barry Song <Baohua.Song@csr.com>
> ---
>  drivers/usb/Kconfig                 |    1 +
>  drivers/usb/chipidea/Kconfig        |   25 ++++
>  drivers/usb/chipidea/Makefile       |    5 +-
>  drivers/usb/chipidea/ci13xxx_sirf.c |  223 +++++++++++++++++++++++++++++++++++
>  4 files changed, 252 insertions(+), 2 deletions(-)
>  create mode 100644 drivers/usb/chipidea/ci13xxx_sirf.c
> 
> diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
> index 92e1dc9..9cbe1e0 100644
> --- a/drivers/usb/Kconfig
> +++ b/drivers/usb/Kconfig
> @@ -49,6 +49,7 @@ config USB_ARCH_HAS_EHCI
>  	default y if ARCH_MMP
>  	default y if MACH_LOONGSON1
>  	default y if PLAT_ORION
> +	default y if ARCH_SIRF
>  	default PCI
>  
>  # some non-PCI HCDs implement xHCI
> diff --git a/drivers/usb/chipidea/Kconfig b/drivers/usb/chipidea/Kconfig
> index b2df442..847b9f7 100644
> --- a/drivers/usb/chipidea/Kconfig
> +++ b/drivers/usb/chipidea/Kconfig
> @@ -31,4 +31,29 @@ config USB_CHIPIDEA_DEBUG
>  	help
>  	  Say Y here to enable debugging output of the ChipIdea driver.
>  
> +if USB_CHIPIDEA_UDC && USB_CHIPIDEA_HOST
> +
> +config USB_CHIPIDEA_SIRF
> +	depends on ARCH_SIRF
> +	bool "SiRF USB controller ChipIdea driver binding"
> +	default y
> +	help
> +	  Say Y here to enable sirf usb ChipIdea driver binding.
> +
> +config USB_CHIPIDEA_MSM
> +	depends on ARCH_MSM
> +	bool "MSM USB controller ChipIdea driver binding"
> +	default y
> +	help
> +	  Say Y here to enable msm usb ChipIdea driver binding.
> +
> +config USB_CHIPIDEA_IMX
> +	depends on ARCH_MXC || ARCH_MXS
> +	bool "i.MX USB controller ChipIdea driver binding"
> +	default y
> +	help
> +	  Say Y here to enable imx usb ChipIdea driver binding.
> +
> +endif
> +
>  endif
> diff --git a/drivers/usb/chipidea/Makefile b/drivers/usb/chipidea/Makefile
> index 4ab83e9..7004fde 100644
> --- a/drivers/usb/chipidea/Makefile
> +++ b/drivers/usb/chipidea/Makefile
> @@ -9,7 +9,7 @@ ci_hdrc-$(CONFIG_USB_CHIPIDEA_DEBUG)	+= debug.o
>  
>  # Glue/Bridge layers go here
>  
> -obj-$(CONFIG_USB_CHIPIDEA)	+= ci13xxx_msm.o
> +obj-$(CONFIG_USB_CHIPIDEA_MSM)	+= ci13xxx_msm.o
>  
>  # PCI doesn't provide stubs, need to check
>  ifneq ($(CONFIG_PCI),)
> @@ -17,5 +17,6 @@ ifneq ($(CONFIG_PCI),)
>  endif
>  
>  ifneq ($(CONFIG_OF_DEVICE),)
> -	obj-$(CONFIG_USB_CHIPIDEA)	+= ci13xxx_imx.o usbmisc_imx.o
> +	obj-$(CONFIG_USB_CHIPIDEA_IMX)	+= ci13xxx_imx.o usbmisc_imx.o
> +	obj-$(CONFIG_USB_CHIPIDEA_SIRF)	+= ci13xxx_sirf.o
>  endif
> diff --git a/drivers/usb/chipidea/ci13xxx_sirf.c b/drivers/usb/chipidea/ci13xxx_sirf.c
> new file mode 100644
> index 0000000..1d84a2f
> --- /dev/null
> +++ b/drivers/usb/chipidea/ci13xxx_sirf.c
> @@ -0,0 +1,223 @@
> +/*
> + * USB Controller Driver for CSR SiRF SoC
> + *
> + * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company.
> + * Rong Wang<Rong.Wang@csr.com>
> + *
> + * Licensed under GPLv2 or later.
> + */
> +#include <linux/module.h>
> +#include <linux/io.h>
> +#include <linux/bitops.h>
> +#include <linux/platform_device.h>
> +#include <linux/pm_runtime.h>
> +#include <linux/of.h>
> +#include <linux/of_gpio.h>
> +#include <linux/of_address.h>
> +#include <linux/of_platform.h>
> +#include <linux/clk.h>
> +#include <linux/dma-mapping.h>
> +#include <linux/delay.h>
> +#include <linux/reset.h>
> +
> +#include <linux/usb/chipidea.h>
> +#include "ci.h"
> +
> +#define RSC_USB_UART_SHARE	0x0
> +#define USB1_MODE_SEL		BIT(2)
> +#define pdev_to_phy(pdev)	((struct usb_phy *)platform_get_drvdata(pdev))

sorry, no go. This is not the right way to handle USB PHYs.

> +static int sirfsoc_vbus_gpio;

this should be removed too, add it as a member of ci13xx_sirf_data.

> +struct ci13xxx_sirf_data {
> +	struct platform_device	*ci_pdev;

most likely you don't need the platform_device, you need the struct
device only.

> +	struct clk		*clk;
> +};
> +
> +static inline int ci13xxx_sirf_drive_vbus(int value)

NACK, you should pass your ci13xx_sirf_data as argument here.

> +{
> +	return gpio_direction_output(sirfsoc_vbus_gpio, value ? 0 : 1);
> +}
> +
> +static void ci13xxx_sirf_notify_event(struct ci13xxx *ci, unsigned event)
> +{
> +	switch (event) {
> +	case CI13XXX_CONTROLLER_RESET_EVENT:
> +		ci13xxx_sirf_drive_vbus(1);
> +		break;
> +	case CI13XXX_CONTROLLER_STOPPED_EVENT:
> +		ci13xxx_sirf_drive_vbus(0);
> +		break;
> +	default:
> +		dev_info(ci->dev, "Unknown Event\n");
> +		break;
> +	}
> +}
> +
> +static struct ci13xxx_platform_data ci13xxx_sirf_platdata = {
> +	.name			= "ci13xxx_sirf",
> +	.flags			= CI13XXX_DISABLE_STREAMING,
> +	.capoffset		= DEF_CAPOFFSET,
> +	.notify_event		= ci13xxx_sirf_notify_event,
> +};
> +
> +static struct of_device_id rsc_ids[] = {
> +	{ .compatible = "sirf,prima2-rsc", },
> +	{ /* sentinel */ }
> +};
> +
> +static int ci13xxx_sirf_probe(struct platform_device *pdev)
> +{
> +	struct platform_device *plat_ci, *phy_pdev;
> +	struct device_node *rsc_np, *phy_np;
> +	struct ci13xxx_sirf_data *data;
> +	struct usb_phy *phy;
> +	void __iomem *rsc_vbase;
> +	int ret;
> +
> +	data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
> +	if (!data) {
> +		dev_err(&pdev->dev, "Failed to allocate ci13xxx_sirf_data!\n");
> +		return -ENOMEM;
> +	}
> +
> +	/* 1. set usb controller clock */
> +	data->clk = devm_clk_get(&pdev->dev, NULL);
> +	if (IS_ERR(data->clk)) {
> +		dev_err(&pdev->dev,
> +			"Failed to get clock, err=%ld\n", PTR_ERR(data->clk));
> +		return PTR_ERR(data->clk);
> +	}
> +	ret = clk_prepare_enable(data->clk);
> +	if (ret) {
> +		dev_err(&pdev->dev,
> +			"Failed to prepare or enable clock, err=%d\n", ret);
> +		return ret;
> +	}
> +
> +	/* 2. software reset */
> +	ret = device_reset(&pdev->dev);
> +	if (ret)
> +		dev_info(&pdev->dev,
> +			"Failed to reset device, err=%d\n", ret);
> +
> +	/* 3. vbus configuration */
> +	sirfsoc_vbus_gpio = of_get_named_gpio(pdev->dev.of_node,
> +							"vbus-gpios", 0);
> +	if (sirfsoc_vbus_gpio < 0) {
> +		dev_err(&pdev->dev, "Can't get vbus gpio from DT\n");
> +		ret = -ENODEV;
> +		goto err;
> +	}
> +	ret = gpio_request(sirfsoc_vbus_gpio, "ci13xxx_sirf");
> +	if (ret) {
> +		dev_err(&pdev->dev, "Failed to get gpio control\n");
> +		goto err;
> +	}
> +
> +	/* 4. rsc control */
> +	rsc_np = of_find_matching_node(NULL, rsc_ids);
> +	if (!rsc_np) {
> +		dev_err(&pdev->dev, "Failed to get rsc device node\n");
> +		ret = -ENODEV;
> +		goto err;
> +	}
> +	rsc_vbase = of_iomap(rsc_np, 0);
> +	if (!rsc_vbase) {
> +		dev_err(&pdev->dev, "Failed to iomap rsc memory\n");
> +		ret = -ENOMEM;
> +		goto err;
> +	}
> +	writel(readl(rsc_vbase + RSC_USB_UART_SHARE) | USB1_MODE_SEL,
> +					rsc_vbase + RSC_USB_UART_SHARE);
> +
> +	/* 5. set device dma mask */
> +	if (!pdev->dev.dma_mask) {
> +		pdev->dev.dma_mask = devm_kzalloc(&pdev->dev,
> +				      sizeof(*pdev->dev.dma_mask), GFP_KERNEL);
> +		if (!pdev->dev.dma_mask) {
> +			dev_err(&pdev->dev, "Failed to alloc dma_mask!\n");
> +			ret = -ENOMEM;
> +			goto err;
> +		}
> +		*pdev->dev.dma_mask = DMA_BIT_MASK(32);
> +		dma_set_coherent_mask(&pdev->dev, *pdev->dev.dma_mask);
> +	}
> +
> +	/* 6. get phy for controller */
> +	phy_np = of_parse_phandle(pdev->dev.of_node, "sirf,ci13xxx-usbphy", 0);
> +	if (!phy_np) {
> +		dev_err(&pdev->dev, "Failed to get phy device node\n");
> +		ret = -ENODEV;
> +		goto err;
> +	}
> +	phy_pdev = of_find_device_by_node(phy_np);
> +	if (!phy_pdev) {
> +		dev_err(&pdev->dev, "Failed to get phy platform device\n");
> +		ret = -ENODEV;
> +		goto err;
> +	}
> +	phy = pdev_to_phy(phy_pdev);
> +	if (!phy || !try_module_get(phy_pdev->dev.driver->owner)) {
> +		dev_err(&pdev->dev, "Failed to get phy control\n");
> +		ret = -ENODEV;
> +		goto err;
> +	}
> +	usb_phy_init(phy);
> +	ci13xxx_sirf_platdata.phy = phy;
> +
> +	/* 7. register to ci13xxx core */
> +	plat_ci = ci13xxx_add_device(&pdev->dev,
> +				pdev->resource, pdev->num_resources,
> +				&ci13xxx_sirf_platdata);
> +	if (IS_ERR(plat_ci)) {
> +		dev_err(&pdev->dev, "ci13xxx_add_device failed!\n");
> +		return PTR_ERR(plat_ci);
> +	}
> +
> +	platform_set_drvdata(pdev, plat_ci);
> +
> +	pm_runtime_no_callbacks(&pdev->dev);
> +	pm_runtime_enable(&pdev->dev);
> +
> +	dev_info(&pdev->dev, "Ready\n");

remove this dev_info()

-- 
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130612/0fae6d4c/attachment.sig>

[PATCH 1/3] usb: chipidea: add CSR SiRFSoC ci13xxx usb driver

[Andy Shevchenko]

On Sun, Jun 9, 2013 at 6:25 AM, Barry Song <21cnbao@gmail.com> wrote:
> CSR SiRF SoCs licensed chipidea ci13xxx USB IP, this patch
> makes the chipidea drivers support CSR SiRF SoCS.
>
> It also changes the Kconfig, only compile MSM and IMX if related
> drivers are enabled. Otherwise, we always need to enable all
> clients of chipidea drivers.

> +       /* 5. set device dma mask */
> +       if (!pdev->dev.dma_mask) {
> +               pdev->dev.dma_mask = devm_kzalloc(&pdev->dev,
> +                                     sizeof(*pdev->dev.dma_mask), GFP_KERNEL);
> +               if (!pdev->dev.dma_mask) {
> +                       dev_err(&pdev->dev, "Failed to alloc dma_mask!\n");
> +                       ret = -ENOMEM;
> +                       goto err;
> +               }
> +               *pdev->dev.dma_mask = DMA_BIT_MASK(32);
> +               dma_set_coherent_mask(&pdev->dev, *pdev->dev.dma_mask);

Perhaps you could avoid this allocation if you apply coherent mask
first and its address will be used as dma_mask value.

> +       }

> +err:
> +       clk_disable_unprepare(data->clk);
> +       return ret;

Please, check, but if I remember correctly devm_clk* is doing this for
you on release stage.

> +static int ci13xxx_sirf_remove(struct platform_device *pdev)
> +{
> +       struct ci13xxx_sirf_data *data = platform_get_drvdata(pdev);
> +
> +       pm_runtime_disable(&pdev->dev);
> +       ci13xxx_remove_device(data->ci_pdev);
> +
> +       clk_disable_unprepare(data->clk);

Ditto.

--
With Best Regards,
Andy Shevchenko

[PATCH 1/3] usb: chipidea: add CSR SiRFSoC ci13xxx usb driver

[Alexander Shishkin]

Barry Song <21cnbao@gmail.com> writes:

> +if USB_CHIPIDEA_UDC && USB_CHIPIDEA_HOST
> +
> +config USB_CHIPIDEA_SIRF
> +	depends on ARCH_SIRF
> +	bool "SiRF USB controller ChipIdea driver binding"
> +	default y
> +	help
> +	  Say Y here to enable sirf usb ChipIdea driver binding.
> +
> +config USB_CHIPIDEA_MSM
> +	depends on ARCH_MSM
> +	bool "MSM USB controller ChipIdea driver binding"
> +	default y
> +	help
> +	  Say Y here to enable msm usb ChipIdea driver binding.
> +
> +config USB_CHIPIDEA_IMX
> +	depends on ARCH_MXC || ARCH_MXS
> +	bool "i.MX USB controller ChipIdea driver binding"
> +	default y
> +	help
> +	  Say Y here to enable imx usb ChipIdea driver binding.
> +
> +endif

No. This is wrong on at least 3 different levels.

> +
>  endif
> diff --git a/drivers/usb/chipidea/Makefile b/drivers/usb/chipidea/Makefile
> index 4ab83e9..7004fde 100644
> --- a/drivers/usb/chipidea/Makefile
> +++ b/drivers/usb/chipidea/Makefile
> @@ -9,7 +9,7 @@ ci_hdrc-$(CONFIG_USB_CHIPIDEA_DEBUG)	+= debug.o
>  
>  # Glue/Bridge layers go here
>  
> -obj-$(CONFIG_USB_CHIPIDEA)	+= ci13xxx_msm.o
> +obj-$(CONFIG_USB_CHIPIDEA_MSM)	+= ci13xxx_msm.o

No.

>  # PCI doesn't provide stubs, need to check
>  ifneq ($(CONFIG_PCI),)
> @@ -17,5 +17,6 @@ ifneq ($(CONFIG_PCI),)
>  endif
>  
>  ifneq ($(CONFIG_OF_DEVICE),)
> -	obj-$(CONFIG_USB_CHIPIDEA)	+= ci13xxx_imx.o usbmisc_imx.o
> +	obj-$(CONFIG_USB_CHIPIDEA_IMX)	+= ci13xxx_imx.o usbmisc_imx.o
> +	obj-$(CONFIG_USB_CHIPIDEA_SIRF)	+= ci13xxx_sirf.o
>  endif

No.

Regards,
--
Alex

[PATCH 1/3] usb: chipidea: add CSR SiRFSoC ci13xxx usb driver

[Barry Song]

2013/6/14 Alexander Shishkin <alexander.shishkin@linux.intel.com>:
> Barry Song <21cnbao@gmail.com> writes:
>
>> +if USB_CHIPIDEA_UDC && USB_CHIPIDEA_HOST
>> +
>> +config USB_CHIPIDEA_SIRF
>> +     depends on ARCH_SIRF
>> +     bool "SiRF USB controller ChipIdea driver binding"
>> +     default y
>> +     help
>> +       Say Y here to enable sirf usb ChipIdea driver binding.
>> +
>> +config USB_CHIPIDEA_MSM
>> +     depends on ARCH_MSM
>> +     bool "MSM USB controller ChipIdea driver binding"
>> +     default y
>> +     help
>> +       Say Y here to enable msm usb ChipIdea driver binding.
>> +
>> +config USB_CHIPIDEA_IMX
>> +     depends on ARCH_MXC || ARCH_MXS
>> +     bool "i.MX USB controller ChipIdea driver binding"
>> +     default y
>> +     help
>> +       Say Y here to enable imx usb ChipIdea driver binding.
>> +
>> +endif
>
> No. This is wrong on at least 3 different levels.

the point is we don't directly include MSM, IMX, SiRF and all other
drivers once we enable chipidea. that makes these drivers optional,
not always be built-in.

-barry

[PATCH 1/3] usb: chipidea: add CSR SiRFSoC ci13xxx usb driver

[Alexander Shishkin]

Barry Song <21cnbao@gmail.com> writes:

> 2013/6/14 Alexander Shishkin <alexander.shishkin@linux.intel.com>:
>> Barry Song <21cnbao@gmail.com> writes:
>>
>>> +if USB_CHIPIDEA_UDC && USB_CHIPIDEA_HOST
>>> +
>>> +config USB_CHIPIDEA_SIRF
>>> +     depends on ARCH_SIRF
>>> +     bool "SiRF USB controller ChipIdea driver binding"
>>> +     default y
>>> +     help
>>> +       Say Y here to enable sirf usb ChipIdea driver binding.
>>> +
>>> +config USB_CHIPIDEA_MSM
>>> +     depends on ARCH_MSM
>>> +     bool "MSM USB controller ChipIdea driver binding"
>>> +     default y
>>> +     help
>>> +       Say Y here to enable msm usb ChipIdea driver binding.
>>> +
>>> +config USB_CHIPIDEA_IMX
>>> +     depends on ARCH_MXC || ARCH_MXS
>>> +     bool "i.MX USB controller ChipIdea driver binding"
>>> +     default y
>>> +     help
>>> +       Say Y here to enable imx usb ChipIdea driver binding.
>>> +
>>> +endif
>>
>> No. This is wrong on at least 3 different levels.
>
> the point is we don't directly include MSM, IMX, SiRF and all other
> drivers once we enable chipidea. that makes these drivers optional,
> not always be built-in.

This has been discussed several times already. Just set the
USB_CHIPIDEA=m and then everything will be built as modules and nothing
will be built in. What exactly is the problem you're trying to solve
with this?

The only way something like this will go in is with Jiri's COMPILE_TEST
patchset. This snippet above is just buggy.

Regards,
--
Alex

[PATCH 1/3] usb: chipidea: add CSR SiRFSoC ci13xxx usb driver

[Barry Song]

2013/6/14 Alexander Shishkin <alexander.shishkin@linux.intel.com>:
> Barry Song <21cnbao@gmail.com> writes:
>
>> 2013/6/14 Alexander Shishkin <alexander.shishkin@linux.intel.com>:
>>> Barry Song <21cnbao@gmail.com> writes:
>>>
>>>> +if USB_CHIPIDEA_UDC && USB_CHIPIDEA_HOST
>>>> +
>>>> +config USB_CHIPIDEA_SIRF
>>>> +     depends on ARCH_SIRF
>>>> +     bool "SiRF USB controller ChipIdea driver binding"
>>>> +     default y
>>>> +     help
>>>> +       Say Y here to enable sirf usb ChipIdea driver binding.
>>>> +
>>>> +config USB_CHIPIDEA_MSM
>>>> +     depends on ARCH_MSM
>>>> +     bool "MSM USB controller ChipIdea driver binding"
>>>> +     default y
>>>> +     help
>>>> +       Say Y here to enable msm usb ChipIdea driver binding.
>>>> +
>>>> +config USB_CHIPIDEA_IMX
>>>> +     depends on ARCH_MXC || ARCH_MXS
>>>> +     bool "i.MX USB controller ChipIdea driver binding"
>>>> +     default y
>>>> +     help
>>>> +       Say Y here to enable imx usb ChipIdea driver binding.
>>>> +
>>>> +endif
>>>
>>> No. This is wrong on at least 3 different levels.
>>
>> the point is we don't directly include MSM, IMX, SiRF and all other
>> drivers once we enable chipidea. that makes these drivers optional,
>> not always be built-in.
>
> This has been discussed several times already. Just set the
> USB_CHIPIDEA=m and then everything will be built as modules and nothing
> will be built in. What exactly is the problem you're trying to solve
> with this?
>

Alex, it seems it is not much a generic way to use building-module to
avoid all involved components built-in.
but since you have discussed several times and got agreement, i'll
follow it and don't re-open it.

> The only way something like this will go in is with Jiri's COMPILE_TEST
> patchset. This snippet above is just buggy.
>
> Regards,
> --
> Alex

-barry