* [U-Boot] Enable USB host controller on Odroid-C2
@ 2019-08-18 13:42 Beniamino Galvani
2019-08-18 13:42 ` [U-Boot] [PATCH 1/2] phy: meson: add GXBB PHY driver Beniamino Galvani
` (3 more replies)
0 siblings, 4 replies; 19+ messages in thread
From: Beniamino Galvani @ 2019-08-18 13:42 UTC (permalink / raw)
To: u-boot
Hi,
these two patches enable the USB host controller on Odroid-C2. The
first patch adds a PHY driver; the second one enables the necessary
configuration options and updates the device tree.
Note that the DWC2 driver currently does not support enabling PHYs
from the device tree and so the following series (still on review) is
needed as runtime requirement for the second patch:
[PATCH 0/5] usb: host: dwc2: use driver model for PHY and CLOCK
Thanks,
Beniamino
Beniamino Galvani (2):
phy: meson: add GXBB PHY driver
odroid-c2: enable USB host controller
arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi | 8 +
configs/odroid-c2_defconfig | 7 +
drivers/phy/Kconfig | 8 +
drivers/phy/Makefile | 1 +
drivers/phy/meson-gxbb-usb2.c | 235 +++++++++++++++++++
include/configs/meson64.h | 5 +
6 files changed, 264 insertions(+)
create mode 100644 drivers/phy/meson-gxbb-usb2.c
--
2.21.0
^ permalink raw reply [flat|nested] 19+ messages in thread
* [U-Boot] [PATCH 1/2] phy: meson: add GXBB PHY driver
2019-08-18 13:42 [U-Boot] Enable USB host controller on Odroid-C2 Beniamino Galvani
@ 2019-08-18 13:42 ` Beniamino Galvani
2019-08-19 7:16 ` Neil Armstrong
2020-04-24 7:20 ` Neil Armstrong
2019-08-18 13:42 ` [U-Boot] [PATCH 2/2] odroid-c2: enable USB host controller Beniamino Galvani
` (2 subsequent siblings)
3 siblings, 2 replies; 19+ messages in thread
From: Beniamino Galvani @ 2019-08-18 13:42 UTC (permalink / raw)
To: u-boot
This adds support for the USB PHY found on Amlogic GXBB SoCs.
Signed-off-by: Beniamino Galvani <b.galvani@gmail.com>
---
drivers/phy/Kconfig | 8 ++
drivers/phy/Makefile | 1 +
drivers/phy/meson-gxbb-usb2.c | 235 ++++++++++++++++++++++++++++++++++
3 files changed, 244 insertions(+)
create mode 100644 drivers/phy/meson-gxbb-usb2.c
diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index 3942f035eb..2190f6f970 100644
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -154,6 +154,14 @@ config PHY_STM32_USBPHYC
between an HS USB OTG controller and an HS USB Host controller,
selected by an USB switch.
+config MESON_GXBB_USB_PHY
+ bool "Amlogic Meson GXBB USB PHY"
+ depends on PHY && ARCH_MESON && MESON_GXBB
+ imply REGMAP
+ help
+ This is the generic phy driver for the Amlogic Meson GXBB
+ USB2 PHY.
+
config MESON_GXL_USB_PHY
bool "Amlogic Meson GXL USB PHYs"
depends on PHY && ARCH_MESON && (MESON_GXL || MESON_GXM)
diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
index 3157f1b7ee..dde3b0ecef 100644
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_STI_USB_PHY) += sti_usb_phy.o
obj-$(CONFIG_PHY_RCAR_GEN2) += phy-rcar-gen2.o
obj-$(CONFIG_PHY_RCAR_GEN3) += phy-rcar-gen3.o
obj-$(CONFIG_PHY_STM32_USBPHYC) += phy-stm32-usbphyc.o
+obj-$(CONFIG_MESON_GXBB_USB_PHY) += meson-gxbb-usb2.o
obj-$(CONFIG_MESON_GXL_USB_PHY) += meson-gxl-usb2.o meson-gxl-usb3.o
obj-$(CONFIG_MESON_G12A_USB_PHY) += meson-g12a-usb2.o meson-g12a-usb3-pcie.o
obj-$(CONFIG_MSM8916_USB_PHY) += msm8916-usbh-phy.o
diff --git a/drivers/phy/meson-gxbb-usb2.c b/drivers/phy/meson-gxbb-usb2.c
new file mode 100644
index 0000000000..88c2ec69b2
--- /dev/null
+++ b/drivers/phy/meson-gxbb-usb2.c
@@ -0,0 +1,235 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Meson8, Meson8b and GXBB USB2 PHY driver
+ *
+ * Copyright (C) 2016 Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+ * Copyright (C) 2018 BayLibre, SAS
+ *
+ * Author: Beniamino Galvani <b.galvani@gmail.com>
+ */
+
+#include <common.h>
+#include <clk.h>
+#include <dm.h>
+#include <generic-phy.h>
+#include <power/regulator.h>
+#include <regmap.h>
+#include <reset.h>
+
+#define REG_CONFIG 0x00
+ #define REG_CONFIG_CLK_EN BIT(0)
+ #define REG_CONFIG_CLK_SEL_MASK GENMASK(3, 1)
+ #define REG_CONFIG_CLK_DIV_MASK GENMASK(10, 4)
+ #define REG_CONFIG_CLK_32k_ALTSEL BIT(15)
+ #define REG_CONFIG_TEST_TRIG BIT(31)
+
+#define REG_CTRL 0x04
+ #define REG_CTRL_SOFT_PRST BIT(0)
+ #define REG_CTRL_SOFT_HRESET BIT(1)
+ #define REG_CTRL_SS_SCALEDOWN_MODE_MASK GENMASK(3, 2)
+ #define REG_CTRL_CLK_DET_RST BIT(4)
+ #define REG_CTRL_INTR_SEL BIT(5)
+ #define REG_CTRL_CLK_DETECTED BIT(8)
+ #define REG_CTRL_SOF_SENT_RCVD_TGL BIT(9)
+ #define REG_CTRL_SOF_TOGGLE_OUT BIT(10)
+ #define REG_CTRL_POWER_ON_RESET BIT(15)
+ #define REG_CTRL_SLEEPM BIT(16)
+ #define REG_CTRL_TX_BITSTUFF_ENN_H BIT(17)
+ #define REG_CTRL_TX_BITSTUFF_ENN BIT(18)
+ #define REG_CTRL_COMMON_ON BIT(19)
+ #define REG_CTRL_REF_CLK_SEL_MASK GENMASK(21, 20)
+ #define REG_CTRL_REF_CLK_SEL_SHIFT 20
+ #define REG_CTRL_FSEL_MASK GENMASK(24, 22)
+ #define REG_CTRL_FSEL_SHIFT 22
+ #define REG_CTRL_PORT_RESET BIT(25)
+ #define REG_CTRL_THREAD_ID_MASK GENMASK(31, 26)
+
+/* bits [31:26], [24:21] and [15:3] seem to be read-only */
+#define REG_ADP_BC 0x0c
+ #define REG_ADP_BC_VBUS_VLD_EXT_SEL BIT(0)
+ #define REG_ADP_BC_VBUS_VLD_EXT BIT(1)
+ #define REG_ADP_BC_OTG_DISABLE BIT(2)
+ #define REG_ADP_BC_ID_PULLUP BIT(3)
+ #define REG_ADP_BC_DRV_VBUS BIT(4)
+ #define REG_ADP_BC_ADP_PRB_EN BIT(5)
+ #define REG_ADP_BC_ADP_DISCHARGE BIT(6)
+ #define REG_ADP_BC_ADP_CHARGE BIT(7)
+ #define REG_ADP_BC_SESS_END BIT(8)
+ #define REG_ADP_BC_DEVICE_SESS_VLD BIT(9)
+ #define REG_ADP_BC_B_VALID BIT(10)
+ #define REG_ADP_BC_A_VALID BIT(11)
+ #define REG_ADP_BC_ID_DIG BIT(12)
+ #define REG_ADP_BC_VBUS_VALID BIT(13)
+ #define REG_ADP_BC_ADP_PROBE BIT(14)
+ #define REG_ADP_BC_ADP_SENSE BIT(15)
+ #define REG_ADP_BC_ACA_ENABLE BIT(16)
+ #define REG_ADP_BC_DCD_ENABLE BIT(17)
+ #define REG_ADP_BC_VDAT_DET_EN_B BIT(18)
+ #define REG_ADP_BC_VDAT_SRC_EN_B BIT(19)
+ #define REG_ADP_BC_CHARGE_SEL BIT(20)
+ #define REG_ADP_BC_CHARGE_DETECT BIT(21)
+ #define REG_ADP_BC_ACA_PIN_RANGE_C BIT(22)
+ #define REG_ADP_BC_ACA_PIN_RANGE_B BIT(23)
+ #define REG_ADP_BC_ACA_PIN_RANGE_A BIT(24)
+ #define REG_ADP_BC_ACA_PIN_GND BIT(25)
+ #define REG_ADP_BC_ACA_PIN_FLOAT BIT(26)
+
+#define RESET_COMPLETE_TIME 500
+#define ACA_ENABLE_COMPLETE_TIME 50
+
+struct phy_meson_gxbb_usb2_priv {
+ struct regmap *regmap;
+ struct reset_ctl_bulk resets;
+#if CONFIG_IS_ENABLED(DM_REGULATOR)
+ struct udevice *phy_supply;
+#endif
+};
+
+static int phy_meson_gxbb_usb2_power_on(struct phy *phy)
+{
+ struct udevice *dev = phy->dev;
+ struct phy_meson_gxbb_usb2_priv *priv = dev_get_priv(dev);
+ uint val;
+
+#if CONFIG_IS_ENABLED(DM_REGULATOR)
+ if (priv->phy_supply) {
+ int ret = regulator_set_enable(priv->phy_supply, true);
+
+ if (ret)
+ return ret;
+ }
+#endif
+
+ regmap_update_bits(priv->regmap, REG_CONFIG,
+ REG_CONFIG_CLK_32k_ALTSEL,
+ REG_CONFIG_CLK_32k_ALTSEL);
+ regmap_update_bits(priv->regmap, REG_CTRL,
+ REG_CTRL_REF_CLK_SEL_MASK,
+ 0x2 << REG_CTRL_REF_CLK_SEL_SHIFT);
+ regmap_update_bits(priv->regmap, REG_CTRL,
+ REG_CTRL_FSEL_MASK,
+ 0x5 << REG_CTRL_FSEL_SHIFT);
+
+ /* reset the PHY */
+ regmap_update_bits(priv->regmap, REG_CTRL,
+ REG_CTRL_POWER_ON_RESET,
+ REG_CTRL_POWER_ON_RESET);
+ udelay(RESET_COMPLETE_TIME);
+ regmap_update_bits(priv->regmap, REG_CTRL,
+ REG_CTRL_POWER_ON_RESET,
+ 0);
+ udelay(RESET_COMPLETE_TIME);
+
+ regmap_update_bits(priv->regmap, REG_CTRL,
+ REG_CTRL_SOF_TOGGLE_OUT,
+ REG_CTRL_SOF_TOGGLE_OUT);
+
+ /* Set host mode */
+ regmap_update_bits(priv->regmap, REG_ADP_BC,
+ REG_ADP_BC_ACA_ENABLE,
+ REG_ADP_BC_ACA_ENABLE);
+ udelay(ACA_ENABLE_COMPLETE_TIME);
+
+ regmap_read(priv->regmap, REG_ADP_BC, &val);
+ if (val & REG_ADP_BC_ACA_PIN_FLOAT) {
+ pr_err("Error powering on GXBB USB PHY\n");
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int phy_meson_gxbb_usb2_power_off(struct phy *phy)
+{
+#if CONFIG_IS_ENABLED(DM_REGULATOR)
+ struct udevice *dev = phy->dev;
+ struct phy_meson_gxbb_usb2_priv *priv = dev_get_priv(dev);
+
+ if (priv->phy_supply) {
+ int ret = regulator_set_enable(priv->phy_supply, false);
+
+ if (ret)
+ return ret;
+ }
+#endif
+
+ return 0;
+}
+
+static struct phy_ops meson_gxbb_usb2_phy_ops = {
+ .power_on = phy_meson_gxbb_usb2_power_on,
+ .power_off = phy_meson_gxbb_usb2_power_off,
+};
+
+static int meson_gxbb_usb2_phy_probe(struct udevice *dev)
+{
+ struct phy_meson_gxbb_usb2_priv *priv = dev_get_priv(dev);
+ struct clk clk_usb_general, clk_usb;
+ int ret;
+
+ ret = regmap_init_mem(dev_ofnode(dev), &priv->regmap);
+ if (ret)
+ return ret;
+
+ ret = clk_get_by_name(dev, "usb_general", &clk_usb_general);
+ if (ret)
+ return ret;
+
+ ret = clk_enable(&clk_usb_general);
+ if (ret && ret != -ENOSYS && ret != -ENOTSUPP) {
+ pr_err("Failed to enable PHY general clock\n");
+ return ret;
+ }
+
+ ret = clk_get_by_name(dev, "usb", &clk_usb);
+ if (ret)
+ return ret;
+
+ ret = clk_enable(&clk_usb);
+ if (ret && ret != -ENOSYS && ret != -ENOTSUPP) {
+ pr_err("Failed to enable PHY clock\n");
+ return ret;
+ }
+
+#if CONFIG_IS_ENABLED(DM_REGULATOR)
+ ret = device_get_supply_regulator(dev, "phy-supply", &priv->phy_supply);
+ if (ret && ret != -ENOENT) {
+ pr_err("Failed to get PHY regulator\n");
+ return ret;
+ }
+#endif
+ ret = reset_get_bulk(dev, &priv->resets);
+ if (!ret) {
+ ret = reset_deassert_bulk(&priv->resets);
+ if (ret) {
+ pr_err("Failed to deassert reset\n");
+ return ret;
+ }
+ }
+
+ return 0;
+}
+
+static int meson_gxbb_usb2_phy_remove(struct udevice *dev)
+{
+ struct phy_meson_gxbb_usb2_priv *priv = dev_get_priv(dev);
+
+ return reset_release_bulk(&priv->resets);
+}
+
+static const struct udevice_id meson_gxbb_usb2_phy_ids[] = {
+ { .compatible = "amlogic,meson8-usb2-phy" },
+ { .compatible = "amlogic,meson8b-usb2-phy" },
+ { .compatible = "amlogic,meson-gxbb-usb2-phy" },
+ { }
+};
+
+U_BOOT_DRIVER(meson_gxbb_usb2_phy) = {
+ .name = "meson_gxbb_usb2_phy",
+ .id = UCLASS_PHY,
+ .of_match = meson_gxbb_usb2_phy_ids,
+ .probe = meson_gxbb_usb2_phy_probe,
+ .remove = meson_gxbb_usb2_phy_remove,
+ .ops = &meson_gxbb_usb2_phy_ops,
+ .priv_auto_alloc_size = sizeof(struct phy_meson_gxbb_usb2_priv),
+};
--
2.21.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [U-Boot] [PATCH 2/2] odroid-c2: enable USB host controller
2019-08-18 13:42 [U-Boot] Enable USB host controller on Odroid-C2 Beniamino Galvani
2019-08-18 13:42 ` [U-Boot] [PATCH 1/2] phy: meson: add GXBB PHY driver Beniamino Galvani
@ 2019-08-18 13:42 ` Beniamino Galvani
2020-05-10 14:08 ` Beniamino Galvani
2019-08-28 8:22 ` Neil Armstrong
2020-03-27 13:35 ` Neil Armstrong
3 siblings, 1 reply; 19+ messages in thread
From: Beniamino Galvani @ 2019-08-18 13:42 UTC (permalink / raw)
To: u-boot
Enable the second USB controller, which is connected to a hub with 4
ports. The first controller is for the OTG port and is currently not
supported.
Signed-off-by: Beniamino Galvani <b.galvani@gmail.com>
---
arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi | 8 ++++++++
configs/odroid-c2_defconfig | 7 +++++++
include/configs/meson64.h | 5 +++++
3 files changed, 20 insertions(+)
diff --git a/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi b/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi
index c35158d7e9..484b40504d 100644
--- a/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi
+++ b/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi
@@ -5,3 +5,11 @@
*/
#include "meson-gx-u-boot.dtsi"
+
+&usb0 {
+ status = "disabled";
+};
+
+&usb1 {
+ hnp-srp-disable;
+};
diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig
index 8849058d33..366ea125af 100644
--- a/configs/odroid-c2_defconfig
+++ b/configs/odroid-c2_defconfig
@@ -16,6 +16,7 @@ CONFIG_CMD_GPIO=y
CONFIG_CMD_I2C=y
# CONFIG_CMD_LOADS is not set
CONFIG_CMD_MMC=y
+CONFIG_CMD_USB=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_REGULATOR=y
CONFIG_OF_CONTROL=y
@@ -29,13 +30,19 @@ CONFIG_MMC_MESON_GX=y
CONFIG_PHY_REALTEK=y
CONFIG_DM_ETH=y
CONFIG_ETH_DESIGNWARE=y
+CONFIG_PHY=y
+CONFIG_MESON_GXBB_USB_PHY=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_MESON_GXBB=y
CONFIG_DM_REGULATOR=y
CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_REGULATOR_GPIO=y
CONFIG_DM_RESET=y
CONFIG_DEBUG_UART_MESON=y
CONFIG_DEBUG_UART_ANNOUNCE=y
CONFIG_DEBUG_UART_SKIP_INIT=y
CONFIG_MESON_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USB_DWC2=y
CONFIG_OF_LIBFDT_OVERLAY=y
diff --git a/include/configs/meson64.h b/include/configs/meson64.h
index f8d3eee292..483a8f567c 100644
--- a/include/configs/meson64.h
+++ b/include/configs/meson64.h
@@ -16,6 +16,11 @@
#define GICC_BASE 0xc4302000
#endif
+/* USB */
+#if defined(CONFIG_MESON_GXBB)
+#define CONFIG_DWC2_UTMI_WIDTH 16
+#endif
+
/* For splashscreen */
#ifdef CONFIG_DM_VIDEO
#define CONFIG_VIDEO_BMP_RLE8
--
2.21.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [U-Boot] [PATCH 1/2] phy: meson: add GXBB PHY driver
2019-08-18 13:42 ` [U-Boot] [PATCH 1/2] phy: meson: add GXBB PHY driver Beniamino Galvani
@ 2019-08-19 7:16 ` Neil Armstrong
2020-04-24 7:20 ` Neil Armstrong
1 sibling, 0 replies; 19+ messages in thread
From: Neil Armstrong @ 2019-08-19 7:16 UTC (permalink / raw)
To: u-boot
On 18/08/2019 15:42, Beniamino Galvani wrote:
> This adds support for the USB PHY found on Amlogic GXBB SoCs.
>
> Signed-off-by: Beniamino Galvani <b.galvani@gmail.com>
> ---
> drivers/phy/Kconfig | 8 ++
> drivers/phy/Makefile | 1 +
> drivers/phy/meson-gxbb-usb2.c | 235 ++++++++++++++++++++++++++++++++++
> 3 files changed, 244 insertions(+)
> create mode 100644 drivers/phy/meson-gxbb-usb2.c
>
> diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
> index 3942f035eb..2190f6f970 100644
> --- a/drivers/phy/Kconfig
> +++ b/drivers/phy/Kconfig
> @@ -154,6 +154,14 @@ config PHY_STM32_USBPHYC
> between an HS USB OTG controller and an HS USB Host controller,
> selected by an USB switch.
>
> +config MESON_GXBB_USB_PHY
> + bool "Amlogic Meson GXBB USB PHY"
> + depends on PHY && ARCH_MESON && MESON_GXBB
> + imply REGMAP
> + help
> + This is the generic phy driver for the Amlogic Meson GXBB
> + USB2 PHY.
> +
> config MESON_GXL_USB_PHY
> bool "Amlogic Meson GXL USB PHYs"
> depends on PHY && ARCH_MESON && (MESON_GXL || MESON_GXM)
> diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
> index 3157f1b7ee..dde3b0ecef 100644
> --- a/drivers/phy/Makefile
> +++ b/drivers/phy/Makefile
> @@ -16,6 +16,7 @@ obj-$(CONFIG_STI_USB_PHY) += sti_usb_phy.o
> obj-$(CONFIG_PHY_RCAR_GEN2) += phy-rcar-gen2.o
> obj-$(CONFIG_PHY_RCAR_GEN3) += phy-rcar-gen3.o
> obj-$(CONFIG_PHY_STM32_USBPHYC) += phy-stm32-usbphyc.o
> +obj-$(CONFIG_MESON_GXBB_USB_PHY) += meson-gxbb-usb2.o
> obj-$(CONFIG_MESON_GXL_USB_PHY) += meson-gxl-usb2.o meson-gxl-usb3.o
> obj-$(CONFIG_MESON_G12A_USB_PHY) += meson-g12a-usb2.o meson-g12a-usb3-pcie.o
> obj-$(CONFIG_MSM8916_USB_PHY) += msm8916-usbh-phy.o
> diff --git a/drivers/phy/meson-gxbb-usb2.c b/drivers/phy/meson-gxbb-usb2.c
> new file mode 100644
> index 0000000000..88c2ec69b2
> --- /dev/null
> +++ b/drivers/phy/meson-gxbb-usb2.c
> @@ -0,0 +1,235 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Meson8, Meson8b and GXBB USB2 PHY driver
> + *
> + * Copyright (C) 2016 Martin Blumenstingl <martin.blumenstingl@googlemail.com>
> + * Copyright (C) 2018 BayLibre, SAS
> + *
> + * Author: Beniamino Galvani <b.galvani@gmail.com>
> + */
> +
> +#include <common.h>
> +#include <clk.h>
> +#include <dm.h>
> +#include <generic-phy.h>
> +#include <power/regulator.h>
> +#include <regmap.h>
> +#include <reset.h>
> +
> +#define REG_CONFIG 0x00
> + #define REG_CONFIG_CLK_EN BIT(0)
> + #define REG_CONFIG_CLK_SEL_MASK GENMASK(3, 1)
> + #define REG_CONFIG_CLK_DIV_MASK GENMASK(10, 4)
> + #define REG_CONFIG_CLK_32k_ALTSEL BIT(15)
> + #define REG_CONFIG_TEST_TRIG BIT(31)
> +
> +#define REG_CTRL 0x04
> + #define REG_CTRL_SOFT_PRST BIT(0)
> + #define REG_CTRL_SOFT_HRESET BIT(1)
> + #define REG_CTRL_SS_SCALEDOWN_MODE_MASK GENMASK(3, 2)
> + #define REG_CTRL_CLK_DET_RST BIT(4)
> + #define REG_CTRL_INTR_SEL BIT(5)
> + #define REG_CTRL_CLK_DETECTED BIT(8)
> + #define REG_CTRL_SOF_SENT_RCVD_TGL BIT(9)
> + #define REG_CTRL_SOF_TOGGLE_OUT BIT(10)
> + #define REG_CTRL_POWER_ON_RESET BIT(15)
> + #define REG_CTRL_SLEEPM BIT(16)
> + #define REG_CTRL_TX_BITSTUFF_ENN_H BIT(17)
> + #define REG_CTRL_TX_BITSTUFF_ENN BIT(18)
> + #define REG_CTRL_COMMON_ON BIT(19)
> + #define REG_CTRL_REF_CLK_SEL_MASK GENMASK(21, 20)
> + #define REG_CTRL_REF_CLK_SEL_SHIFT 20
> + #define REG_CTRL_FSEL_MASK GENMASK(24, 22)
> + #define REG_CTRL_FSEL_SHIFT 22
> + #define REG_CTRL_PORT_RESET BIT(25)
> + #define REG_CTRL_THREAD_ID_MASK GENMASK(31, 26)
> +
> +/* bits [31:26], [24:21] and [15:3] seem to be read-only */
> +#define REG_ADP_BC 0x0c
> + #define REG_ADP_BC_VBUS_VLD_EXT_SEL BIT(0)
> + #define REG_ADP_BC_VBUS_VLD_EXT BIT(1)
> + #define REG_ADP_BC_OTG_DISABLE BIT(2)
> + #define REG_ADP_BC_ID_PULLUP BIT(3)
> + #define REG_ADP_BC_DRV_VBUS BIT(4)
> + #define REG_ADP_BC_ADP_PRB_EN BIT(5)
> + #define REG_ADP_BC_ADP_DISCHARGE BIT(6)
> + #define REG_ADP_BC_ADP_CHARGE BIT(7)
> + #define REG_ADP_BC_SESS_END BIT(8)
> + #define REG_ADP_BC_DEVICE_SESS_VLD BIT(9)
> + #define REG_ADP_BC_B_VALID BIT(10)
> + #define REG_ADP_BC_A_VALID BIT(11)
> + #define REG_ADP_BC_ID_DIG BIT(12)
> + #define REG_ADP_BC_VBUS_VALID BIT(13)
> + #define REG_ADP_BC_ADP_PROBE BIT(14)
> + #define REG_ADP_BC_ADP_SENSE BIT(15)
> + #define REG_ADP_BC_ACA_ENABLE BIT(16)
> + #define REG_ADP_BC_DCD_ENABLE BIT(17)
> + #define REG_ADP_BC_VDAT_DET_EN_B BIT(18)
> + #define REG_ADP_BC_VDAT_SRC_EN_B BIT(19)
> + #define REG_ADP_BC_CHARGE_SEL BIT(20)
> + #define REG_ADP_BC_CHARGE_DETECT BIT(21)
> + #define REG_ADP_BC_ACA_PIN_RANGE_C BIT(22)
> + #define REG_ADP_BC_ACA_PIN_RANGE_B BIT(23)
> + #define REG_ADP_BC_ACA_PIN_RANGE_A BIT(24)
> + #define REG_ADP_BC_ACA_PIN_GND BIT(25)
> + #define REG_ADP_BC_ACA_PIN_FLOAT BIT(26)
> +
> +#define RESET_COMPLETE_TIME 500
> +#define ACA_ENABLE_COMPLETE_TIME 50
> +
> +struct phy_meson_gxbb_usb2_priv {
> + struct regmap *regmap;
> + struct reset_ctl_bulk resets;
> +#if CONFIG_IS_ENABLED(DM_REGULATOR)
> + struct udevice *phy_supply;
> +#endif
> +};
> +
> +static int phy_meson_gxbb_usb2_power_on(struct phy *phy)
> +{
> + struct udevice *dev = phy->dev;
> + struct phy_meson_gxbb_usb2_priv *priv = dev_get_priv(dev);
> + uint val;
> +
> +#if CONFIG_IS_ENABLED(DM_REGULATOR)
> + if (priv->phy_supply) {
> + int ret = regulator_set_enable(priv->phy_supply, true);
> +
> + if (ret)
> + return ret;
> + }
> +#endif
> +
> + regmap_update_bits(priv->regmap, REG_CONFIG,
> + REG_CONFIG_CLK_32k_ALTSEL,
> + REG_CONFIG_CLK_32k_ALTSEL);
> + regmap_update_bits(priv->regmap, REG_CTRL,
> + REG_CTRL_REF_CLK_SEL_MASK,
> + 0x2 << REG_CTRL_REF_CLK_SEL_SHIFT);
> + regmap_update_bits(priv->regmap, REG_CTRL,
> + REG_CTRL_FSEL_MASK,
> + 0x5 << REG_CTRL_FSEL_SHIFT);
> +
> + /* reset the PHY */
> + regmap_update_bits(priv->regmap, REG_CTRL,
> + REG_CTRL_POWER_ON_RESET,
> + REG_CTRL_POWER_ON_RESET);
> + udelay(RESET_COMPLETE_TIME);
> + regmap_update_bits(priv->regmap, REG_CTRL,
> + REG_CTRL_POWER_ON_RESET,
> + 0);
> + udelay(RESET_COMPLETE_TIME);
> +
> + regmap_update_bits(priv->regmap, REG_CTRL,
> + REG_CTRL_SOF_TOGGLE_OUT,
> + REG_CTRL_SOF_TOGGLE_OUT);
> +
> + /* Set host mode */
> + regmap_update_bits(priv->regmap, REG_ADP_BC,
> + REG_ADP_BC_ACA_ENABLE,
> + REG_ADP_BC_ACA_ENABLE);
> + udelay(ACA_ENABLE_COMPLETE_TIME);
> +
> + regmap_read(priv->regmap, REG_ADP_BC, &val);
> + if (val & REG_ADP_BC_ACA_PIN_FLOAT) {
> + pr_err("Error powering on GXBB USB PHY\n");
> + return -EINVAL;
> + }
> +
> + return 0;
> +}
> +
> +static int phy_meson_gxbb_usb2_power_off(struct phy *phy)
> +{
> +#if CONFIG_IS_ENABLED(DM_REGULATOR)
> + struct udevice *dev = phy->dev;
> + struct phy_meson_gxbb_usb2_priv *priv = dev_get_priv(dev);
> +
> + if (priv->phy_supply) {
> + int ret = regulator_set_enable(priv->phy_supply, false);
> +
> + if (ret)
> + return ret;
> + }
> +#endif
> +
> + return 0;
> +}
> +
> +static struct phy_ops meson_gxbb_usb2_phy_ops = {
> + .power_on = phy_meson_gxbb_usb2_power_on,
> + .power_off = phy_meson_gxbb_usb2_power_off,
> +};
> +
> +static int meson_gxbb_usb2_phy_probe(struct udevice *dev)
> +{
> + struct phy_meson_gxbb_usb2_priv *priv = dev_get_priv(dev);
> + struct clk clk_usb_general, clk_usb;
> + int ret;
> +
> + ret = regmap_init_mem(dev_ofnode(dev), &priv->regmap);
> + if (ret)
> + return ret;
> +
> + ret = clk_get_by_name(dev, "usb_general", &clk_usb_general);
> + if (ret)
> + return ret;
> +
> + ret = clk_enable(&clk_usb_general);
> + if (ret && ret != -ENOSYS && ret != -ENOTSUPP) {
> + pr_err("Failed to enable PHY general clock\n");
> + return ret;
> + }
> +
> + ret = clk_get_by_name(dev, "usb", &clk_usb);
> + if (ret)
> + return ret;
> +
> + ret = clk_enable(&clk_usb);
> + if (ret && ret != -ENOSYS && ret != -ENOTSUPP) {
> + pr_err("Failed to enable PHY clock\n");
> + return ret;
> + }
> +
> +#if CONFIG_IS_ENABLED(DM_REGULATOR)
> + ret = device_get_supply_regulator(dev, "phy-supply", &priv->phy_supply);
> + if (ret && ret != -ENOENT) {
> + pr_err("Failed to get PHY regulator\n");
> + return ret;
> + }
> +#endif
> + ret = reset_get_bulk(dev, &priv->resets);
> + if (!ret) {
> + ret = reset_deassert_bulk(&priv->resets);
> + if (ret) {
> + pr_err("Failed to deassert reset\n");
> + return ret;
> + }
> + }
> +
> + return 0;
> +}
> +
> +static int meson_gxbb_usb2_phy_remove(struct udevice *dev)
> +{
> + struct phy_meson_gxbb_usb2_priv *priv = dev_get_priv(dev);
> +
> + return reset_release_bulk(&priv->resets);
> +}
> +
> +static const struct udevice_id meson_gxbb_usb2_phy_ids[] = {
> + { .compatible = "amlogic,meson8-usb2-phy" },
> + { .compatible = "amlogic,meson8b-usb2-phy" },
> + { .compatible = "amlogic,meson-gxbb-usb2-phy" },
> + { }
> +};
> +
> +U_BOOT_DRIVER(meson_gxbb_usb2_phy) = {
> + .name = "meson_gxbb_usb2_phy",
> + .id = UCLASS_PHY,
> + .of_match = meson_gxbb_usb2_phy_ids,
> + .probe = meson_gxbb_usb2_phy_probe,
> + .remove = meson_gxbb_usb2_phy_remove,
> + .ops = &meson_gxbb_usb2_phy_ops,
> + .priv_auto_alloc_size = sizeof(struct phy_meson_gxbb_usb2_priv),
> +};
>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/2] phy: meson: add GXBB PHY driver
@ 2019-08-19 7:16 ` Neil Armstrong
0 siblings, 0 replies; 19+ messages in thread
From: Neil Armstrong @ 2019-08-19 7:16 UTC (permalink / raw)
To: Beniamino Galvani, u-boot
Cc: Tom Rini, Albert Aribaud, Maxime Jourdan, Patrick Delaunay,
u-boot-amlogic
On 18/08/2019 15:42, Beniamino Galvani wrote:
> This adds support for the USB PHY found on Amlogic GXBB SoCs.
>
> Signed-off-by: Beniamino Galvani <b.galvani@gmail.com>
> ---
> drivers/phy/Kconfig | 8 ++
> drivers/phy/Makefile | 1 +
> drivers/phy/meson-gxbb-usb2.c | 235 ++++++++++++++++++++++++++++++++++
> 3 files changed, 244 insertions(+)
> create mode 100644 drivers/phy/meson-gxbb-usb2.c
>
> diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
> index 3942f035eb..2190f6f970 100644
> --- a/drivers/phy/Kconfig
> +++ b/drivers/phy/Kconfig
> @@ -154,6 +154,14 @@ config PHY_STM32_USBPHYC
> between an HS USB OTG controller and an HS USB Host controller,
> selected by an USB switch.
>
> +config MESON_GXBB_USB_PHY
> + bool "Amlogic Meson GXBB USB PHY"
> + depends on PHY && ARCH_MESON && MESON_GXBB
> + imply REGMAP
> + help
> + This is the generic phy driver for the Amlogic Meson GXBB
> + USB2 PHY.
> +
> config MESON_GXL_USB_PHY
> bool "Amlogic Meson GXL USB PHYs"
> depends on PHY && ARCH_MESON && (MESON_GXL || MESON_GXM)
> diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
> index 3157f1b7ee..dde3b0ecef 100644
> --- a/drivers/phy/Makefile
> +++ b/drivers/phy/Makefile
> @@ -16,6 +16,7 @@ obj-$(CONFIG_STI_USB_PHY) += sti_usb_phy.o
> obj-$(CONFIG_PHY_RCAR_GEN2) += phy-rcar-gen2.o
> obj-$(CONFIG_PHY_RCAR_GEN3) += phy-rcar-gen3.o
> obj-$(CONFIG_PHY_STM32_USBPHYC) += phy-stm32-usbphyc.o
> +obj-$(CONFIG_MESON_GXBB_USB_PHY) += meson-gxbb-usb2.o
> obj-$(CONFIG_MESON_GXL_USB_PHY) += meson-gxl-usb2.o meson-gxl-usb3.o
> obj-$(CONFIG_MESON_G12A_USB_PHY) += meson-g12a-usb2.o meson-g12a-usb3-pcie.o
> obj-$(CONFIG_MSM8916_USB_PHY) += msm8916-usbh-phy.o
> diff --git a/drivers/phy/meson-gxbb-usb2.c b/drivers/phy/meson-gxbb-usb2.c
> new file mode 100644
> index 0000000000..88c2ec69b2
> --- /dev/null
> +++ b/drivers/phy/meson-gxbb-usb2.c
> @@ -0,0 +1,235 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Meson8, Meson8b and GXBB USB2 PHY driver
> + *
> + * Copyright (C) 2016 Martin Blumenstingl <martin.blumenstingl@googlemail.com>
> + * Copyright (C) 2018 BayLibre, SAS
> + *
> + * Author: Beniamino Galvani <b.galvani@gmail.com>
> + */
> +
> +#include <common.h>
> +#include <clk.h>
> +#include <dm.h>
> +#include <generic-phy.h>
> +#include <power/regulator.h>
> +#include <regmap.h>
> +#include <reset.h>
> +
> +#define REG_CONFIG 0x00
> + #define REG_CONFIG_CLK_EN BIT(0)
> + #define REG_CONFIG_CLK_SEL_MASK GENMASK(3, 1)
> + #define REG_CONFIG_CLK_DIV_MASK GENMASK(10, 4)
> + #define REG_CONFIG_CLK_32k_ALTSEL BIT(15)
> + #define REG_CONFIG_TEST_TRIG BIT(31)
> +
> +#define REG_CTRL 0x04
> + #define REG_CTRL_SOFT_PRST BIT(0)
> + #define REG_CTRL_SOFT_HRESET BIT(1)
> + #define REG_CTRL_SS_SCALEDOWN_MODE_MASK GENMASK(3, 2)
> + #define REG_CTRL_CLK_DET_RST BIT(4)
> + #define REG_CTRL_INTR_SEL BIT(5)
> + #define REG_CTRL_CLK_DETECTED BIT(8)
> + #define REG_CTRL_SOF_SENT_RCVD_TGL BIT(9)
> + #define REG_CTRL_SOF_TOGGLE_OUT BIT(10)
> + #define REG_CTRL_POWER_ON_RESET BIT(15)
> + #define REG_CTRL_SLEEPM BIT(16)
> + #define REG_CTRL_TX_BITSTUFF_ENN_H BIT(17)
> + #define REG_CTRL_TX_BITSTUFF_ENN BIT(18)
> + #define REG_CTRL_COMMON_ON BIT(19)
> + #define REG_CTRL_REF_CLK_SEL_MASK GENMASK(21, 20)
> + #define REG_CTRL_REF_CLK_SEL_SHIFT 20
> + #define REG_CTRL_FSEL_MASK GENMASK(24, 22)
> + #define REG_CTRL_FSEL_SHIFT 22
> + #define REG_CTRL_PORT_RESET BIT(25)
> + #define REG_CTRL_THREAD_ID_MASK GENMASK(31, 26)
> +
> +/* bits [31:26], [24:21] and [15:3] seem to be read-only */
> +#define REG_ADP_BC 0x0c
> + #define REG_ADP_BC_VBUS_VLD_EXT_SEL BIT(0)
> + #define REG_ADP_BC_VBUS_VLD_EXT BIT(1)
> + #define REG_ADP_BC_OTG_DISABLE BIT(2)
> + #define REG_ADP_BC_ID_PULLUP BIT(3)
> + #define REG_ADP_BC_DRV_VBUS BIT(4)
> + #define REG_ADP_BC_ADP_PRB_EN BIT(5)
> + #define REG_ADP_BC_ADP_DISCHARGE BIT(6)
> + #define REG_ADP_BC_ADP_CHARGE BIT(7)
> + #define REG_ADP_BC_SESS_END BIT(8)
> + #define REG_ADP_BC_DEVICE_SESS_VLD BIT(9)
> + #define REG_ADP_BC_B_VALID BIT(10)
> + #define REG_ADP_BC_A_VALID BIT(11)
> + #define REG_ADP_BC_ID_DIG BIT(12)
> + #define REG_ADP_BC_VBUS_VALID BIT(13)
> + #define REG_ADP_BC_ADP_PROBE BIT(14)
> + #define REG_ADP_BC_ADP_SENSE BIT(15)
> + #define REG_ADP_BC_ACA_ENABLE BIT(16)
> + #define REG_ADP_BC_DCD_ENABLE BIT(17)
> + #define REG_ADP_BC_VDAT_DET_EN_B BIT(18)
> + #define REG_ADP_BC_VDAT_SRC_EN_B BIT(19)
> + #define REG_ADP_BC_CHARGE_SEL BIT(20)
> + #define REG_ADP_BC_CHARGE_DETECT BIT(21)
> + #define REG_ADP_BC_ACA_PIN_RANGE_C BIT(22)
> + #define REG_ADP_BC_ACA_PIN_RANGE_B BIT(23)
> + #define REG_ADP_BC_ACA_PIN_RANGE_A BIT(24)
> + #define REG_ADP_BC_ACA_PIN_GND BIT(25)
> + #define REG_ADP_BC_ACA_PIN_FLOAT BIT(26)
> +
> +#define RESET_COMPLETE_TIME 500
> +#define ACA_ENABLE_COMPLETE_TIME 50
> +
> +struct phy_meson_gxbb_usb2_priv {
> + struct regmap *regmap;
> + struct reset_ctl_bulk resets;
> +#if CONFIG_IS_ENABLED(DM_REGULATOR)
> + struct udevice *phy_supply;
> +#endif
> +};
> +
> +static int phy_meson_gxbb_usb2_power_on(struct phy *phy)
> +{
> + struct udevice *dev = phy->dev;
> + struct phy_meson_gxbb_usb2_priv *priv = dev_get_priv(dev);
> + uint val;
> +
> +#if CONFIG_IS_ENABLED(DM_REGULATOR)
> + if (priv->phy_supply) {
> + int ret = regulator_set_enable(priv->phy_supply, true);
> +
> + if (ret)
> + return ret;
> + }
> +#endif
> +
> + regmap_update_bits(priv->regmap, REG_CONFIG,
> + REG_CONFIG_CLK_32k_ALTSEL,
> + REG_CONFIG_CLK_32k_ALTSEL);
> + regmap_update_bits(priv->regmap, REG_CTRL,
> + REG_CTRL_REF_CLK_SEL_MASK,
> + 0x2 << REG_CTRL_REF_CLK_SEL_SHIFT);
> + regmap_update_bits(priv->regmap, REG_CTRL,
> + REG_CTRL_FSEL_MASK,
> + 0x5 << REG_CTRL_FSEL_SHIFT);
> +
> + /* reset the PHY */
> + regmap_update_bits(priv->regmap, REG_CTRL,
> + REG_CTRL_POWER_ON_RESET,
> + REG_CTRL_POWER_ON_RESET);
> + udelay(RESET_COMPLETE_TIME);
> + regmap_update_bits(priv->regmap, REG_CTRL,
> + REG_CTRL_POWER_ON_RESET,
> + 0);
> + udelay(RESET_COMPLETE_TIME);
> +
> + regmap_update_bits(priv->regmap, REG_CTRL,
> + REG_CTRL_SOF_TOGGLE_OUT,
> + REG_CTRL_SOF_TOGGLE_OUT);
> +
> + /* Set host mode */
> + regmap_update_bits(priv->regmap, REG_ADP_BC,
> + REG_ADP_BC_ACA_ENABLE,
> + REG_ADP_BC_ACA_ENABLE);
> + udelay(ACA_ENABLE_COMPLETE_TIME);
> +
> + regmap_read(priv->regmap, REG_ADP_BC, &val);
> + if (val & REG_ADP_BC_ACA_PIN_FLOAT) {
> + pr_err("Error powering on GXBB USB PHY\n");
> + return -EINVAL;
> + }
> +
> + return 0;
> +}
> +
> +static int phy_meson_gxbb_usb2_power_off(struct phy *phy)
> +{
> +#if CONFIG_IS_ENABLED(DM_REGULATOR)
> + struct udevice *dev = phy->dev;
> + struct phy_meson_gxbb_usb2_priv *priv = dev_get_priv(dev);
> +
> + if (priv->phy_supply) {
> + int ret = regulator_set_enable(priv->phy_supply, false);
> +
> + if (ret)
> + return ret;
> + }
> +#endif
> +
> + return 0;
> +}
> +
> +static struct phy_ops meson_gxbb_usb2_phy_ops = {
> + .power_on = phy_meson_gxbb_usb2_power_on,
> + .power_off = phy_meson_gxbb_usb2_power_off,
> +};
> +
> +static int meson_gxbb_usb2_phy_probe(struct udevice *dev)
> +{
> + struct phy_meson_gxbb_usb2_priv *priv = dev_get_priv(dev);
> + struct clk clk_usb_general, clk_usb;
> + int ret;
> +
> + ret = regmap_init_mem(dev_ofnode(dev), &priv->regmap);
> + if (ret)
> + return ret;
> +
> + ret = clk_get_by_name(dev, "usb_general", &clk_usb_general);
> + if (ret)
> + return ret;
> +
> + ret = clk_enable(&clk_usb_general);
> + if (ret && ret != -ENOSYS && ret != -ENOTSUPP) {
> + pr_err("Failed to enable PHY general clock\n");
> + return ret;
> + }
> +
> + ret = clk_get_by_name(dev, "usb", &clk_usb);
> + if (ret)
> + return ret;
> +
> + ret = clk_enable(&clk_usb);
> + if (ret && ret != -ENOSYS && ret != -ENOTSUPP) {
> + pr_err("Failed to enable PHY clock\n");
> + return ret;
> + }
> +
> +#if CONFIG_IS_ENABLED(DM_REGULATOR)
> + ret = device_get_supply_regulator(dev, "phy-supply", &priv->phy_supply);
> + if (ret && ret != -ENOENT) {
> + pr_err("Failed to get PHY regulator\n");
> + return ret;
> + }
> +#endif
> + ret = reset_get_bulk(dev, &priv->resets);
> + if (!ret) {
> + ret = reset_deassert_bulk(&priv->resets);
> + if (ret) {
> + pr_err("Failed to deassert reset\n");
> + return ret;
> + }
> + }
> +
> + return 0;
> +}
> +
> +static int meson_gxbb_usb2_phy_remove(struct udevice *dev)
> +{
> + struct phy_meson_gxbb_usb2_priv *priv = dev_get_priv(dev);
> +
> + return reset_release_bulk(&priv->resets);
> +}
> +
> +static const struct udevice_id meson_gxbb_usb2_phy_ids[] = {
> + { .compatible = "amlogic,meson8-usb2-phy" },
> + { .compatible = "amlogic,meson8b-usb2-phy" },
> + { .compatible = "amlogic,meson-gxbb-usb2-phy" },
> + { }
> +};
> +
> +U_BOOT_DRIVER(meson_gxbb_usb2_phy) = {
> + .name = "meson_gxbb_usb2_phy",
> + .id = UCLASS_PHY,
> + .of_match = meson_gxbb_usb2_phy_ids,
> + .probe = meson_gxbb_usb2_phy_probe,
> + .remove = meson_gxbb_usb2_phy_remove,
> + .ops = &meson_gxbb_usb2_phy_ops,
> + .priv_auto_alloc_size = sizeof(struct phy_meson_gxbb_usb2_priv),
> +};
>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
^ permalink raw reply [flat|nested] 19+ messages in thread
* [U-Boot] Enable USB host controller on Odroid-C2
2019-08-18 13:42 [U-Boot] Enable USB host controller on Odroid-C2 Beniamino Galvani
@ 2019-08-28 8:22 ` Neil Armstrong
2019-08-18 13:42 ` [U-Boot] [PATCH 2/2] odroid-c2: enable USB host controller Beniamino Galvani
` (2 subsequent siblings)
3 siblings, 0 replies; 19+ messages in thread
From: Neil Armstrong @ 2019-08-28 8:22 UTC (permalink / raw)
To: u-boot
On 18/08/2019 15:42, Beniamino Galvani wrote:
> Hi,
>
> these two patches enable the USB host controller on Odroid-C2. The
> first patch adds a PHY driver; the second one enables the necessary
> configuration options and updates the device tree.
>
> Note that the DWC2 driver currently does not support enabling PHYs
> from the device tree and so the following series (still on review) is
> needed as runtime requirement for the second patch:
>
> [PATCH 0/5] usb: host: dwc2: use driver model for PHY and CLOCK
Pushed to my u-boot-amlogic-next test tree until this dependency is applied.
Thanks,
Neil
>
> Thanks,
> Beniamino
>
> Beniamino Galvani (2):
> phy: meson: add GXBB PHY driver
> odroid-c2: enable USB host controller
>
> arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi | 8 +
> configs/odroid-c2_defconfig | 7 +
> drivers/phy/Kconfig | 8 +
> drivers/phy/Makefile | 1 +
> drivers/phy/meson-gxbb-usb2.c | 235 +++++++++++++++++++
> include/configs/meson64.h | 5 +
> 6 files changed, 264 insertions(+)
> create mode 100644 drivers/phy/meson-gxbb-usb2.c
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Enable USB host controller on Odroid-C2
@ 2019-08-28 8:22 ` Neil Armstrong
0 siblings, 0 replies; 19+ messages in thread
From: Neil Armstrong @ 2019-08-28 8:22 UTC (permalink / raw)
To: Beniamino Galvani, u-boot
Cc: Tom Rini, Albert Aribaud, Maxime Jourdan, Patrick Delaunay,
u-boot-amlogic
On 18/08/2019 15:42, Beniamino Galvani wrote:
> Hi,
>
> these two patches enable the USB host controller on Odroid-C2. The
> first patch adds a PHY driver; the second one enables the necessary
> configuration options and updates the device tree.
>
> Note that the DWC2 driver currently does not support enabling PHYs
> from the device tree and so the following series (still on review) is
> needed as runtime requirement for the second patch:
>
> [PATCH 0/5] usb: host: dwc2: use driver model for PHY and CLOCK
Pushed to my u-boot-amlogic-next test tree until this dependency is applied.
Thanks,
Neil
>
> Thanks,
> Beniamino
>
> Beniamino Galvani (2):
> phy: meson: add GXBB PHY driver
> odroid-c2: enable USB host controller
>
> arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi | 8 +
> configs/odroid-c2_defconfig | 7 +
> drivers/phy/Kconfig | 8 +
> drivers/phy/Makefile | 1 +
> drivers/phy/meson-gxbb-usb2.c | 235 +++++++++++++++++++
> include/configs/meson64.h | 5 +
> 6 files changed, 264 insertions(+)
> create mode 100644 drivers/phy/meson-gxbb-usb2.c
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* [U-Boot] Enable USB host controller on Odroid-C2
2019-08-28 8:22 ` Neil Armstrong
@ 2019-10-18 14:54 ` Neil Armstrong
-1 siblings, 0 replies; 19+ messages in thread
From: Neil Armstrong @ 2019-10-18 14:54 UTC (permalink / raw)
To: u-boot
On 28/08/2019 10:22, Neil Armstrong wrote:
> On 18/08/2019 15:42, Beniamino Galvani wrote:
>> Hi,
>>
>> these two patches enable the USB host controller on Odroid-C2. The
>> first patch adds a PHY driver; the second one enables the necessary
>> configuration options and updates the device tree.
>>
>> Note that the DWC2 driver currently does not support enabling PHYs
>> from the device tree and so the following series (still on review) is
>> needed as runtime requirement for the second patch:
>>
>> [PATCH 0/5] usb: host: dwc2: use driver model for PHY and CLOCK
>
>
> Pushed to my u-boot-amlogic-next test tree until this dependency is applied.
The resend version had some comments, could you resent when Patrick sends an
updated version ?
Neil
>
> Thanks,
> Neil
>
>>
>> Thanks,
>> Beniamino
>>
>> Beniamino Galvani (2):
>> phy: meson: add GXBB PHY driver
>> odroid-c2: enable USB host controller
>>
>> arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi | 8 +
>> configs/odroid-c2_defconfig | 7 +
>> drivers/phy/Kconfig | 8 +
>> drivers/phy/Makefile | 1 +
>> drivers/phy/meson-gxbb-usb2.c | 235 +++++++++++++++++++
>> include/configs/meson64.h | 5 +
>> 6 files changed, 264 insertions(+)
>> create mode 100644 drivers/phy/meson-gxbb-usb2.c
>>
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Enable USB host controller on Odroid-C2
@ 2019-10-18 14:54 ` Neil Armstrong
0 siblings, 0 replies; 19+ messages in thread
From: Neil Armstrong @ 2019-10-18 14:54 UTC (permalink / raw)
To: Beniamino Galvani, u-boot
Cc: Tom Rini, Albert Aribaud, Maxime Jourdan, Patrick Delaunay,
u-boot-amlogic
On 28/08/2019 10:22, Neil Armstrong wrote:
> On 18/08/2019 15:42, Beniamino Galvani wrote:
>> Hi,
>>
>> these two patches enable the USB host controller on Odroid-C2. The
>> first patch adds a PHY driver; the second one enables the necessary
>> configuration options and updates the device tree.
>>
>> Note that the DWC2 driver currently does not support enabling PHYs
>> from the device tree and so the following series (still on review) is
>> needed as runtime requirement for the second patch:
>>
>> [PATCH 0/5] usb: host: dwc2: use driver model for PHY and CLOCK
>
>
> Pushed to my u-boot-amlogic-next test tree until this dependency is applied.
The resend version had some comments, could you resent when Patrick sends an
updated version ?
Neil
>
> Thanks,
> Neil
>
>>
>> Thanks,
>> Beniamino
>>
>> Beniamino Galvani (2):
>> phy: meson: add GXBB PHY driver
>> odroid-c2: enable USB host controller
>>
>> arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi | 8 +
>> configs/odroid-c2_defconfig | 7 +
>> drivers/phy/Kconfig | 8 +
>> drivers/phy/Makefile | 1 +
>> drivers/phy/meson-gxbb-usb2.c | 235 +++++++++++++++++++
>> include/configs/meson64.h | 5 +
>> 6 files changed, 264 insertions(+)
>> create mode 100644 drivers/phy/meson-gxbb-usb2.c
>>
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Enable USB host controller on Odroid-C2
2019-08-18 13:42 [U-Boot] Enable USB host controller on Odroid-C2 Beniamino Galvani
@ 2020-03-27 13:35 ` Neil Armstrong
2019-08-18 13:42 ` [U-Boot] [PATCH 2/2] odroid-c2: enable USB host controller Beniamino Galvani
` (2 subsequent siblings)
3 siblings, 0 replies; 19+ messages in thread
From: Neil Armstrong @ 2020-03-27 13:35 UTC (permalink / raw)
To: u-boot
Hi,
On 18/08/2019 15:42, Beniamino Galvani wrote:
> Hi,
>
> these two patches enable the USB host controller on Odroid-C2. The
> first patch adds a PHY driver; the second one enables the necessary
> configuration options and updates the device tree.
>
> Note that the DWC2 driver currently does not support enabling PHYs
> from the device tree and so the following series (still on review) is
> needed as runtime requirement for the second patch:
>
> [PATCH 0/5] usb: host: dwc2: use driver model for PHY and CLOCK
>
> Thanks,
> Beniamino
>
> Beniamino Galvani (2):
> phy: meson: add GXBB PHY driver
> odroid-c2: enable USB host controller
>
> arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi | 8 +
> configs/odroid-c2_defconfig | 7 +
> drivers/phy/Kconfig | 8 +
> drivers/phy/Makefile | 1 +
> drivers/phy/meson-gxbb-usb2.c | 235 +++++++++++++++++++
> include/configs/meson64.h | 5 +
> 6 files changed, 264 insertions(+)
> create mode 100644 drivers/phy/meson-gxbb-usb2.c
>
Could you re-test with v6 of DWC2 patchset at http://patchwork.ozlabs.org/project/uboot/list/?series=163388 ?
Neil
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Enable USB host controller on Odroid-C2
@ 2020-03-27 13:35 ` Neil Armstrong
0 siblings, 0 replies; 19+ messages in thread
From: Neil Armstrong @ 2020-03-27 13:35 UTC (permalink / raw)
To: Beniamino Galvani, u-boot
Cc: Tom Rini, Albert Aribaud, Maxime Jourdan, Patrick Delaunay,
u-boot-amlogic
Hi,
On 18/08/2019 15:42, Beniamino Galvani wrote:
> Hi,
>
> these two patches enable the USB host controller on Odroid-C2. The
> first patch adds a PHY driver; the second one enables the necessary
> configuration options and updates the device tree.
>
> Note that the DWC2 driver currently does not support enabling PHYs
> from the device tree and so the following series (still on review) is
> needed as runtime requirement for the second patch:
>
> [PATCH 0/5] usb: host: dwc2: use driver model for PHY and CLOCK
>
> Thanks,
> Beniamino
>
> Beniamino Galvani (2):
> phy: meson: add GXBB PHY driver
> odroid-c2: enable USB host controller
>
> arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi | 8 +
> configs/odroid-c2_defconfig | 7 +
> drivers/phy/Kconfig | 8 +
> drivers/phy/Makefile | 1 +
> drivers/phy/meson-gxbb-usb2.c | 235 +++++++++++++++++++
> include/configs/meson64.h | 5 +
> 6 files changed, 264 insertions(+)
> create mode 100644 drivers/phy/meson-gxbb-usb2.c
>
Could you re-test with v6 of DWC2 patchset at http://patchwork.ozlabs.org/project/uboot/list/?series=163388 ?
Neil
^ permalink raw reply [flat|nested] 19+ messages in thread
* Enable USB host controller on Odroid-C2
2020-03-27 13:35 ` Neil Armstrong
@ 2020-04-19 20:16 ` Beniamino Galvani
-1 siblings, 0 replies; 19+ messages in thread
From: Beniamino Galvani @ 2020-04-19 20:16 UTC (permalink / raw)
To: u-boot
On Fri, Mar 27, 2020 at 02:35:50PM +0100, Neil Armstrong wrote:
> Hi,
>
> On 18/08/2019 15:42, Beniamino Galvani wrote:
> > Hi,
> >
> > these two patches enable the USB host controller on Odroid-C2. The
> > first patch adds a PHY driver; the second one enables the necessary
> > configuration options and updates the device tree.
> >
> > Note that the DWC2 driver currently does not support enabling PHYs
> > from the device tree and so the following series (still on review) is
> > needed as runtime requirement for the second patch:
> >
> > [PATCH 0/5] usb: host: dwc2: use driver model for PHY and CLOCK
> >
> > Thanks,
> > Beniamino
> >
> > Beniamino Galvani (2):
> > phy: meson: add GXBB PHY driver
> > odroid-c2: enable USB host controller
> >
> > arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi | 8 +
> > configs/odroid-c2_defconfig | 7 +
> > drivers/phy/Kconfig | 8 +
> > drivers/phy/Makefile | 1 +
> > drivers/phy/meson-gxbb-usb2.c | 235 +++++++++++++++++++
> > include/configs/meson64.h | 5 +
> > 6 files changed, 264 insertions(+)
> > create mode 100644 drivers/phy/meson-gxbb-usb2.c
> >
>
> Could you re-test with v6 of DWC2 patchset at http://patchwork.ozlabs.org/project/uboot/list/?series=163388 ?
Hi,
I tested my two patches on top of Patrick's v6 and they still work as
expected.
Thanks,
Beniamino
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: Enable USB host controller on Odroid-C2
@ 2020-04-19 20:16 ` Beniamino Galvani
0 siblings, 0 replies; 19+ messages in thread
From: Beniamino Galvani @ 2020-04-19 20:16 UTC (permalink / raw)
To: Neil Armstrong
Cc: u-boot, Tom Rini, Albert Aribaud, Maxime Jourdan,
Patrick Delaunay, u-boot-amlogic
On Fri, Mar 27, 2020 at 02:35:50PM +0100, Neil Armstrong wrote:
> Hi,
>
> On 18/08/2019 15:42, Beniamino Galvani wrote:
> > Hi,
> >
> > these two patches enable the USB host controller on Odroid-C2. The
> > first patch adds a PHY driver; the second one enables the necessary
> > configuration options and updates the device tree.
> >
> > Note that the DWC2 driver currently does not support enabling PHYs
> > from the device tree and so the following series (still on review) is
> > needed as runtime requirement for the second patch:
> >
> > [PATCH 0/5] usb: host: dwc2: use driver model for PHY and CLOCK
> >
> > Thanks,
> > Beniamino
> >
> > Beniamino Galvani (2):
> > phy: meson: add GXBB PHY driver
> > odroid-c2: enable USB host controller
> >
> > arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi | 8 +
> > configs/odroid-c2_defconfig | 7 +
> > drivers/phy/Kconfig | 8 +
> > drivers/phy/Makefile | 1 +
> > drivers/phy/meson-gxbb-usb2.c | 235 +++++++++++++++++++
> > include/configs/meson64.h | 5 +
> > 6 files changed, 264 insertions(+)
> > create mode 100644 drivers/phy/meson-gxbb-usb2.c
> >
>
> Could you re-test with v6 of DWC2 patchset at http://patchwork.ozlabs.org/project/uboot/list/?series=163388 ?
Hi,
I tested my two patches on top of Patrick's v6 and they still work as
expected.
Thanks,
Beniamino
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 1/2] phy: meson: add GXBB PHY driver
2019-08-18 13:42 ` [U-Boot] [PATCH 1/2] phy: meson: add GXBB PHY driver Beniamino Galvani
@ 2020-04-24 7:20 ` Neil Armstrong
2020-04-24 7:20 ` Neil Armstrong
1 sibling, 0 replies; 19+ messages in thread
From: Neil Armstrong @ 2020-04-24 7:20 UTC (permalink / raw)
To: u-boot
On 18/08/2019 15:42, Beniamino Galvani wrote:
> This adds support for the USB PHY found on Amlogic GXBB SoCs.
>
> Signed-off-by: Beniamino Galvani <b.galvani@gmail.com>
> ---
> drivers/phy/Kconfig | 8 ++
> drivers/phy/Makefile | 1 +
> drivers/phy/meson-gxbb-usb2.c | 235 ++++++++++++++++++++++++++++++++++
> 3 files changed, 244 insertions(+)
> create mode 100644 drivers/phy/meson-gxbb-usb2.c
>
> diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
> index 3942f035eb..2190f6f970 100644
> --- a/drivers/phy/Kconfig
> +++ b/drivers/phy/Kconfig
> @@ -154,6 +154,14 @@ config PHY_STM32_USBPHYC
> between an HS USB OTG controller and an HS USB Host controller,
> selected by an USB switch.
>
> +config MESON_GXBB_USB_PHY
> + bool "Amlogic Meson GXBB USB PHY"
> + depends on PHY && ARCH_MESON && MESON_GXBB
> + imply REGMAP
> + help
> + This is the generic phy driver for the Amlogic Meson GXBB
> + USB2 PHY.
> +
> config MESON_GXL_USB_PHY
> bool "Amlogic Meson GXL USB PHYs"
> depends on PHY && ARCH_MESON && (MESON_GXL || MESON_GXM)
> diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
> index 3157f1b7ee..dde3b0ecef 100644
> --- a/drivers/phy/Makefile
> +++ b/drivers/phy/Makefile
> @@ -16,6 +16,7 @@ obj-$(CONFIG_STI_USB_PHY) += sti_usb_phy.o
> obj-$(CONFIG_PHY_RCAR_GEN2) += phy-rcar-gen2.o
> obj-$(CONFIG_PHY_RCAR_GEN3) += phy-rcar-gen3.o
> obj-$(CONFIG_PHY_STM32_USBPHYC) += phy-stm32-usbphyc.o
> +obj-$(CONFIG_MESON_GXBB_USB_PHY) += meson-gxbb-usb2.o
> obj-$(CONFIG_MESON_GXL_USB_PHY) += meson-gxl-usb2.o meson-gxl-usb3.o
> obj-$(CONFIG_MESON_G12A_USB_PHY) += meson-g12a-usb2.o meson-g12a-usb3-pcie.o
> obj-$(CONFIG_MSM8916_USB_PHY) += msm8916-usbh-phy.o
> diff --git a/drivers/phy/meson-gxbb-usb2.c b/drivers/phy/meson-gxbb-usb2.c
> new file mode 100644
> index 0000000000..88c2ec69b2
> --- /dev/null
> +++ b/drivers/phy/meson-gxbb-usb2.c
> @@ -0,0 +1,235 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Meson8, Meson8b and GXBB USB2 PHY driver
> + *
> + * Copyright (C) 2016 Martin Blumenstingl <martin.blumenstingl@googlemail.com>
> + * Copyright (C) 2018 BayLibre, SAS
> + *
> + * Author: Beniamino Galvani <b.galvani@gmail.com>
> + */
> +
> +#include <common.h>
> +#include <clk.h>
> +#include <dm.h>
> +#include <generic-phy.h>
> +#include <power/regulator.h>
> +#include <regmap.h>
> +#include <reset.h>
> +
> +#define REG_CONFIG 0x00
> + #define REG_CONFIG_CLK_EN BIT(0)
> + #define REG_CONFIG_CLK_SEL_MASK GENMASK(3, 1)
> + #define REG_CONFIG_CLK_DIV_MASK GENMASK(10, 4)
> + #define REG_CONFIG_CLK_32k_ALTSEL BIT(15)
> + #define REG_CONFIG_TEST_TRIG BIT(31)
> +
> +#define REG_CTRL 0x04
> + #define REG_CTRL_SOFT_PRST BIT(0)
> + #define REG_CTRL_SOFT_HRESET BIT(1)
> + #define REG_CTRL_SS_SCALEDOWN_MODE_MASK GENMASK(3, 2)
> + #define REG_CTRL_CLK_DET_RST BIT(4)
> + #define REG_CTRL_INTR_SEL BIT(5)
> + #define REG_CTRL_CLK_DETECTED BIT(8)
> + #define REG_CTRL_SOF_SENT_RCVD_TGL BIT(9)
> + #define REG_CTRL_SOF_TOGGLE_OUT BIT(10)
> + #define REG_CTRL_POWER_ON_RESET BIT(15)
> + #define REG_CTRL_SLEEPM BIT(16)
> + #define REG_CTRL_TX_BITSTUFF_ENN_H BIT(17)
> + #define REG_CTRL_TX_BITSTUFF_ENN BIT(18)
> + #define REG_CTRL_COMMON_ON BIT(19)
> + #define REG_CTRL_REF_CLK_SEL_MASK GENMASK(21, 20)
> + #define REG_CTRL_REF_CLK_SEL_SHIFT 20
> + #define REG_CTRL_FSEL_MASK GENMASK(24, 22)
> + #define REG_CTRL_FSEL_SHIFT 22
> + #define REG_CTRL_PORT_RESET BIT(25)
> + #define REG_CTRL_THREAD_ID_MASK GENMASK(31, 26)
> +
> +/* bits [31:26], [24:21] and [15:3] seem to be read-only */
> +#define REG_ADP_BC 0x0c
> + #define REG_ADP_BC_VBUS_VLD_EXT_SEL BIT(0)
> + #define REG_ADP_BC_VBUS_VLD_EXT BIT(1)
> + #define REG_ADP_BC_OTG_DISABLE BIT(2)
> + #define REG_ADP_BC_ID_PULLUP BIT(3)
> + #define REG_ADP_BC_DRV_VBUS BIT(4)
> + #define REG_ADP_BC_ADP_PRB_EN BIT(5)
> + #define REG_ADP_BC_ADP_DISCHARGE BIT(6)
> + #define REG_ADP_BC_ADP_CHARGE BIT(7)
> + #define REG_ADP_BC_SESS_END BIT(8)
> + #define REG_ADP_BC_DEVICE_SESS_VLD BIT(9)
> + #define REG_ADP_BC_B_VALID BIT(10)
> + #define REG_ADP_BC_A_VALID BIT(11)
> + #define REG_ADP_BC_ID_DIG BIT(12)
> + #define REG_ADP_BC_VBUS_VALID BIT(13)
> + #define REG_ADP_BC_ADP_PROBE BIT(14)
> + #define REG_ADP_BC_ADP_SENSE BIT(15)
> + #define REG_ADP_BC_ACA_ENABLE BIT(16)
> + #define REG_ADP_BC_DCD_ENABLE BIT(17)
> + #define REG_ADP_BC_VDAT_DET_EN_B BIT(18)
> + #define REG_ADP_BC_VDAT_SRC_EN_B BIT(19)
> + #define REG_ADP_BC_CHARGE_SEL BIT(20)
> + #define REG_ADP_BC_CHARGE_DETECT BIT(21)
> + #define REG_ADP_BC_ACA_PIN_RANGE_C BIT(22)
> + #define REG_ADP_BC_ACA_PIN_RANGE_B BIT(23)
> + #define REG_ADP_BC_ACA_PIN_RANGE_A BIT(24)
> + #define REG_ADP_BC_ACA_PIN_GND BIT(25)
> + #define REG_ADP_BC_ACA_PIN_FLOAT BIT(26)
> +
> +#define RESET_COMPLETE_TIME 500
> +#define ACA_ENABLE_COMPLETE_TIME 50
> +
> +struct phy_meson_gxbb_usb2_priv {
> + struct regmap *regmap;
> + struct reset_ctl_bulk resets;
> +#if CONFIG_IS_ENABLED(DM_REGULATOR)
> + struct udevice *phy_supply;
> +#endif
> +};
> +
> +static int phy_meson_gxbb_usb2_power_on(struct phy *phy)
> +{
> + struct udevice *dev = phy->dev;
> + struct phy_meson_gxbb_usb2_priv *priv = dev_get_priv(dev);
> + uint val;
> +
> +#if CONFIG_IS_ENABLED(DM_REGULATOR)
> + if (priv->phy_supply) {
> + int ret = regulator_set_enable(priv->phy_supply, true);
> +
> + if (ret)
> + return ret;
> + }
> +#endif
> +
> + regmap_update_bits(priv->regmap, REG_CONFIG,
> + REG_CONFIG_CLK_32k_ALTSEL,
> + REG_CONFIG_CLK_32k_ALTSEL);
> + regmap_update_bits(priv->regmap, REG_CTRL,
> + REG_CTRL_REF_CLK_SEL_MASK,
> + 0x2 << REG_CTRL_REF_CLK_SEL_SHIFT);
> + regmap_update_bits(priv->regmap, REG_CTRL,
> + REG_CTRL_FSEL_MASK,
> + 0x5 << REG_CTRL_FSEL_SHIFT);
> +
> + /* reset the PHY */
> + regmap_update_bits(priv->regmap, REG_CTRL,
> + REG_CTRL_POWER_ON_RESET,
> + REG_CTRL_POWER_ON_RESET);
> + udelay(RESET_COMPLETE_TIME);
> + regmap_update_bits(priv->regmap, REG_CTRL,
> + REG_CTRL_POWER_ON_RESET,
> + 0);
> + udelay(RESET_COMPLETE_TIME);
> +
> + regmap_update_bits(priv->regmap, REG_CTRL,
> + REG_CTRL_SOF_TOGGLE_OUT,
> + REG_CTRL_SOF_TOGGLE_OUT);
> +
> + /* Set host mode */
> + regmap_update_bits(priv->regmap, REG_ADP_BC,
> + REG_ADP_BC_ACA_ENABLE,
> + REG_ADP_BC_ACA_ENABLE);
> + udelay(ACA_ENABLE_COMPLETE_TIME);
> +
> + regmap_read(priv->regmap, REG_ADP_BC, &val);
> + if (val & REG_ADP_BC_ACA_PIN_FLOAT) {
> + pr_err("Error powering on GXBB USB PHY\n");
> + return -EINVAL;
> + }
> +
> + return 0;
> +}
> +
> +static int phy_meson_gxbb_usb2_power_off(struct phy *phy)
> +{
> +#if CONFIG_IS_ENABLED(DM_REGULATOR)
> + struct udevice *dev = phy->dev;
> + struct phy_meson_gxbb_usb2_priv *priv = dev_get_priv(dev);
> +
> + if (priv->phy_supply) {
> + int ret = regulator_set_enable(priv->phy_supply, false);
> +
> + if (ret)
> + return ret;
> + }
> +#endif
> +
> + return 0;
> +}
> +
> +static struct phy_ops meson_gxbb_usb2_phy_ops = {
> + .power_on = phy_meson_gxbb_usb2_power_on,
> + .power_off = phy_meson_gxbb_usb2_power_off,
> +};
> +
> +static int meson_gxbb_usb2_phy_probe(struct udevice *dev)
> +{
> + struct phy_meson_gxbb_usb2_priv *priv = dev_get_priv(dev);
> + struct clk clk_usb_general, clk_usb;
> + int ret;
> +
> + ret = regmap_init_mem(dev_ofnode(dev), &priv->regmap);
> + if (ret)
> + return ret;
> +
> + ret = clk_get_by_name(dev, "usb_general", &clk_usb_general);
> + if (ret)
> + return ret;
> +
> + ret = clk_enable(&clk_usb_general);
> + if (ret && ret != -ENOSYS && ret != -ENOTSUPP) {
> + pr_err("Failed to enable PHY general clock\n");
> + return ret;
> + }
> +
> + ret = clk_get_by_name(dev, "usb", &clk_usb);
> + if (ret)
> + return ret;
> +
> + ret = clk_enable(&clk_usb);
> + if (ret && ret != -ENOSYS && ret != -ENOTSUPP) {
> + pr_err("Failed to enable PHY clock\n");
> + return ret;
> + }
> +
> +#if CONFIG_IS_ENABLED(DM_REGULATOR)
> + ret = device_get_supply_regulator(dev, "phy-supply", &priv->phy_supply);
> + if (ret && ret != -ENOENT) {
> + pr_err("Failed to get PHY regulator\n");
> + return ret;
> + }
> +#endif
> + ret = reset_get_bulk(dev, &priv->resets);
> + if (!ret) {
> + ret = reset_deassert_bulk(&priv->resets);
> + if (ret) {
> + pr_err("Failed to deassert reset\n");
> + return ret;
> + }
> + }
> +
> + return 0;
> +}
> +
> +static int meson_gxbb_usb2_phy_remove(struct udevice *dev)
> +{
> + struct phy_meson_gxbb_usb2_priv *priv = dev_get_priv(dev);
> +
> + return reset_release_bulk(&priv->resets);
> +}
> +
> +static const struct udevice_id meson_gxbb_usb2_phy_ids[] = {
> + { .compatible = "amlogic,meson8-usb2-phy" },
> + { .compatible = "amlogic,meson8b-usb2-phy" },
> + { .compatible = "amlogic,meson-gxbb-usb2-phy" },
> + { }
> +};
> +
> +U_BOOT_DRIVER(meson_gxbb_usb2_phy) = {
> + .name = "meson_gxbb_usb2_phy",
> + .id = UCLASS_PHY,
> + .of_match = meson_gxbb_usb2_phy_ids,
> + .probe = meson_gxbb_usb2_phy_probe,
> + .remove = meson_gxbb_usb2_phy_remove,
> + .ops = &meson_gxbb_usb2_phy_ops,
> + .priv_auto_alloc_size = sizeof(struct phy_meson_gxbb_usb2_priv),
> +};
>
Applied to u-boot-amlogic
Next one will wait until Patrick's v6 is applied.
Neil
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/2] phy: meson: add GXBB PHY driver
@ 2020-04-24 7:20 ` Neil Armstrong
0 siblings, 0 replies; 19+ messages in thread
From: Neil Armstrong @ 2020-04-24 7:20 UTC (permalink / raw)
To: Beniamino Galvani, u-boot
Cc: Tom Rini, Albert Aribaud, Maxime Jourdan, Patrick Delaunay,
u-boot-amlogic
On 18/08/2019 15:42, Beniamino Galvani wrote:
> This adds support for the USB PHY found on Amlogic GXBB SoCs.
>
> Signed-off-by: Beniamino Galvani <b.galvani@gmail.com>
> ---
> drivers/phy/Kconfig | 8 ++
> drivers/phy/Makefile | 1 +
> drivers/phy/meson-gxbb-usb2.c | 235 ++++++++++++++++++++++++++++++++++
> 3 files changed, 244 insertions(+)
> create mode 100644 drivers/phy/meson-gxbb-usb2.c
>
> diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
> index 3942f035eb..2190f6f970 100644
> --- a/drivers/phy/Kconfig
> +++ b/drivers/phy/Kconfig
> @@ -154,6 +154,14 @@ config PHY_STM32_USBPHYC
> between an HS USB OTG controller and an HS USB Host controller,
> selected by an USB switch.
>
> +config MESON_GXBB_USB_PHY
> + bool "Amlogic Meson GXBB USB PHY"
> + depends on PHY && ARCH_MESON && MESON_GXBB
> + imply REGMAP
> + help
> + This is the generic phy driver for the Amlogic Meson GXBB
> + USB2 PHY.
> +
> config MESON_GXL_USB_PHY
> bool "Amlogic Meson GXL USB PHYs"
> depends on PHY && ARCH_MESON && (MESON_GXL || MESON_GXM)
> diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
> index 3157f1b7ee..dde3b0ecef 100644
> --- a/drivers/phy/Makefile
> +++ b/drivers/phy/Makefile
> @@ -16,6 +16,7 @@ obj-$(CONFIG_STI_USB_PHY) += sti_usb_phy.o
> obj-$(CONFIG_PHY_RCAR_GEN2) += phy-rcar-gen2.o
> obj-$(CONFIG_PHY_RCAR_GEN3) += phy-rcar-gen3.o
> obj-$(CONFIG_PHY_STM32_USBPHYC) += phy-stm32-usbphyc.o
> +obj-$(CONFIG_MESON_GXBB_USB_PHY) += meson-gxbb-usb2.o
> obj-$(CONFIG_MESON_GXL_USB_PHY) += meson-gxl-usb2.o meson-gxl-usb3.o
> obj-$(CONFIG_MESON_G12A_USB_PHY) += meson-g12a-usb2.o meson-g12a-usb3-pcie.o
> obj-$(CONFIG_MSM8916_USB_PHY) += msm8916-usbh-phy.o
> diff --git a/drivers/phy/meson-gxbb-usb2.c b/drivers/phy/meson-gxbb-usb2.c
> new file mode 100644
> index 0000000000..88c2ec69b2
> --- /dev/null
> +++ b/drivers/phy/meson-gxbb-usb2.c
> @@ -0,0 +1,235 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Meson8, Meson8b and GXBB USB2 PHY driver
> + *
> + * Copyright (C) 2016 Martin Blumenstingl <martin.blumenstingl@googlemail.com>
> + * Copyright (C) 2018 BayLibre, SAS
> + *
> + * Author: Beniamino Galvani <b.galvani@gmail.com>
> + */
> +
> +#include <common.h>
> +#include <clk.h>
> +#include <dm.h>
> +#include <generic-phy.h>
> +#include <power/regulator.h>
> +#include <regmap.h>
> +#include <reset.h>
> +
> +#define REG_CONFIG 0x00
> + #define REG_CONFIG_CLK_EN BIT(0)
> + #define REG_CONFIG_CLK_SEL_MASK GENMASK(3, 1)
> + #define REG_CONFIG_CLK_DIV_MASK GENMASK(10, 4)
> + #define REG_CONFIG_CLK_32k_ALTSEL BIT(15)
> + #define REG_CONFIG_TEST_TRIG BIT(31)
> +
> +#define REG_CTRL 0x04
> + #define REG_CTRL_SOFT_PRST BIT(0)
> + #define REG_CTRL_SOFT_HRESET BIT(1)
> + #define REG_CTRL_SS_SCALEDOWN_MODE_MASK GENMASK(3, 2)
> + #define REG_CTRL_CLK_DET_RST BIT(4)
> + #define REG_CTRL_INTR_SEL BIT(5)
> + #define REG_CTRL_CLK_DETECTED BIT(8)
> + #define REG_CTRL_SOF_SENT_RCVD_TGL BIT(9)
> + #define REG_CTRL_SOF_TOGGLE_OUT BIT(10)
> + #define REG_CTRL_POWER_ON_RESET BIT(15)
> + #define REG_CTRL_SLEEPM BIT(16)
> + #define REG_CTRL_TX_BITSTUFF_ENN_H BIT(17)
> + #define REG_CTRL_TX_BITSTUFF_ENN BIT(18)
> + #define REG_CTRL_COMMON_ON BIT(19)
> + #define REG_CTRL_REF_CLK_SEL_MASK GENMASK(21, 20)
> + #define REG_CTRL_REF_CLK_SEL_SHIFT 20
> + #define REG_CTRL_FSEL_MASK GENMASK(24, 22)
> + #define REG_CTRL_FSEL_SHIFT 22
> + #define REG_CTRL_PORT_RESET BIT(25)
> + #define REG_CTRL_THREAD_ID_MASK GENMASK(31, 26)
> +
> +/* bits [31:26], [24:21] and [15:3] seem to be read-only */
> +#define REG_ADP_BC 0x0c
> + #define REG_ADP_BC_VBUS_VLD_EXT_SEL BIT(0)
> + #define REG_ADP_BC_VBUS_VLD_EXT BIT(1)
> + #define REG_ADP_BC_OTG_DISABLE BIT(2)
> + #define REG_ADP_BC_ID_PULLUP BIT(3)
> + #define REG_ADP_BC_DRV_VBUS BIT(4)
> + #define REG_ADP_BC_ADP_PRB_EN BIT(5)
> + #define REG_ADP_BC_ADP_DISCHARGE BIT(6)
> + #define REG_ADP_BC_ADP_CHARGE BIT(7)
> + #define REG_ADP_BC_SESS_END BIT(8)
> + #define REG_ADP_BC_DEVICE_SESS_VLD BIT(9)
> + #define REG_ADP_BC_B_VALID BIT(10)
> + #define REG_ADP_BC_A_VALID BIT(11)
> + #define REG_ADP_BC_ID_DIG BIT(12)
> + #define REG_ADP_BC_VBUS_VALID BIT(13)
> + #define REG_ADP_BC_ADP_PROBE BIT(14)
> + #define REG_ADP_BC_ADP_SENSE BIT(15)
> + #define REG_ADP_BC_ACA_ENABLE BIT(16)
> + #define REG_ADP_BC_DCD_ENABLE BIT(17)
> + #define REG_ADP_BC_VDAT_DET_EN_B BIT(18)
> + #define REG_ADP_BC_VDAT_SRC_EN_B BIT(19)
> + #define REG_ADP_BC_CHARGE_SEL BIT(20)
> + #define REG_ADP_BC_CHARGE_DETECT BIT(21)
> + #define REG_ADP_BC_ACA_PIN_RANGE_C BIT(22)
> + #define REG_ADP_BC_ACA_PIN_RANGE_B BIT(23)
> + #define REG_ADP_BC_ACA_PIN_RANGE_A BIT(24)
> + #define REG_ADP_BC_ACA_PIN_GND BIT(25)
> + #define REG_ADP_BC_ACA_PIN_FLOAT BIT(26)
> +
> +#define RESET_COMPLETE_TIME 500
> +#define ACA_ENABLE_COMPLETE_TIME 50
> +
> +struct phy_meson_gxbb_usb2_priv {
> + struct regmap *regmap;
> + struct reset_ctl_bulk resets;
> +#if CONFIG_IS_ENABLED(DM_REGULATOR)
> + struct udevice *phy_supply;
> +#endif
> +};
> +
> +static int phy_meson_gxbb_usb2_power_on(struct phy *phy)
> +{
> + struct udevice *dev = phy->dev;
> + struct phy_meson_gxbb_usb2_priv *priv = dev_get_priv(dev);
> + uint val;
> +
> +#if CONFIG_IS_ENABLED(DM_REGULATOR)
> + if (priv->phy_supply) {
> + int ret = regulator_set_enable(priv->phy_supply, true);
> +
> + if (ret)
> + return ret;
> + }
> +#endif
> +
> + regmap_update_bits(priv->regmap, REG_CONFIG,
> + REG_CONFIG_CLK_32k_ALTSEL,
> + REG_CONFIG_CLK_32k_ALTSEL);
> + regmap_update_bits(priv->regmap, REG_CTRL,
> + REG_CTRL_REF_CLK_SEL_MASK,
> + 0x2 << REG_CTRL_REF_CLK_SEL_SHIFT);
> + regmap_update_bits(priv->regmap, REG_CTRL,
> + REG_CTRL_FSEL_MASK,
> + 0x5 << REG_CTRL_FSEL_SHIFT);
> +
> + /* reset the PHY */
> + regmap_update_bits(priv->regmap, REG_CTRL,
> + REG_CTRL_POWER_ON_RESET,
> + REG_CTRL_POWER_ON_RESET);
> + udelay(RESET_COMPLETE_TIME);
> + regmap_update_bits(priv->regmap, REG_CTRL,
> + REG_CTRL_POWER_ON_RESET,
> + 0);
> + udelay(RESET_COMPLETE_TIME);
> +
> + regmap_update_bits(priv->regmap, REG_CTRL,
> + REG_CTRL_SOF_TOGGLE_OUT,
> + REG_CTRL_SOF_TOGGLE_OUT);
> +
> + /* Set host mode */
> + regmap_update_bits(priv->regmap, REG_ADP_BC,
> + REG_ADP_BC_ACA_ENABLE,
> + REG_ADP_BC_ACA_ENABLE);
> + udelay(ACA_ENABLE_COMPLETE_TIME);
> +
> + regmap_read(priv->regmap, REG_ADP_BC, &val);
> + if (val & REG_ADP_BC_ACA_PIN_FLOAT) {
> + pr_err("Error powering on GXBB USB PHY\n");
> + return -EINVAL;
> + }
> +
> + return 0;
> +}
> +
> +static int phy_meson_gxbb_usb2_power_off(struct phy *phy)
> +{
> +#if CONFIG_IS_ENABLED(DM_REGULATOR)
> + struct udevice *dev = phy->dev;
> + struct phy_meson_gxbb_usb2_priv *priv = dev_get_priv(dev);
> +
> + if (priv->phy_supply) {
> + int ret = regulator_set_enable(priv->phy_supply, false);
> +
> + if (ret)
> + return ret;
> + }
> +#endif
> +
> + return 0;
> +}
> +
> +static struct phy_ops meson_gxbb_usb2_phy_ops = {
> + .power_on = phy_meson_gxbb_usb2_power_on,
> + .power_off = phy_meson_gxbb_usb2_power_off,
> +};
> +
> +static int meson_gxbb_usb2_phy_probe(struct udevice *dev)
> +{
> + struct phy_meson_gxbb_usb2_priv *priv = dev_get_priv(dev);
> + struct clk clk_usb_general, clk_usb;
> + int ret;
> +
> + ret = regmap_init_mem(dev_ofnode(dev), &priv->regmap);
> + if (ret)
> + return ret;
> +
> + ret = clk_get_by_name(dev, "usb_general", &clk_usb_general);
> + if (ret)
> + return ret;
> +
> + ret = clk_enable(&clk_usb_general);
> + if (ret && ret != -ENOSYS && ret != -ENOTSUPP) {
> + pr_err("Failed to enable PHY general clock\n");
> + return ret;
> + }
> +
> + ret = clk_get_by_name(dev, "usb", &clk_usb);
> + if (ret)
> + return ret;
> +
> + ret = clk_enable(&clk_usb);
> + if (ret && ret != -ENOSYS && ret != -ENOTSUPP) {
> + pr_err("Failed to enable PHY clock\n");
> + return ret;
> + }
> +
> +#if CONFIG_IS_ENABLED(DM_REGULATOR)
> + ret = device_get_supply_regulator(dev, "phy-supply", &priv->phy_supply);
> + if (ret && ret != -ENOENT) {
> + pr_err("Failed to get PHY regulator\n");
> + return ret;
> + }
> +#endif
> + ret = reset_get_bulk(dev, &priv->resets);
> + if (!ret) {
> + ret = reset_deassert_bulk(&priv->resets);
> + if (ret) {
> + pr_err("Failed to deassert reset\n");
> + return ret;
> + }
> + }
> +
> + return 0;
> +}
> +
> +static int meson_gxbb_usb2_phy_remove(struct udevice *dev)
> +{
> + struct phy_meson_gxbb_usb2_priv *priv = dev_get_priv(dev);
> +
> + return reset_release_bulk(&priv->resets);
> +}
> +
> +static const struct udevice_id meson_gxbb_usb2_phy_ids[] = {
> + { .compatible = "amlogic,meson8-usb2-phy" },
> + { .compatible = "amlogic,meson8b-usb2-phy" },
> + { .compatible = "amlogic,meson-gxbb-usb2-phy" },
> + { }
> +};
> +
> +U_BOOT_DRIVER(meson_gxbb_usb2_phy) = {
> + .name = "meson_gxbb_usb2_phy",
> + .id = UCLASS_PHY,
> + .of_match = meson_gxbb_usb2_phy_ids,
> + .probe = meson_gxbb_usb2_phy_probe,
> + .remove = meson_gxbb_usb2_phy_remove,
> + .ops = &meson_gxbb_usb2_phy_ops,
> + .priv_auto_alloc_size = sizeof(struct phy_meson_gxbb_usb2_priv),
> +};
>
Applied to u-boot-amlogic
Next one will wait until Patrick's v6 is applied.
Neil
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 2/2] odroid-c2: enable USB host controller
2019-08-18 13:42 ` [U-Boot] [PATCH 2/2] odroid-c2: enable USB host controller Beniamino Galvani
@ 2020-05-10 14:08 ` Beniamino Galvani
0 siblings, 0 replies; 19+ messages in thread
From: Beniamino Galvani @ 2020-05-10 14:08 UTC (permalink / raw)
To: u-boot
On Sun, Aug 18, 2019 at 03:42:55PM +0200, Beniamino Galvani wrote:
> Enable the second USB controller, which is connected to a hub with 4
> ports. The first controller is for the OTG port and is currently not
> supported.
>
> Signed-off-by: Beniamino Galvani <b.galvani@gmail.com>
> ---
> arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi | 8 ++++++++
> configs/odroid-c2_defconfig | 7 +++++++
> include/configs/meson64.h | 5 +++++
> 3 files changed, 20 insertions(+)
>
> diff --git a/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi b/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi
> index c35158d7e9..484b40504d 100644
> --- a/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi
> +++ b/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi
> @@ -5,3 +5,11 @@
> */
>
> #include "meson-gx-u-boot.dtsi"
> +
> +&usb0 {
> + status = "disabled";
> +};
> +
> +&usb1 {
> + hnp-srp-disable;
> +};
> diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig
> index 8849058d33..366ea125af 100644
> --- a/configs/odroid-c2_defconfig
> +++ b/configs/odroid-c2_defconfig
> @@ -16,6 +16,7 @@ CONFIG_CMD_GPIO=y
> CONFIG_CMD_I2C=y
> # CONFIG_CMD_LOADS is not set
> CONFIG_CMD_MMC=y
> +CONFIG_CMD_USB=y
> # CONFIG_CMD_SETEXPR is not set
> CONFIG_CMD_REGULATOR=y
> CONFIG_OF_CONTROL=y
> @@ -29,13 +30,19 @@ CONFIG_MMC_MESON_GX=y
> CONFIG_PHY_REALTEK=y
> CONFIG_DM_ETH=y
> CONFIG_ETH_DESIGNWARE=y
> +CONFIG_PHY=y
> +CONFIG_MESON_GXBB_USB_PHY=y
> CONFIG_PINCTRL=y
> CONFIG_PINCTRL_MESON_GXBB=y
> CONFIG_DM_REGULATOR=y
> CONFIG_DM_REGULATOR_FIXED=y
> +CONFIG_DM_REGULATOR_GPIO=y
> CONFIG_DM_RESET=y
> CONFIG_DEBUG_UART_MESON=y
> CONFIG_DEBUG_UART_ANNOUNCE=y
> CONFIG_DEBUG_UART_SKIP_INIT=y
> CONFIG_MESON_SERIAL=y
> +CONFIG_USB=y
> +CONFIG_DM_USB=y
> +CONFIG_USB_DWC2=y
> CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/include/configs/meson64.h b/include/configs/meson64.h
> index f8d3eee292..483a8f567c 100644
> --- a/include/configs/meson64.h
> +++ b/include/configs/meson64.h
> @@ -16,6 +16,11 @@
> #define GICC_BASE 0xc4302000
> #endif
>
> +/* USB */
> +#if defined(CONFIG_MESON_GXBB)
> +#define CONFIG_DWC2_UTMI_WIDTH 16
> +#endif
Hi Neil,
I noticed this change to the bus width configuration isn't actually
needed. The USB port works with or without it. The kernel driver
doesn't set 16bit mode, so can you please remove these 4 lines from
the commit before sending the pull request?
Thanks,
Beniamino
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/2] odroid-c2: enable USB host controller
@ 2020-05-10 14:08 ` Beniamino Galvani
0 siblings, 0 replies; 19+ messages in thread
From: Beniamino Galvani @ 2020-05-10 14:08 UTC (permalink / raw)
To: u-boot, Neil Armstrong
Cc: Tom Rini, Albert Aribaud, Maxime Jourdan, Patrick Delaunay,
u-boot-amlogic
On Sun, Aug 18, 2019 at 03:42:55PM +0200, Beniamino Galvani wrote:
> Enable the second USB controller, which is connected to a hub with 4
> ports. The first controller is for the OTG port and is currently not
> supported.
>
> Signed-off-by: Beniamino Galvani <b.galvani@gmail.com>
> ---
> arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi | 8 ++++++++
> configs/odroid-c2_defconfig | 7 +++++++
> include/configs/meson64.h | 5 +++++
> 3 files changed, 20 insertions(+)
>
> diff --git a/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi b/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi
> index c35158d7e9..484b40504d 100644
> --- a/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi
> +++ b/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi
> @@ -5,3 +5,11 @@
> */
>
> #include "meson-gx-u-boot.dtsi"
> +
> +&usb0 {
> + status = "disabled";
> +};
> +
> +&usb1 {
> + hnp-srp-disable;
> +};
> diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig
> index 8849058d33..366ea125af 100644
> --- a/configs/odroid-c2_defconfig
> +++ b/configs/odroid-c2_defconfig
> @@ -16,6 +16,7 @@ CONFIG_CMD_GPIO=y
> CONFIG_CMD_I2C=y
> # CONFIG_CMD_LOADS is not set
> CONFIG_CMD_MMC=y
> +CONFIG_CMD_USB=y
> # CONFIG_CMD_SETEXPR is not set
> CONFIG_CMD_REGULATOR=y
> CONFIG_OF_CONTROL=y
> @@ -29,13 +30,19 @@ CONFIG_MMC_MESON_GX=y
> CONFIG_PHY_REALTEK=y
> CONFIG_DM_ETH=y
> CONFIG_ETH_DESIGNWARE=y
> +CONFIG_PHY=y
> +CONFIG_MESON_GXBB_USB_PHY=y
> CONFIG_PINCTRL=y
> CONFIG_PINCTRL_MESON_GXBB=y
> CONFIG_DM_REGULATOR=y
> CONFIG_DM_REGULATOR_FIXED=y
> +CONFIG_DM_REGULATOR_GPIO=y
> CONFIG_DM_RESET=y
> CONFIG_DEBUG_UART_MESON=y
> CONFIG_DEBUG_UART_ANNOUNCE=y
> CONFIG_DEBUG_UART_SKIP_INIT=y
> CONFIG_MESON_SERIAL=y
> +CONFIG_USB=y
> +CONFIG_DM_USB=y
> +CONFIG_USB_DWC2=y
> CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/include/configs/meson64.h b/include/configs/meson64.h
> index f8d3eee292..483a8f567c 100644
> --- a/include/configs/meson64.h
> +++ b/include/configs/meson64.h
> @@ -16,6 +16,11 @@
> #define GICC_BASE 0xc4302000
> #endif
>
> +/* USB */
> +#if defined(CONFIG_MESON_GXBB)
> +#define CONFIG_DWC2_UTMI_WIDTH 16
> +#endif
Hi Neil,
I noticed this change to the bus width configuration isn't actually
needed. The USB port works with or without it. The kernel driver
doesn't set 16bit mode, so can you please remove these 4 lines from
the commit before sending the pull request?
Thanks,
Beniamino
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 2/2] odroid-c2: enable USB host controller
2020-05-10 14:08 ` Beniamino Galvani
@ 2020-05-11 13:03 ` Neil Armstrong
-1 siblings, 0 replies; 19+ messages in thread
From: Neil Armstrong @ 2020-05-11 13:03 UTC (permalink / raw)
To: u-boot
Hi,
On 10/05/2020 16:08, Beniamino Galvani wrote:
> On Sun, Aug 18, 2019 at 03:42:55PM +0200, Beniamino Galvani wrote:
>> Enable the second USB controller, which is connected to a hub with 4
>> ports. The first controller is for the OTG port and is currently not
>> supported.
>>
>> Signed-off-by: Beniamino Galvani <b.galvani@gmail.com>
>> ---
>> arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi | 8 ++++++++
>> configs/odroid-c2_defconfig | 7 +++++++
>> include/configs/meson64.h | 5 +++++
>> 3 files changed, 20 insertions(+)
>>
>> diff --git a/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi b/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi
>> index c35158d7e9..484b40504d 100644
>> --- a/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi
>> +++ b/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi
>> @@ -5,3 +5,11 @@
>> */
>>
>> #include "meson-gx-u-boot.dtsi"
>> +
>> +&usb0 {
>> + status = "disabled";
>> +};
>> +
>> +&usb1 {
>> + hnp-srp-disable;
>> +};
>> diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig
>> index 8849058d33..366ea125af 100644
>> --- a/configs/odroid-c2_defconfig
>> +++ b/configs/odroid-c2_defconfig
>> @@ -16,6 +16,7 @@ CONFIG_CMD_GPIO=y
>> CONFIG_CMD_I2C=y
>> # CONFIG_CMD_LOADS is not set
>> CONFIG_CMD_MMC=y
>> +CONFIG_CMD_USB=y
>> # CONFIG_CMD_SETEXPR is not set
>> CONFIG_CMD_REGULATOR=y
>> CONFIG_OF_CONTROL=y
>> @@ -29,13 +30,19 @@ CONFIG_MMC_MESON_GX=y
>> CONFIG_PHY_REALTEK=y
>> CONFIG_DM_ETH=y
>> CONFIG_ETH_DESIGNWARE=y
>> +CONFIG_PHY=y
>> +CONFIG_MESON_GXBB_USB_PHY=y
>> CONFIG_PINCTRL=y
>> CONFIG_PINCTRL_MESON_GXBB=y
>> CONFIG_DM_REGULATOR=y
>> CONFIG_DM_REGULATOR_FIXED=y
>> +CONFIG_DM_REGULATOR_GPIO=y
>> CONFIG_DM_RESET=y
>> CONFIG_DEBUG_UART_MESON=y
>> CONFIG_DEBUG_UART_ANNOUNCE=y
>> CONFIG_DEBUG_UART_SKIP_INIT=y
>> CONFIG_MESON_SERIAL=y
>> +CONFIG_USB=y
>> +CONFIG_DM_USB=y
>> +CONFIG_USB_DWC2=y
>> CONFIG_OF_LIBFDT_OVERLAY=y
>> diff --git a/include/configs/meson64.h b/include/configs/meson64.h
>> index f8d3eee292..483a8f567c 100644
>> --- a/include/configs/meson64.h
>> +++ b/include/configs/meson64.h
>> @@ -16,6 +16,11 @@
>> #define GICC_BASE 0xc4302000
>> #endif
>>
>> +/* USB */
>> +#if defined(CONFIG_MESON_GXBB)
>> +#define CONFIG_DWC2_UTMI_WIDTH 16
>> +#endif
>
> Hi Neil,
>
> I noticed this change to the bus width configuration isn't actually
> needed. The USB port works with or without it. The kernel driver
> doesn't set 16bit mode, so can you please remove these 4 lines from
> the commit before sending the pull request?
>
> Thanks,
> Beniamino
>
Thanks,
I altered the commit removing this.
Neil
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/2] odroid-c2: enable USB host controller
@ 2020-05-11 13:03 ` Neil Armstrong
0 siblings, 0 replies; 19+ messages in thread
From: Neil Armstrong @ 2020-05-11 13:03 UTC (permalink / raw)
To: Beniamino Galvani, u-boot
Cc: Tom Rini, Albert Aribaud, Maxime Jourdan, Patrick Delaunay,
u-boot-amlogic
Hi,
On 10/05/2020 16:08, Beniamino Galvani wrote:
> On Sun, Aug 18, 2019 at 03:42:55PM +0200, Beniamino Galvani wrote:
>> Enable the second USB controller, which is connected to a hub with 4
>> ports. The first controller is for the OTG port and is currently not
>> supported.
>>
>> Signed-off-by: Beniamino Galvani <b.galvani@gmail.com>
>> ---
>> arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi | 8 ++++++++
>> configs/odroid-c2_defconfig | 7 +++++++
>> include/configs/meson64.h | 5 +++++
>> 3 files changed, 20 insertions(+)
>>
>> diff --git a/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi b/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi
>> index c35158d7e9..484b40504d 100644
>> --- a/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi
>> +++ b/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi
>> @@ -5,3 +5,11 @@
>> */
>>
>> #include "meson-gx-u-boot.dtsi"
>> +
>> +&usb0 {
>> + status = "disabled";
>> +};
>> +
>> +&usb1 {
>> + hnp-srp-disable;
>> +};
>> diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig
>> index 8849058d33..366ea125af 100644
>> --- a/configs/odroid-c2_defconfig
>> +++ b/configs/odroid-c2_defconfig
>> @@ -16,6 +16,7 @@ CONFIG_CMD_GPIO=y
>> CONFIG_CMD_I2C=y
>> # CONFIG_CMD_LOADS is not set
>> CONFIG_CMD_MMC=y
>> +CONFIG_CMD_USB=y
>> # CONFIG_CMD_SETEXPR is not set
>> CONFIG_CMD_REGULATOR=y
>> CONFIG_OF_CONTROL=y
>> @@ -29,13 +30,19 @@ CONFIG_MMC_MESON_GX=y
>> CONFIG_PHY_REALTEK=y
>> CONFIG_DM_ETH=y
>> CONFIG_ETH_DESIGNWARE=y
>> +CONFIG_PHY=y
>> +CONFIG_MESON_GXBB_USB_PHY=y
>> CONFIG_PINCTRL=y
>> CONFIG_PINCTRL_MESON_GXBB=y
>> CONFIG_DM_REGULATOR=y
>> CONFIG_DM_REGULATOR_FIXED=y
>> +CONFIG_DM_REGULATOR_GPIO=y
>> CONFIG_DM_RESET=y
>> CONFIG_DEBUG_UART_MESON=y
>> CONFIG_DEBUG_UART_ANNOUNCE=y
>> CONFIG_DEBUG_UART_SKIP_INIT=y
>> CONFIG_MESON_SERIAL=y
>> +CONFIG_USB=y
>> +CONFIG_DM_USB=y
>> +CONFIG_USB_DWC2=y
>> CONFIG_OF_LIBFDT_OVERLAY=y
>> diff --git a/include/configs/meson64.h b/include/configs/meson64.h
>> index f8d3eee292..483a8f567c 100644
>> --- a/include/configs/meson64.h
>> +++ b/include/configs/meson64.h
>> @@ -16,6 +16,11 @@
>> #define GICC_BASE 0xc4302000
>> #endif
>>
>> +/* USB */
>> +#if defined(CONFIG_MESON_GXBB)
>> +#define CONFIG_DWC2_UTMI_WIDTH 16
>> +#endif
>
> Hi Neil,
>
> I noticed this change to the bus width configuration isn't actually
> needed. The USB port works with or without it. The kernel driver
> doesn't set 16bit mode, so can you please remove these 4 lines from
> the commit before sending the pull request?
>
> Thanks,
> Beniamino
>
Thanks,
I altered the commit removing this.
Neil
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2020-05-11 13:03 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-18 13:42 [U-Boot] Enable USB host controller on Odroid-C2 Beniamino Galvani
2019-08-18 13:42 ` [U-Boot] [PATCH 1/2] phy: meson: add GXBB PHY driver Beniamino Galvani
2019-08-19 7:16 ` Neil Armstrong
2019-08-19 7:16 ` Neil Armstrong
2020-04-24 7:20 ` Neil Armstrong
2020-04-24 7:20 ` Neil Armstrong
2019-08-18 13:42 ` [U-Boot] [PATCH 2/2] odroid-c2: enable USB host controller Beniamino Galvani
2020-05-10 14:08 ` Beniamino Galvani
2020-05-10 14:08 ` Beniamino Galvani
2020-05-11 13:03 ` Neil Armstrong
2020-05-11 13:03 ` Neil Armstrong
2019-08-28 8:22 ` [U-Boot] Enable USB host controller on Odroid-C2 Neil Armstrong
2019-08-28 8:22 ` Neil Armstrong
2019-10-18 14:54 ` [U-Boot] " Neil Armstrong
2019-10-18 14:54 ` Neil Armstrong
2020-03-27 13:35 ` Neil Armstrong
2020-03-27 13:35 ` Neil Armstrong
2020-04-19 20:16 ` Beniamino Galvani
2020-04-19 20:16 ` Beniamino Galvani
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.