Skip to contentSkip to conversation

Fix and improve USB3 support on Armada 37xx

PATCH New Gregory CLEMENT 1 participant 5 messages Mar 8, 2017 – Mar 23, 2017

Subsystems (2)
Device tree bindings Arm/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K, CN9130 SoC support
lore
Share & tools
lore

Gregory CLEMENT

author
#0 lore raw

cover Fix and improve USB3 support on Armada 37xx

Hi,

The first patch fixes a wrong IRQ number present since the introduction of the device tree for this SoC.

The second and the third ones improve the USB3 representation following the add of the clock support on Armada 37xx and the gpio expander on Armada 3720 DB.

Thanks,

Gregory

Gregory CLEMENT (3):
ARM64: dts: marvell: armada-37xx: Fix interrupt mapping for USB3
ARM64: dts: marvell: armada-37xx: Add clock resource for USB3
ARM64: dts: marvell: armada-3720-db: Add phy for USB3

 arch/arm64/boot/dts/marvell/armada-3720-db.dts | 17 +++++++++++++++++
 arch/arm64/boot/dts/marvell/armada-37xx.dtsi   |  3 ++-
 2 files changed, 19 insertions(+), 1 deletion(-)
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH 1/3 ARM64: dts: marvell: armada-37xx: Fix interrupt mapping for USB3

IRQ number for xhci controller was wrong, fix it.

Signed-off-by Gregory CLEMENT <[email protected]>
---
 arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/marvell/armada-37xx.dtsi +1 -1
index 7639518d8ee1..25ae5ccaf1bf 100644
@@ -200,7 +200,7 @@
 				compatible = "marvell,armada3700-xhci",
 				"generic-xhci";
 				reg = <0x58000 0x4000>;
-				interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
+				interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
 				status = "disabled";
 			};
Signature · 1 line
2.11.0
author
#2 lore raw

PATCH 2/3 ARM64: dts: marvell: armada-37xx: Add clock resource for USB3

In reply to Gregory CLEMENT

Now that clocks are available provide a clock resource for xhci node.

Signed-off-by Gregory CLEMENT <[email protected]>
---
 arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/marvell/armada-37xx.dtsi +1 -0
index 25ae5ccaf1bf..1df9d4e0d943 100644
@@ -201,6 +201,7 @@
 				"generic-xhci";
 				reg = <0x58000 0x4000>;
 				interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
+				clocks = <&sb_periph_clk 12>;
 				status = "disabled";
 			};
Signature · 1 line
2.11.0
author
#3 lore raw

PATCH 3/3 ARM64: dts: marvell: armada-3720-db: Add phy for USB3

In reply to Gregory CLEMENT

Now that the gpio expander is present in the dts, use it to add an USB3 PHY using one of these gpio as a regulator.

Signed-off-by Gregory CLEMENT <[email protected]>
---
 arch/arm64/boot/dts/marvell/armada-3720-db.dts | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
arch/arm64/boot/dts/marvell/armada-3720-db.dts +17 -0
index aa39339b6582..10207f96f090 100644
@@ -46,6 +46,7 @@
 
 /dts-v1/;
 
+#include <dt-bindings/gpio/gpio.h>
 #include "armada-372x.dtsi"
 
 / {

@@ -60,6 +61,21 @@
 		device_type = "memory";
 		reg = <0x00000000 0x00000000 0x00000000 0x20000000>;
 	};
+
+	exp_usb3_vbus: usb3-vbus {
+		compatible = "regulator-fixed";
+		regulator-name = "usb3-vbus";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		enable-active-high;
+		regulator-always-on;
+		gpio = <&gpio_exp 1 GPIO_ACTIVE_HIGH>;
+	};
+
+	usb3_phy: usb3-phy {
+		compatible = "usb-nop-xceiv";
+		vcc-supply = <&exp_usb3_vbus>;
+	};
 };
 
 &i2c0 {

@@ -127,6 +143,7 @@
 /* CON31 */
 &usb3 {
 	status = "okay";
+	usb-phy = <&usb3_phy>;
 };
 
 /* CON17 (PCIe) / CON12 (mini-PCIe) */
Signature · 1 line
2.11.0
author
#4 lore raw

cover Fix and improve USB3 support on Armada 37xx

In reply to Gregory CLEMENT

Hi,

Quoted 9 lines · Gregory CLEMENT

Hi,

The first patch fixes a wrong IRQ number present since the introduction of the device tree for this SoC.

The second and the third ones improve the USB3 representation following the add of the clock support on Armada 37xx and the gpio expander on Armada 3720 DB.

Quoted 8 lines

Thanks,

Gregory

Gregory CLEMENT (3):
ARM64: dts: marvell: armada-37xx: Fix interrupt mapping for USB3
ARM64: dts: marvell: armada-37xx: Add clock resource for USB3
ARM64: dts: marvell: armada-3720-db: Add phy for USB3

All 3 patches applied on mvebu/dt64

Gregory

Quoted 8 lines
 arch/arm64/boot/dts/marvell/armada-3720-db.dts | 17 +++++++++++++++++
 arch/arm64/boot/dts/marvell/armada-37xx.dtsi   |  3 ++-
 2 files changed, 19 insertions(+), 1 deletion(-)
Signature · 1 line
2.11.0
Signature · 4 lines
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com