arm64: marvell: few improvment for Armada 37xx device tree
Subsystems (3)
cover arm64: marvell: few improvment for Armada 37xx device tree
Hi,
This series add few improvement on the dts for Armada 37xx. First it send a second version of the patch from Andreas with the modification initially asked. I also fix the compatibility property for the xHCI node to conform to the documentation.
Thanks,
Gregory
Andreas F?rber (2):
arm64: dts: marvell: Clean up armada-3720-db
arm64: dts: marvell: Rename armada-37xx USB node
Gregory CLEMENT (1):
arm64: dts: marvell: Use a SoC-specific compatible for xHCI on
Armada37xx
Documentation/devicetree/bindings/usb/usb-xhci.txt | 1 + arch/arm64/boot/dts/marvell/armada-3720-db.dts | 32 ++++++++-------------- arch/arm64/boot/dts/marvell/armada-372x.dtsi | 1 - arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 7 +++-- 4 files changed, 17 insertions(+), 24 deletions(-)
Signature · 1 line
2.5.0
PATCH 1/3 arm64: dts: marvell: Clean up armada-3720-db
From: Andreas F?rber <[email protected]>
Instead of duplicating the SoC's node hierarchy, including a bus node named "internal-regs", reference the actually desired nodes by label, like Berlin already does. Add labels where necessary.
Drop an inconsistent white line while at it.
--- arch/arm64/boot/dts/marvell/armada-3720-db.dts | 32 ++++++++++---------------- arch/arm64/boot/dts/marvell/armada-372x.dtsi | 1 - arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 4 ++-- 3 files changed, 14 insertions(+), 23 deletions(-)
arch/arm64/boot/dts/marvell/armada-3720-db.dts +12 -20
@@ -60,27 +60,19 @@ device_type = "memory"; reg = <0x00000000 0x00000000 0x00000000 0x20000000>; }; +}; - soc { - internal-regs { - /* - * Exported on the micro USB connector CON32 - * through an FTDI - */ - uart0: serial at 12000 { - status = "okay"; - }; - - /* CON31 */ - usb3 at 58000 { - status = "okay"; - }; +/* CON3 */ +&sata { + status = "okay"; +}; - /* CON3 */ - sata at e0000 { - status = "okay"; - }; - }; - }; +/* Exported on the micro USB connector CON32 through an FTDI */ +&uart0 { + status = "okay"; }; +/* CON31 */ +&usb3 { + status = "okay"; +};
arch/arm64/boot/dts/marvell/armada-372x.dtsi +0 -1
@@ -59,5 +59,4 @@ enable-method = "psci"; }; }; - };
arch/arm64/boot/dts/marvell/armada-37xx.dtsi +2 -2
@@ -105,14 +105,14 @@ status = "disabled"; }; - usb3 at 58000 { + usb3: usb3 at 58000 { compatible = "generic-xhci"; reg = <0x58000 0x4000>; interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; - sata at e0000 { + sata: sata at e0000 { compatible = "marvell,armada-3700-ahci"; reg = <0xe0000 0x2000>; interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
Signature · 1 line
2.5.0
PATCH 2/3 arm64: dts: marvell: Rename armada-37xx USB node
In reply to Gregory CLEMENTFrom: Andreas F?rber <[email protected]>
No need to reflect the USB version in the node name.
--- 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
@@ -105,7 +105,7 @@ status = "disabled"; }; - usb3: usb3 at 58000 { + usb3: usb at 58000 { compatible = "generic-xhci"; reg = <0x58000 0x4000>; interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
Signature · 1 line
2.5.0
PATCH 3/3 arm64: dts: marvell: Use a SoC-specific compatible for xHCI on Armada37xx
In reply to Gregory CLEMENTEven if the Armada 37xx does not any specific setup, the device tree binding documentation requires to use a SoC-specific version corresponding to the platform first followed by the generic version.
This patch introduce this new compatible string and updates the documentation accordingly.
--- Documentation/devicetree/bindings/usb/usb-xhci.txt | 1 + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/usb/usb-xhci.txt +1 -0
@@ -4,6 +4,7 @@ Required properties: - compatible: should be one or more of - "generic-xhci" for generic XHCI device + - "marvell,armada3700-xhci" for Armada 37xx SoCs - "marvell,armada-375-xhci" for Armada 375 SoCs - "marvell,armada-380-xhci" for Armada 38x SoCs - "renesas,xhci-r8a7790" for r8a7790 SoC
arch/arm64/boot/dts/marvell/armada-37xx.dtsi +2 -1
@@ -106,7 +106,8 @@ }; usb3: usb at 58000 { - compatible = "generic-xhci"; + compatible = "marvell,armada3700-xhci", + "generic-xhci"; reg = <0x58000 0x4000>; interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; status = "disabled";
Signature · 1 line
2.5.0
cover arm64: marvell: few improvment for Armada 37xx device tree
In reply to Gregory CLEMENTHi,
Quoted 8 lines · Gregory CLEMENT
Hi,
This series add few improvement on the dts for Armada 37xx. First it send a second version of the patch from Andreas with the modification initially asked. I also fix the compatibility property for the xHCI node to conform to the documentation.
I just want to let you know that this series was already applied on mvebu/dt64
Gregory
Quoted 21 lines
Thanks,
Gregory
Andreas F?rber (2):
arm64: dts: marvell: Clean up armada-3720-db
arm64: dts: marvell: Rename armada-37xx USB nodeGregory CLEMENT (1):
arm64: dts: marvell: Use a SoC-specific compatible for xHCI on
Armada37xxDocumentation/devicetree/bindings/usb/usb-xhci.txt | 1 + arch/arm64/boot/dts/marvell/armada-3720-db.dts | 32 ++++++++-------------- arch/arm64/boot/dts/marvell/armada-372x.dtsi | 1 - arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 7 +++-- 4 files changed, 17 insertions(+), 24 deletions(-)Signature · 1 line
2.5.0
Signature · 4 lines
Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com