From patchwork Wed Jun 30 07:38:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: qianfan X-Patchwork-Id: 1498765 X-Patchwork-Delegate: andre.przywara@arm.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.a=rsa-sha256 header.s=s110527 header.b=hze2S6+q; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GFCtK2bd1z9sVt for ; Wed, 30 Jun 2021 17:40:09 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 920C383261; Wed, 30 Jun 2021 09:40:05 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.b="hze2S6+q"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 222C383260; Wed, 30 Jun 2021 09:40:03 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from m12-12.163.com (m12-12.163.com [220.181.12.12]) by phobos.denx.de (Postfix) with ESMTP id EEF7583246 for ; Wed, 30 Jun 2021 09:39:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=qianfanguijin@163.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=MKIg8zlVPo8LmrPiMV lkO6HgCA+rNQH0LmWUMTU4MHs=; b=hze2S6+qeBJO2TE+mtOAn8Zq5ll2yA23D3 maG5bYG6A/9rgejYbw0uDpf37E7M4CKJeL2c1eXkK8kqzBe30f/MH4r4xZ5vjzyi +IDH8MkTdIPPJGpuUwnG7BL9VvEeiXX7j2J2kD00+996PoOUKE14gLxeajlrFZg3 tf6A1Ab9c= Received: from localhost.localdomain (unknown [218.201.129.20]) by smtp8 (Coremail) with SMTP id DMCowADnW1GaH9xgCNoZMg--.26388S4; Wed, 30 Jun 2021 15:39:09 +0800 (CST) From: qianfanguijin@163.com To: u-boot@lists.denx.de Cc: wens@csie.org, jagan@amarulasolutions.com, andre.przywara@arm.com, marex@denx.de, qianfan Zhao Subject: [PATCH v2 1/3] phy-sun4i-usb: Fix sun8i_r40_cfg Date: Wed, 30 Jun 2021 15:38:36 +0800 Message-Id: <20210630073838.22668-1-qianfanguijin@163.com> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: DMCowADnW1GaH9xgCNoZMg--.26388S4 X-Coremail-Antispam: 1Uf129KBjvdXoW7Xr43Jw1fZF17Wr1rtF4kXrb_yoW3tFc_uF W8Xrs7XFZ09r98JF17tw4rZ3y09w4xZF4kG3y8tFy5A3W2q3Za93WjqrsrurW3GrW3K3Z8 J345ZF1UC3929jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUUcdb5UUUUU== X-Originating-IP: [218.201.129.20] X-CM-SenderInfo: htld0w5dqj3xxmlqqiywtou0bp/1tbiQh3B7VaD-bWbTQAAs4 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean From: qianfan Zhao the r40 has the same configurations with a33, disable enable_pmu_unk1 and phy0_dual_route feature. Signed-off-by: qianfan Zhao Reviewed-by: Jagan Teki --- 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 patchwork Wed Jun 30 07:38:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: qianfan X-Patchwork-Id: 1498766 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.a=rsa-sha256 header.s=s110527 header.b=anMdCx5U; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GFCtf0D6Hz9sVt for ; Wed, 30 Jun 2021 17:40:25 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9A7918325F; Wed, 30 Jun 2021 09:40:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.b="anMdCx5U"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EC4E28325F; Wed, 30 Jun 2021 09:40:20 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from m12-12.163.com (m12-12.163.com [220.181.12.12]) by phobos.denx.de (Postfix) with ESMTP id AD5FB83264 for ; Wed, 30 Jun 2021 09:40:17 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=qianfanguijin@163.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=5wA+Smux9HArP1mLmB mHCBlykcqY/Q0B0+ks9l3ByUs=; b=anMdCx5UVsudGecIrtwIIzBcP2Kt6lH+uZ scpwHwP/2cOo1MqnPZZXkPUGwX0rc/W4xZN8CN6rNyqNbqi/QutNym3ajCQpTA4m LcWD4jCeoyc2SY6ws0ydhAPb1IW5ZDqDpAuNqe92V+hb/Itq5bsSTzE5CEtfHsd8 MtskAKjq4= Received: from localhost.localdomain (unknown [218.201.129.20]) by smtp8 (Coremail) with SMTP id DMCowADnW1GaH9xgCNoZMg--.26388S5; Wed, 30 Jun 2021 15:39:36 +0800 (CST) From: qianfanguijin@163.com To: u-boot@lists.denx.de Cc: wens@csie.org, jagan@amarulasolutions.com, andre.przywara@arm.com, marex@denx.de, qianfan Zhao Subject: [PATCH 2/3] dts: bpi-m2u: Enable USB_OTG by default Date: Wed, 30 Jun 2021 15:38:37 +0800 Message-Id: <20210630073838.22668-2-qianfanguijin@163.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210630073838.22668-1-qianfanguijin@163.com> References: <20210630073838.22668-1-qianfanguijin@163.com> X-CM-TRANSID: DMCowADnW1GaH9xgCNoZMg--.26388S5 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw17uw48XF17Jry8Zr1rtFb_yoW8Xr4rp3 4UurWkXrW5Ww1rJ34agFWkXa4UCF92gr4qqF93C348Jr1kW34jqryftwnakrZ8Xw48Zw4F vanxJryfWw1DAwUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UrPEhUUUUU= X-Originating-IP: [218.201.129.20] X-CM-SenderInfo: htld0w5dqj3xxmlqqiywtou0bp/xtbBdhjB7VUMRb2DAwAAsj X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean From: qianfan Zhao bpi-m2u has a hardware usb_otg, let's enable it in dts. Signed-off-by: qianfan Zhao --- 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 = ; + 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>, From patchwork Wed Jun 30 07:38:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: qianfan X-Patchwork-Id: 1498767 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.a=rsa-sha256 header.s=s110527 header.b=UZL5ssms; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GFCtr6FzDz9sVt for ; Wed, 30 Jun 2021 17:40:36 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2FF1B83268; Wed, 30 Jun 2021 09:40:34 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.b="UZL5ssms"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9794283269; Wed, 30 Jun 2021 09:40:32 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from m12-12.163.com (m12-12.163.com [220.181.12.12]) by phobos.denx.de (Postfix) with ESMTP id 9CC1283267 for ; Wed, 30 Jun 2021 09:40:28 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=qianfanguijin@163.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=qh0kmuB8gLbG3gSMaf EgyY2BNVFHbqbBcFO5hBx7DxM=; b=UZL5ssmsw3mf/HtGuOLc16wC6reT3uKINo iB8zcacei0gVQ8gIu7wnc9Yz9nkEvVSKkoAH/byXtX27/rKSNi+yyxRH0OfIdmxZ RGEmTthgCd8lqVY2vQX9lDQRmmuxzts1sJgqtWFb+/81qAMHFeJxkFX41oc3DVtm wQu6pQEsg= Received: from localhost.localdomain (unknown [218.201.129.20]) by smtp8 (Coremail) with SMTP id DMCowADnW1GaH9xgCNoZMg--.26388S6; Wed, 30 Jun 2021 15:39:36 +0800 (CST) From: qianfanguijin@163.com To: u-boot@lists.denx.de Cc: wens@csie.org, jagan@amarulasolutions.com, andre.przywara@arm.com, marex@denx.de, qianfan Zhao Subject: [PATCH 3/3] sunxi: defconfig: bpi-m2u: Enable usb gadget and ums by default Date: Wed, 30 Jun 2021 15:38:38 +0800 Message-Id: <20210630073838.22668-3-qianfanguijin@163.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210630073838.22668-1-qianfanguijin@163.com> References: <20210630073838.22668-1-qianfanguijin@163.com> X-CM-TRANSID: DMCowADnW1GaH9xgCNoZMg--.26388S6 X-Coremail-Antispam: 1Uf129KBjvdXoW7Xw18CF48ZFyrWFW7Ar15CFg_yoWkXrc_X3 yxCr18ur45Xr9ruFn3Ww4kZ34Yka4UWr1kCF13tryUXr47KF45Ga4DJ3WUuw15Wa4fKFZr Zay0yay2y3W7tjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU8BOJUUUUUU== X-Originating-IP: [218.201.129.20] X-CM-SenderInfo: htld0w5dqj3xxmlqqiywtou0bp/1tbiQhjB7VaD-bWcQgAAs1 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean From: qianfan Zhao Since the usb otg driver support R40 device, we enable usb gadget functions and ums. Signed-off-by: qianfan Zhao --- 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