[PATCH v2 1/3] phy-sun4i-usb: Fix sun8i_r40_cfg
From: qianfan Zhao qianfanguijin@163.com
the r40 has the same configurations with a33, disable enable_pmu_unk1 and phy0_dual_route feature.
Signed-off-by: qianfan Zhao qianfanguijin@163.com --- drivers/phy/allwinner/phy-sun4i-usb.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c index 5723c98032..5ea05a207d 100644 --- a/drivers/phy/allwinner/phy-sun4i-usb.c +++ b/drivers/phy/allwinner/phy-sun4i-usb.c @@ -589,8 +589,6 @@ static const struct sun4i_usb_phy_cfg sun8i_r40_cfg = { .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A33, .dedicated_clocks = true, - .enable_pmu_unk1 = true, - .phy0_dual_route = true, };
static const struct sun4i_usb_phy_cfg sun8i_v3s_cfg = {
From: qianfan Zhao qianfanguijin@163.com
bpi-m2u has a hardware usb_otg, let's enable it in dts.
Signed-off-by: qianfan Zhao qianfanguijin@163.com --- arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts | 5 +++++ arch/arm/dts/sun8i-r40.dtsi | 14 ++++++++++++++ 2 files changed, 19 insertions(+)
diff --git a/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts b/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts index a6a1087a0c..96316f41cb 100644 --- a/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts +++ b/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts @@ -328,6 +328,11 @@ }; };
+&usb_otg { + dr_mode = "peripheral"; + status = "okay"; +}; + &usbphy { usb1_vbus-supply = <®_vcc5v0>; usb2_vbus-supply = <®_vcc5v0>; diff --git a/arch/arm/dts/sun8i-r40.dtsi b/arch/arm/dts/sun8i-r40.dtsi index d5ad3b9efd..3edc849d39 100644 --- a/arch/arm/dts/sun8i-r40.dtsi +++ b/arch/arm/dts/sun8i-r40.dtsi @@ -363,6 +363,20 @@ #size-cells = <0>; };
+ usb_otg: usb@1c13000 { + compatible = "allwinner,sun8i-h3-musb"; + reg = <0x01c13000 0x0400>; + clocks = <&ccu CLK_BUS_OTG>; + resets = <&ccu RST_BUS_OTG>; + interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "mc"; + phys = <&usbphy 0>; + phy-names = "usb"; + extcon = <&usbphy 0>; + dr_mode = "otg"; + status = "disabled"; + }; + usbphy: phy@1c13400 { compatible = "allwinner,sun8i-r40-usb-phy"; reg = <0x01c13400 0x14>,
On Wed, Jun 30, 2021 at 1:09 PM qianfanguijin@163.com wrote:
From: qianfan Zhao qianfanguijin@163.com
bpi-m2u has a hardware usb_otg, let's enable it in dts.
Signed-off-by: qianfan Zhao qianfanguijin@163.com
Better Sync dts from linux instead of intermediate changes.
Jagan.
From: qianfan Zhao qianfanguijin@163.com
Since the usb otg driver support R40 device, we enable usb gadget functions and ums.
Signed-off-by: qianfan Zhao qianfanguijin@163.com --- configs/Bananapi_M2_Ultra_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configs/Bananapi_M2_Ultra_defconfig b/configs/Bananapi_M2_Ultra_defconfig index 37bcb3d7bf..af371702f1 100644 --- a/configs/Bananapi_M2_Ultra_defconfig +++ b/configs/Bananapi_M2_Ultra_defconfig @@ -7,11 +7,11 @@ CONFIG_MACPWR="PA17" CONFIG_MMC0_CD_PIN="PH13" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_USB1_VBUS_PIN="PH23" -CONFIG_USB2_VBUS_PIN="PH23" CONFIG_DEFAULT_DEVICE_TREE="sun8i-r40-bananapi-m2-ultra" CONFIG_AHCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_I2C_SUPPORT=y +CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_SCSI_AHCI=y CONFIG_RGMII=y CONFIG_SUN8I_EMAC=y @@ -20,3 +20,4 @@ CONFIG_AXP_ELDO3_VOLT=1200 CONFIG_SCSI=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_OHCI_HCD=y +CONFIG_USB_MUSB_GADGET=y
On Wed, Jun 30, 2021 at 1:09 PM qianfanguijin@163.com wrote:
From: qianfan Zhao qianfanguijin@163.com
the r40 has the same configurations with a33, disable enable_pmu_unk1 and phy0_dual_route feature.
Signed-off-by: qianfan Zhao qianfanguijin@163.com
Reviewed-by: Jagan Teki jagan@amarulasolutions.com
participants (2)
-
Jagan Teki -
qianfanguijin＠163.com