Skip to contentSkip to conversation

ARM: at91: usb ohci add dt support

PATCH Superseded Jean-Christophe PLAGNIOL-VILLARD 3 participants 7 messages Feb 14, 2012 – Feb 15, 2012

Subsystems (7)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 ARM: at91: usb ohci add dt support

Cc Nicolas Ferre <[email protected]>
Cc devicetree-discuss at lists.ozlabs.org
Cc linux-usb at vger.kernel.org

---
Hi Greg,

I you don't mind I'll apply this via at91 tree as it's part a DT USB patch series

Best Regards,
J.

 .../devicetree/bindings/usb/atmel-usb.txt          |   19 ++++
 drivers/usb/host/ohci-at91.c                       |  101 +++++++++++++++++++-
 2 files changed, 119 insertions(+), 1 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/usb/atmel-usb.txt
Documentation/devicetree/bindings/usb/atmel-usb.txt new file +19 -0
new file mode 100644
index 0000000..6c7f728
@@ -0,0 +1,19 @@
+Atmel SOC USB controllers
+
+OHCI
+
+Required properties:
+ - compatible: Should be "atmel,at91rm9200-ohci" for USB controllers
+   used in host mode.
+ - num-ports: Number of ports.
+ - atmel,vbus-gpio: If present, specifies a gpio that needs to be
+   activated for the bus to be powered.
+ - atmel,oc-gpio: If present, specifies a gpio that needs to be
+   activated for the overcurrent detection.
+
+usb0: ohci at 00500000 {
+	compatible = "atmel,at91rm9200-ohci", "usb-ohci";
+	reg = <0x00500000 0x100000>;
+	interrupts = <20 4>;
+	num-ports = <2>;
+};
drivers/usb/host/ohci-at91.c +100 -1

124 lines not on this page · raw message

Signature · 1 line
1.7.7
#1 lore raw

PATCH 2/4 ARM: at91: dt: enable usb ohci for 9g20 and 9g45

Cc Nicolas Ferre <[email protected]>
Cc devicetree-discuss at lists.ozlabs.org

--

 arch/arm/boot/dts/at91sam9g20.dtsi     |    7 +++++++
 arch/arm/boot/dts/at91sam9g45.dtsi     |    7 +++++++
 arch/arm/boot/dts/at91sam9m10g45ek.dts |    7 +++++++
 arch/arm/boot/dts/usb_a9g20.dts        |    5 +++++
 arch/arm/mach-at91/at91sam9260.c       |    1 +
 arch/arm/mach-at91/at91sam9g45.c       |    1 +
 6 files changed, 28 insertions(+), 0 deletions(-)
arch/arm/boot/dts/at91sam9g20.dtsi +7 -0
index 48c4e0a..6aa7d5e 100644
@@ -206,6 +206,13 @@
 				status = "disabled";
 			};
 
+			usb0: ohci at 00500000 {
+				compatible = "atmel,at91rm9200-ohci", "usb-ohci";
+				reg = <0x00500000 0x100000>;
+				interrupts = <20 4>;
+				status = "disabled";
+			};
+
 		};
 	};
 };
arch/arm/boot/dts/at91sam9g45.dtsi +7 -0
index 25e09c5..a630430 100644
@@ -206,6 +206,13 @@
 				status = "disabled";
 			};
 
+			usb0: ohci at 00700000 {
+				compatible = "atmel,at91rm9200-ohci", "usb-ohci";
+				reg = <0x00700000 0x100000>;
+				interrupts = <22 4>;
+				status = "disabled";
+			};
+
 		};
 	};
 };
arch/arm/boot/dts/at91sam9m10g45ek.dts +7 -0
index a130ace..6d67a44 100644
@@ -155,6 +155,13 @@
 
 			};
 
+			usb0: ohci at 00700000 {
+				status = "okay";
+				num-ports = <2>;
+				atmel,vbus-gpio = <&pioD 1 12
+						   &pioD 3 12>;
+			};
+
 		};
 	};
 };
arch/arm/boot/dts/usb_a9g20.dts +5 -0
index 643c1d4..3e1a93a 100644
@@ -125,6 +125,11 @@
 				status = "okay";
 			};
 
+			usb0: ohci at 00500000 {
+				num-ports = <2>;
+				status = "okay";
+			};
+
 		};
 	};
 };
arch/arm/mach-at91/at91sam9260.c +1 -0
index bff3406..e0dbbdf 100644
@@ -211,6 +211,7 @@ static struct clk_lookup periph_clocks_lookups[] = {
 	CLKDEV_CON_DEV_ID("usart", "fffd8000.serial", &usart5_clk),
 	CLKDEV_CON_DEV_ID("spi_clk", "fffc8000.spi", &spi0_clk),
 	CLKDEV_CON_DEV_ID("spi_clk", "fffcc000.spi", &spi1_clk),
+	CLKDEV_CON_DEV_ID("hclk", "500000.ohci", &ohci_clk),
 	/* fake hclk clock */
 	CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
 	CLKDEV_CON_ID("pioA", &pioA_clk),
arch/arm/mach-at91/at91sam9g45.c +1 -0
index 5301633..63865f2 100644
@@ -231,6 +231,7 @@ static struct clk_lookup periph_clocks_lookups[] = {
 	CLKDEV_CON_DEV_ID("usart", "fff98000.serial", &usart3_clk),
 	CLKDEV_CON_DEV_ID("spi_clk", "fffa4000.spi", &spi0_clk),
 	CLKDEV_CON_DEV_ID("spi_clk", "fffa8000.spi", &spi1_clk),
+	CLKDEV_CON_DEV_ID("hclk", "700000.ohci", &uhphs_clk),
 	/* fake hclk clock */
 	CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &uhphs_clk),
 	CLKDEV_CON_ID("pioA", &pioA_clk),
Signature · 1 line
1.7.7
#2 lore raw

PATCH 3/4 ARM: at91: usb ehci add dt support

In reply to Jean-Christophe PLAGNIOL-VILLARD
Cc Nicolas Ferre <[email protected]>
Cc devicetree-discuss at lists.ozlabs.org
Cc linux-usb at vger.kernel.org

---
Hi Greg,

I you don't mind I'll apply this via at91 tree as it's part a DT USB patch series

Best Regards,
J.

 .../devicetree/bindings/usb/atmel-usb.txt          |   12 ++++++++++
 drivers/usb/host/ehci-atmel.c                      |   24 +++++++++++++++++++-
 2 files changed, 35 insertions(+), 1 deletions(-)
Documentation/devicetree/bindings/usb/atmel-usb.txt +12 -0
index 6c7f728..0143d7c 100644
@@ -17,3 +17,15 @@ usb0: ohci at 00500000 {
 	interrupts = <20 4>;
 	num-ports = <2>;
 };
+
+EHCI
+
+Required properties:
+ - compatible: Should be "atmel,at91sam9g45-ehci" for USB controllers
+   used in host mode.
+
+usb1: ehci at 00800000 {
+	compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
+	reg = <0x00800000 0x100000>;
+	interrupts = <22 4>;
+};
drivers/usb/host/ehci-atmel.c +23 -1
index a5a3ef1..55e0044 100644
@@ -13,6 +13,7 @@
 
 #include <linux/clk.h>
 #include <linux/platform_device.h>
+#include <linux/of_platform.h>
 
 /* interface and function clocks */
 static struct clk *iclk, *fclk;
@@ -115,6 +116,8 @@ static const struct hc_driver ehci_atmel_hc_driver = {
 	.clear_tt_buffer_complete	= ehci_clear_tt_buffer_complete,
 };
 
+static u64 at91_ehci_dma_mask = DMA_BIT_MASK(32);
+
 static int __devinit ehci_atmel_drv_probe(struct platform_device *pdev)
 {
 	struct usb_hcd *hcd;
@@ -137,6 +140,13 @@ static int __devinit ehci_atmel_drv_probe(struct platform_device *pdev)
 		goto fail_create_hcd;
 	}
 
+	/* Right now device-tree probed devices don't get dma_mask set.
+	 * Since shared usb code relies on it, set it here for now.
+	 * Once we have dma capability bindings this can go away.
+	 */
+	if (!pdev->dev.dma_mask)
+		pdev->dev.dma_mask = &at91_ehci_dma_mask;
+
 	hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
 	if (!hcd) {
 		retval = -ENOMEM;
@@ -225,9 +235,21 @@ static int __devexit ehci_atmel_drv_remove(struct platform_device *pdev)
 	return 0;
 }
 
+#ifdef CONFIG_OF
+static const struct of_device_id atmel_ehci_dt_ids[] = {
+	{ .compatible = "atmel,at91samg945-ehci" },
+	{ /* sentinel */ }
+};
+
+MODULE_DEVICE_TABLE(of, atmel_ehci_dt_ids);
+#endif
+
 static struct platform_driver ehci_atmel_driver = {
 	.probe		= ehci_atmel_drv_probe,
 	.remove		= __devexit_p(ehci_atmel_drv_remove),
 	.shutdown	= usb_hcd_platform_shutdown,
-	.driver.name	= "atmel-ehci",
+	.driver		= {
+		.name	= "atmel-ehci",
+		.of_match_table	= of_match_ptr(atmel_ehci_dt_ids),
+	},
 };
Signature · 1 line
1.7.7
#3 lore raw

PATCH 4/4 ARM: at91: dt: enable usb ehci for 9g45

In reply to Jean-Christophe PLAGNIOL-VILLARD
Cc Nicolas Ferre <[email protected]>
Cc devicetree-discuss at lists.ozlabs.org
---
 arch/arm/boot/dts/at91sam9g45.dtsi     |    7 +++++++
 arch/arm/boot/dts/at91sam9m10g45ek.dts |    4 ++++
 arch/arm/mach-at91/at91sam9g45.c       |    1 +
 3 files changed, 12 insertions(+), 0 deletions(-)
arch/arm/boot/dts/at91sam9g45.dtsi +7 -0
index a630430..694fd1e 100644
@@ -213,6 +213,13 @@
 				status = "disabled";
 			};
 
+			usb1: ehci at 00800000 {
+				compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
+				reg = <0x00800000 0x100000>;
+				interrupts = <22 4>;
+				status = "disabled";
+			};
+
 		};
 	};
 };
arch/arm/boot/dts/at91sam9m10g45ek.dts +4 -0
index 6d67a44..824516c 100644
@@ -162,6 +162,10 @@
 						   &pioD 3 12>;
 			};
 
+			usb1: ehci at 00800000 {
+				status = "okay";
+			};
+
 		};
 	};
 };
arch/arm/mach-at91/at91sam9g45.c +1 -0
index 63865f2..2d57370 100644
@@ -232,6 +232,7 @@ static struct clk_lookup periph_clocks_lookups[] = {
 	CLKDEV_CON_DEV_ID("spi_clk", "fffa4000.spi", &spi0_clk),
 	CLKDEV_CON_DEV_ID("spi_clk", "fffa8000.spi", &spi1_clk),
 	CLKDEV_CON_DEV_ID("hclk", "700000.ohci", &uhphs_clk),
+	CLKDEV_CON_DEV_ID("ehci_clk", "800000.ehci", &uhphs_clk),
 	/* fake hclk clock */
 	CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &uhphs_clk),
 	CLKDEV_CON_ID("pioA", &pioA_clk),
Signature · 1 line
1.7.7
#4 lore raw

PATCH 1/4 ARM: at91: usb ohci add dt support

In reply to Jean-Christophe PLAGNIOL-VILLARD
Quoted 9 lines · Jean-Christophe PLAGNIOL-VILLARD
Cc Nicolas Ferre <[email protected]>
Cc devicetree-discuss at lists.ozlabs.org
Cc linux-usb at vger.kernel.org

---
Hi Greg,

I you don't mind I'll apply this via at91 tree as it's part a DT USB patch series

No objection from me, feel free to add:

to it.

#5 lore raw

PATCH 1/4 ARM: at91: usb ohci add dt support

In reply to Jean-Christophe PLAGNIOL-VILLARD
Quoted 78 lines · Jean-Christophe PLAGNIOL-VILLARD
Cc Nicolas Ferre <[email protected]>
Cc devicetree-discuss at lists.ozlabs.org
Cc linux-usb at vger.kernel.org

---
Hi Greg,

I you don't mind I'll apply this via at91 tree as it's part a DT USB patch series

Best Regards,
J.

 .../devicetree/bindings/usb/atmel-usb.txt          |   19 ++++
 drivers/usb/host/ohci-at91.c                       |  101 +++++++++++++++++++-
 2 files changed, 119 insertions(+), 1 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/usb/atmel-usb.txt
Documentation/devicetree/bindings/usb/atmel-usb.txt new file +19 -0
new file mode 100644
index 0000000..6c7f728
@@ -0,0 +1,19 @@
+Atmel SOC USB controllers
+
+OHCI
+
+Required properties:
+ - compatible: Should be "atmel,at91rm9200-ohci" for USB controllers
+   used in host mode.
+ - num-ports: Number of ports.
+ - atmel,vbus-gpio: If present, specifies a gpio that needs to be
+   activated for the bus to be powered.
+ - atmel,oc-gpio: If present, specifies a gpio that needs to be
+   activated for the overcurrent detection.
+
+usb0: ohci at 00500000 {
+	compatible = "atmel,at91rm9200-ohci", "usb-ohci";
+	reg = <0x00500000 0x100000>;
+	interrupts = <20 4>;
+	num-ports = <2>;
+};
drivers/usb/host/ohci-at91.c +21 -0
index 8e855eb..718f138 100644
@@ -14,6 +14,8 @@
 
 #include <linux/clk.h>
 #include <linux/platform_device.h>
+#include <linux/of_platform.h>
+#include <linux/of_gpio.h>
 
 #include <mach/hardware.h>
 #include <asm/gpio.h>
@@ -477,13 +479,109 @@ static irqreturn_t ohci_hcd_at91_overcurrent_irq(int irq, void *data)
 	return IRQ_HANDLED;
 }
 
+#ifdef CONFIG_OF
+static const struct of_device_id at91_ohci_dt_ids[] = {
+	{ .compatible = "atmel,at91rm9200-ohci" },
+	{ /* sentinel */ }
+};
+
+MODULE_DEVICE_TABLE(of, at91_ohci_dt_ids);
+
+static u64 at91_ohci_dma_mask = DMA_BIT_MASK(32);
+
+static int __devinit ohci_at91_of_init(struct platform_device *pdev)
+{
+	struct device_node *np = pdev->dev.of_node;
+	int i, ret, gpio;
+	enum of_gpio_flags flags;
+	struct at91_usbh_data	*pdata;
+	u32 ports;
+
+	if (!np)

drivers/usb/host/ohci-at91.c static irqreturn_t ohci_hcd_at91_overcurrent_irq(int irq, void *data) · line 510

Quoted 10 lines
drivers/usb/host/ohci-at91.c +10 -0
+		return 0;
+
+	/* Right now device-tree probed devices don't get dma_mask set.
+	 * Since shared usb code relies on it, set it here for now.
+	 * Once we have dma capability bindings this can go away.
+	 */
+	if (!pdev->dev.dma_mask)
+		pdev->dev.dma_mask = &at91_ohci_dma_mask;
+
+	pdata = kzalloc(sizeof(struct at91_usbh_data), GFP_KERNEL);

devm_kzalloc()

Otherwise looks good to me.

g.

#6 lore raw

PATCH v2 1/4 ARM: at91: usb ohci add dt support

In reply to Jean-Christophe PLAGNIOL-VILLARD
Cc Nicolas Ferre <[email protected]>
Cc devicetree-discuss at lists.ozlabs.org
Cc linux-usb at vger.kernel.org

---
v2:

use devm_kzalloc

Best Regards,
J.

 .../devicetree/bindings/usb/atmel-usb.txt          |   19 ++++
 drivers/usb/host/ohci-at91.c                       |  101 +++++++++++++++++++-
 2 files changed, 119 insertions(+), 1 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/usb/atmel-usb.txt
Documentation/devicetree/bindings/usb/atmel-usb.txt new file +19 -0
new file mode 100644
index 0000000..6c7f728
@@ -0,0 +1,19 @@
+Atmel SOC USB controllers
+
+OHCI
+
+Required properties:
+ - compatible: Should be "atmel,at91rm9200-ohci" for USB controllers
+   used in host mode.
+ - num-ports: Number of ports.
+ - atmel,vbus-gpio: If present, specifies a gpio that needs to be
+   activated for the bus to be powered.
+ - atmel,oc-gpio: If present, specifies a gpio that needs to be
+   activated for the overcurrent detection.
+
+usb0: ohci at 00500000 {
+	compatible = "atmel,at91rm9200-ohci", "usb-ohci";
+	reg = <0x00500000 0x100000>;
+	interrupts = <20 4>;
+	num-ports = <2>;
+};
drivers/usb/host/ohci-at91.c +100 -1

124 lines not on this page · raw message

Signature · 1 line
1.7.7