* [PATCH 1/2] ARM: dts: Add Aspeed SoC USB controllers to device-tree
@ 2018-04-13 4:40 Benjamin Herrenschmidt
2018-04-13 4:40 ` [PATCH 2/2] ARM: dts: Aspeed: Enable USB ports on eval board Benjamin Herrenschmidt
2018-04-13 5:22 ` [PATCH 1/2] ARM: dts: Add Aspeed SoC USB controllers to device-tree Andrew Jeffery
0 siblings, 2 replies; 4+ messages in thread
From: Benjamin Herrenschmidt @ 2018-04-13 4:40 UTC (permalink / raw)
To: linux-aspeed
This adds the USB controllers to the DT template of the
AST24xx and AST25xx SoCs.
This patch doesn't enable them by default on any board specific
.dts yet. This will be done when we have the necessary clock/reset
and pinmux support. In the meantime though, this will work if
u-boot configures things properly.
For the AST2400 I only added pinmux definition for port 1
which is dual USB1/USB2. There are additional USB1 only ports
that might require more work but I don't have HW to test at
hand so I'm leaving that to whoever cares.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
arch/arm/boot/dts/aspeed-g4.dtsi | 27 +++++++++++++++++++++++++++
arch/arm/boot/dts/aspeed-g5.dtsi | 40 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 67 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index ae2b8c952e80..c318e481db78 100644
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -108,6 +108,23 @@
status = "disabled";
};
+ ehci0: usb at 1e6a1000 {
+ compatible = "aspeed,ast2400-ehci", "generic-ehci";
+ reg = <0x1e6a1000 0x100>;
+ interrupts = <5>;
+ clocks = <&syscon ASPEED_CLK_GATE_USBPORT1CLK>;
+ status = "disabled";
+ };
+
+ uhci: usb at 1e6b0000 {
+ compatible = "aspeed,ast2400-uhci", "generic-uhci";
+ reg = <0x1e6b0000 0x100>;
+ interrupts = <14>;
+ #ports = <3>;
+ clocks = <&syscon ASPEED_CLK_GATE_USBUHCICLK>;
+ status = "disabled";
+ };
+
apb {
compatible = "simple-bus";
#address-cells = <1>;
@@ -1232,6 +1249,16 @@
groups = "USBCKI";
};
+ pinctrl_usb2h_default: usb2h_default {
+ function = "USB2H1";
+ groups = "USB2H1";
+ };
+
+ pinctrl_usb2d_default: usb2d_default {
+ function = "USB2D1";
+ groups = "USB2D1";
+ };
+
pinctrl_vgabios_rom_default: vgabios_rom_default {
function = "VGABIOS_ROM";
groups = "VGABIOS_ROM";
diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index 2477ebc11d9d..cebc19809174 100644
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -143,6 +143,31 @@
status = "disabled";
};
+ ehci0: usb at 1e6a1000 {
+ compatible = "aspeed,ast2500-ehci", "generic-ehci";
+ reg = <0x1e6a1000 0x100>;
+ interrupts = <5>;
+ clocks = <&syscon ASPEED_CLK_GATE_USBPORT1CLK>;
+ status = "disabled";
+ };
+
+ ehci1: usb at 1e6a3000 {
+ compatible = "aspeed,ast2500-ehci", "generic-ehci";
+ reg = <0x1e6a3000 0x100>;
+ interrupts = <13>;
+ clocks = <&syscon ASPEED_CLK_GATE_USBPORT2CLK>;
+ status = "disabled";
+ };
+
+ uhci: usb at 1e6b0000 {
+ compatible = "aspeed,ast2500-uhci", "generic-uhci";
+ reg = <0x1e6b0000 0x100>;
+ interrupts = <14>;
+ #ports = <2>;
+ clocks = <&syscon ASPEED_CLK_GATE_USBUHCICLK>;
+ status = "disabled";
+ };
+
apb {
compatible = "simple-bus";
#address-cells = <1>;
@@ -1363,6 +1388,21 @@
groups = "USBCKI";
};
+ pinctrl_usb2ah_default: usb2ah_default {
+ function = "USB2AH";
+ groups = "USB2AH";
+ };
+
+ pinctrl_usb11bhid_default: usb11bhid_default {
+ function = "USB11BHID";
+ groups = "USB11BHID";
+ };
+
+ pinctrl_usb2bh_default: usb2bh_default {
+ function = "USB2BH";
+ groups = "USB2BH";
+ };
+
pinctrl_vgabiosrom_default: vgabiosrom_default {
function = "VGABIOSROM";
groups = "VGABIOSROM";
--
2.14.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] ARM: dts: Aspeed: Enable USB ports on eval board.
2018-04-13 4:40 [PATCH 1/2] ARM: dts: Add Aspeed SoC USB controllers to device-tree Benjamin Herrenschmidt
@ 2018-04-13 4:40 ` Benjamin Herrenschmidt
2018-04-13 5:24 ` Andrew Jeffery
2018-04-13 5:22 ` [PATCH 1/2] ARM: dts: Add Aspeed SoC USB controllers to device-tree Andrew Jeffery
1 sibling, 1 reply; 4+ messages in thread
From: Benjamin Herrenschmidt @ 2018-04-13 4:40 UTC (permalink / raw)
To: linux-aspeed
This enables both USB ports as host with EHCI and UHCI
attached to them.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
arch/arm/boot/dts/aspeed-ast2500-evb.dts | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed-ast2500-evb.dts b/arch/arm/boot/dts/aspeed-ast2500-evb.dts
index 6946c8610c4c..0c3f14d05046 100644
--- a/arch/arm/boot/dts/aspeed-ast2500-evb.dts
+++ b/arch/arm/boot/dts/aspeed-ast2500-evb.dts
@@ -80,3 +80,21 @@
reg = <0x4d>;
};
};
+
+&ehci0 {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usb2ah_default>;
+};
+
+&ehci1 {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usb2bh_default>;
+};
+
+&uhci {
+ status = "okay";
+
+ /* No pinctrl, this follows the above EHCI settings */
+};
--
2.14.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] ARM: dts: Aspeed: Enable USB ports on eval board.
2018-04-13 4:40 ` [PATCH 2/2] ARM: dts: Aspeed: Enable USB ports on eval board Benjamin Herrenschmidt
@ 2018-04-13 5:24 ` Andrew Jeffery
0 siblings, 0 replies; 4+ messages in thread
From: Andrew Jeffery @ 2018-04-13 5:24 UTC (permalink / raw)
To: linux-aspeed
On Fri, 13 Apr 2018, at 14:10, Benjamin Herrenschmidt wrote:
> This enables both USB ports as host with EHCI and UHCI
> attached to them.
>
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
> ---
> arch/arm/boot/dts/aspeed-ast2500-evb.dts | 18 ++++++++++++++++++
> 1 file changed, 18 insertions(+)
>
> diff --git a/arch/arm/boot/dts/aspeed-ast2500-evb.dts b/arch/arm/boot/
> dts/aspeed-ast2500-evb.dts
> index 6946c8610c4c..0c3f14d05046 100644
> --- a/arch/arm/boot/dts/aspeed-ast2500-evb.dts
> +++ b/arch/arm/boot/dts/aspeed-ast2500-evb.dts
> @@ -80,3 +80,21 @@
> reg = <0x4d>;
> };
> };
> +
> +&ehci0 {
> + status = "okay";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_usb2ah_default>;
> +};
> +
> +&ehci1 {
> + status = "okay";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_usb2bh_default>;
> +};
> +
> +&uhci {
> + status = "okay";
> +
> + /* No pinctrl, this follows the above EHCI settings */
> +};
> --
> 2.14.3
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] ARM: dts: Add Aspeed SoC USB controllers to device-tree
2018-04-13 4:40 [PATCH 1/2] ARM: dts: Add Aspeed SoC USB controllers to device-tree Benjamin Herrenschmidt
2018-04-13 4:40 ` [PATCH 2/2] ARM: dts: Aspeed: Enable USB ports on eval board Benjamin Herrenschmidt
@ 2018-04-13 5:22 ` Andrew Jeffery
1 sibling, 0 replies; 4+ messages in thread
From: Andrew Jeffery @ 2018-04-13 5:22 UTC (permalink / raw)
To: linux-aspeed
On Fri, 13 Apr 2018, at 14:10, Benjamin Herrenschmidt wrote:
> This adds the USB controllers to the DT template of the
> AST24xx and AST25xx SoCs.
>
> This patch doesn't enable them by default on any board specific
> .dts yet. This will be done when we have the necessary clock/reset
> and pinmux support. In the meantime though, this will work if
> u-boot configures things properly.
>
> For the AST2400 I only added pinmux definition for port 1
> which is dual USB1/USB2. There are additional USB1 only ports
> that might require more work but I don't have HW to test at
> hand so I'm leaving that to whoever cares.
>
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
> ---
> arch/arm/boot/dts/aspeed-g4.dtsi | 27 +++++++++++++++++++++++++++
> arch/arm/boot/dts/aspeed-g5.dtsi | 40 ++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 67 insertions(+)
>
> diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
> index ae2b8c952e80..c318e481db78 100644
> --- a/arch/arm/boot/dts/aspeed-g4.dtsi
> +++ b/arch/arm/boot/dts/aspeed-g4.dtsi
> @@ -108,6 +108,23 @@
> status = "disabled";
> };
>
> + ehci0: usb at 1e6a1000 {
> + compatible = "aspeed,ast2400-ehci", "generic-ehci";
> + reg = <0x1e6a1000 0x100>;
> + interrupts = <5>;
> + clocks = <&syscon ASPEED_CLK_GATE_USBPORT1CLK>;
> + status = "disabled";
> + };
> +
> + uhci: usb at 1e6b0000 {
> + compatible = "aspeed,ast2400-uhci", "generic-uhci";
> + reg = <0x1e6b0000 0x100>;
> + interrupts = <14>;
> + #ports = <3>;
> + clocks = <&syscon ASPEED_CLK_GATE_USBUHCICLK>;
> + status = "disabled";
> + };
> +
> apb {
> compatible = "simple-bus";
> #address-cells = <1>;
> @@ -1232,6 +1249,16 @@
> groups = "USBCKI";
> };
>
> + pinctrl_usb2h_default: usb2h_default {
> + function = "USB2H1";
> + groups = "USB2H1";
> + };
> +
> + pinctrl_usb2d_default: usb2d_default {
> + function = "USB2D1";
> + groups = "USB2D1";
> + };
> +
> pinctrl_vgabios_rom_default: vgabios_rom_default {
> function = "VGABIOS_ROM";
> groups = "VGABIOS_ROM";
> diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
> index 2477ebc11d9d..cebc19809174 100644
> --- a/arch/arm/boot/dts/aspeed-g5.dtsi
> +++ b/arch/arm/boot/dts/aspeed-g5.dtsi
> @@ -143,6 +143,31 @@
> status = "disabled";
> };
>
> + ehci0: usb at 1e6a1000 {
> + compatible = "aspeed,ast2500-ehci", "generic-ehci";
> + reg = <0x1e6a1000 0x100>;
> + interrupts = <5>;
> + clocks = <&syscon ASPEED_CLK_GATE_USBPORT1CLK>;
> + status = "disabled";
> + };
> +
> + ehci1: usb at 1e6a3000 {
> + compatible = "aspeed,ast2500-ehci", "generic-ehci";
> + reg = <0x1e6a3000 0x100>;
> + interrupts = <13>;
> + clocks = <&syscon ASPEED_CLK_GATE_USBPORT2CLK>;
> + status = "disabled";
> + };
> +
> + uhci: usb at 1e6b0000 {
> + compatible = "aspeed,ast2500-uhci", "generic-uhci";
> + reg = <0x1e6b0000 0x100>;
> + interrupts = <14>;
> + #ports = <2>;
> + clocks = <&syscon ASPEED_CLK_GATE_USBUHCICLK>;
> + status = "disabled";
> + };
> +
> apb {
> compatible = "simple-bus";
> #address-cells = <1>;
> @@ -1363,6 +1388,21 @@
> groups = "USBCKI";
> };
>
> + pinctrl_usb2ah_default: usb2ah_default {
> + function = "USB2AH";
> + groups = "USB2AH";
> + };
> +
> + pinctrl_usb11bhid_default: usb11bhid_default {
> + function = "USB11BHID";
> + groups = "USB11BHID";
> + };
> +
> + pinctrl_usb2bh_default: usb2bh_default {
> + function = "USB2BH";
> + groups = "USB2BH";
> + };
> +
> pinctrl_vgabiosrom_default: vgabiosrom_default {
> function = "VGABIOSROM";
> groups = "VGABIOSROM";
> --
> 2.14.3
>
--
Andrew Jeffery
andrew at aj.id.au
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-04-13 5:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-13 4:40 [PATCH 1/2] ARM: dts: Add Aspeed SoC USB controllers to device-tree Benjamin Herrenschmidt
2018-04-13 4:40 ` [PATCH 2/2] ARM: dts: Aspeed: Enable USB ports on eval board Benjamin Herrenschmidt
2018-04-13 5:24 ` Andrew Jeffery
2018-04-13 5:22 ` [PATCH 1/2] ARM: dts: Add Aspeed SoC USB controllers to device-tree Andrew Jeffery
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).