From 2cee50bf459051d1b41d0deee25e930a788cb94e Mon Sep 17 00:00:00 2001 From: Neal Liu Date: Mon, 23 May 2022 11:01:33 +0800 Subject: ARM: dts: aspeed: Add USB2.0 device controller node Add USB2.0 device controller(udc) node to device tree for AST2600. Acked-by: Krzysztof Kozlowski Signed-off-by: Neal Liu Link: https://lore.kernel.org/r/20220523030134.2977116-3-neal_liu@aspeedtech.com Signed-off-by: Greg Kroah-Hartman --- arch/arm/boot/dts/aspeed-g6.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'arch/arm') diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi index 6660564855ff..1ccd7bb6fe3c 100644 --- a/arch/arm/boot/dts/aspeed-g6.dtsi +++ b/arch/arm/boot/dts/aspeed-g6.dtsi @@ -317,6 +317,16 @@ status = "disabled"; }; + udc: usb@1e6a2000 { + compatible = "aspeed,ast2600-udc"; + reg = <0x1e6a2000 0x300>; + interrupts = ; + clocks = <&syscon ASPEED_CLK_GATE_USBPORT2CLK>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb2bd_default>; + status = "disabled"; + }; + apb { compatible = "simple-bus"; #address-cells = <1>; -- cgit v1.2.3 From 235a6d80f021d9c3bb5652fb6b19d092a7339248 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 14 Jun 2022 11:27:16 +0200 Subject: Revert "ARM: dts: aspeed: Add USB2.0 device controller node" This reverts commit 2cee50bf459051d1b41d0deee25e930a788cb94e. It was already applied, and with this duplicate there is now build problems. Reported-by: Stephen Rothwell Reported-by: Bagas Sanjaya Signed-off-by: Greg Kroah-Hartman --- arch/arm/boot/dts/aspeed-g6.dtsi | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'arch/arm') diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi index 1ccd7bb6fe3c..6660564855ff 100644 --- a/arch/arm/boot/dts/aspeed-g6.dtsi +++ b/arch/arm/boot/dts/aspeed-g6.dtsi @@ -317,16 +317,6 @@ status = "disabled"; }; - udc: usb@1e6a2000 { - compatible = "aspeed,ast2600-udc"; - reg = <0x1e6a2000 0x300>; - interrupts = ; - clocks = <&syscon ASPEED_CLK_GATE_USBPORT2CLK>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usb2bd_default>; - status = "disabled"; - }; - apb { compatible = "simple-bus"; #address-cells = <1>; -- cgit v1.2.3 From 0d0fb2b605c7512e67b328f3077d24ec5e4c5b38 Mon Sep 17 00:00:00 2001 From: Fabrice Gasnier Date: Tue, 26 Jul 2022 10:07:07 +0200 Subject: ARM: dts: stm32: add support for USB2514B onboard hub on stm32mp15xx-dkx Add support for USB2514B onboard hub on stm32mp15 DK boards. The HUB is supplied by a 3v3 PMIC regulator. Signed-off-by: Fabrice Gasnier Link: https://lore.kernel.org/r/20220726080708.162547-4-fabrice.gasnier@foss.st.com Signed-off-by: Greg Kroah-Hartman --- arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'arch/arm') diff --git a/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi b/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi index 333c2af97130..8b48d3c89a04 100644 --- a/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi +++ b/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi @@ -677,6 +677,14 @@ &usbh_ehci { phys = <&usbphyc_port0>; status = "okay"; + #address-cells = <1>; + #size-cells = <0>; + /* onboard HUB */ + hub@1 { + compatible = "usb424,2514"; + reg = <1>; + vdd-supply = <&v3v3>; + }; }; &usbotg_hs { -- cgit v1.2.3 From 76e960597635ee80d7c713f606b0f6ac9228d98e Mon Sep 17 00:00:00 2001 From: Fabrice Gasnier Date: Tue, 26 Jul 2022 10:07:08 +0200 Subject: ARM: multi_v7_defconfig: enable USB onboard HUB driver Enable the USB onboard HUB driver, used on STM32MP1 boards. Signed-off-by: Fabrice Gasnier Link: https://lore.kernel.org/r/20220726080708.162547-5-fabrice.gasnier@foss.st.com Signed-off-by: Greg Kroah-Hartman --- arch/arm/configs/multi_v7_defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm') diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index ce9826bce29b..d0f16b7f682b 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -861,6 +861,7 @@ CONFIG_USB_CHIPIDEA_UDC=y CONFIG_USB_CHIPIDEA_HOST=y CONFIG_USB_ISP1760=y CONFIG_USB_HSIC_USB3503=y +CONFIG_USB_ONBOARD_HUB=m CONFIG_AB8500_USB=y CONFIG_KEYSTONE_USB_PHY=m CONFIG_NOP_USB_XCEIV=y -- cgit v1.2.3