* [U-Boot] [PATCH 1/2] phy: rcar: Add R-Car Gen3 PHY driver
@ 2018-10-02 20:55 Marek Vasut
2018-10-02 20:55 ` [U-Boot] [PATCH 2/2] ARM: rmobile: Enable PHY framework on Gen3 Marek Vasut
2019-03-07 22:18 ` [U-Boot] [PATCH 1/2] phy: rcar: Add R-Car Gen3 PHY driver Eugeniu Rosca
0 siblings, 2 replies; 6+ messages in thread
From: Marek Vasut @ 2018-10-02 20:55 UTC (permalink / raw)
To: u-boot
Add a PHY driver for the R-Car Gen3 which allows configuring
USB OTG PHY on Gen3 into host mode and toggles VBUS in case a
dedicated regulator is present.
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---
drivers/phy/Kconfig | 8 ++
drivers/phy/Makefile | 1 +
drivers/phy/phy-rcar-gen3.c | 161 ++++++++++++++++++++++++++++++++++++
3 files changed, 170 insertions(+)
create mode 100644 drivers/phy/phy-rcar-gen3.c
diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index bcc8e22795..14d82b93ed 100644
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -118,6 +118,14 @@ config PHY_RCAR_GEN2
PHY connected to USBHS module, PCI EHCI module and USB3.0 module and
allows configuring the module multiplexing.
+config PHY_RCAR_GEN3
+ tristate "Renesas R-Car Gen3 USB PHY"
+ depends on PHY && RCAR_GEN3 && CLK && DM_REGULATOR
+ default y if RCAR_GEN3
+ help
+ Support for the Renesas R-Car Gen3 USB PHY. This driver operates the
+ PHY connected to EHCI USB module and controls USB OTG operation.
+
config PHY_STM32_USBPHYC
tristate "STMicroelectronics STM32 SoC USB HS PHY driver"
depends on PHY && ARCH_STM32MP
diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
index 1e1e4ca11e..8030d599e7 100644
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@ -13,6 +13,7 @@ obj-$(CONFIG_PHY_SANDBOX) += sandbox-phy.o
obj-$(CONFIG_$(SPL_)PIPE3_PHY) += ti-pipe3-phy.o
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_GXL_USB_PHY) += meson-gxl-usb2.o meson-gxl-usb3.o
obj-$(CONFIG_MSM8916_USB_PHY) += msm8916-usbh-phy.o
diff --git a/drivers/phy/phy-rcar-gen3.c b/drivers/phy/phy-rcar-gen3.c
new file mode 100644
index 0000000000..b662935626
--- /dev/null
+++ b/drivers/phy/phy-rcar-gen3.c
@@ -0,0 +1,161 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Renesas RCar Gen3 USB PHY driver
+ *
+ * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
+ */
+
+#include <common.h>
+#include <clk.h>
+#include <div64.h>
+#include <dm.h>
+#include <fdtdec.h>
+#include <generic-phy.h>
+#include <reset.h>
+#include <syscon.h>
+#include <usb.h>
+#include <asm/io.h>
+#include <linux/bitops.h>
+#include <power/regulator.h>
+
+/* USB2.0 Host registers (original offset is +0x200) */
+#define USB2_INT_ENABLE 0x000
+#define USB2_USBCTR 0x00c
+#define USB2_SPD_RSM_TIMSET 0x10c
+#define USB2_OC_TIMSET 0x110
+#define USB2_COMMCTRL 0x600
+#define USB2_OBINTSTA 0x604
+#define USB2_OBINTEN 0x608
+#define USB2_VBCTRL 0x60c
+#define USB2_LINECTRL1 0x610
+#define USB2_ADPCTRL 0x630
+
+/* USBCTR */
+#define USB2_USBCTR_PLL_RST BIT(1)
+
+/* SPD_RSM_TIMSET */
+#define USB2_SPD_RSM_TIMSET_INIT 0x014e029b
+
+/* OC_TIMSET */
+#define USB2_OC_TIMSET_INIT 0x000209ab
+
+/* COMMCTRL */
+#define USB2_COMMCTRL_OTG_PERI BIT(31) /* 1 = Peripheral mode */
+
+/* LINECTRL1 */
+#define USB2_LINECTRL1_DP_RPD BIT(18)
+#define USB2_LINECTRL1_DM_RPD BIT(16)
+
+/* ADPCTRL */
+#define USB2_ADPCTRL_DRVVBUS BIT(4)
+
+struct rcar_gen3_phy {
+ fdt_addr_t regs;
+ struct clk clk;
+ struct udevice *vbus_supply;
+};
+
+static int rcar_gen3_phy_phy_init(struct phy *phy)
+{
+ struct rcar_gen3_phy *priv = dev_get_priv(phy->dev);
+
+ /* Initialize USB2 part */
+ writel(0, priv->regs + USB2_INT_ENABLE);
+ writel(USB2_SPD_RSM_TIMSET_INIT, priv->regs + USB2_SPD_RSM_TIMSET);
+ writel(USB2_OC_TIMSET_INIT, priv->regs + USB2_OC_TIMSET);
+
+ setbits_le32(priv->regs + USB2_LINECTRL1,
+ USB2_LINECTRL1_DP_RPD | USB2_LINECTRL1_DM_RPD);
+
+ clrbits_le32(priv->regs + USB2_COMMCTRL, USB2_COMMCTRL_OTG_PERI);
+
+ setbits_le32(priv->regs + USB2_ADPCTRL, USB2_ADPCTRL_DRVVBUS);
+
+ return 0;
+}
+
+static int rcar_gen3_phy_phy_power_on(struct phy *phy)
+{
+ struct rcar_gen3_phy *priv = dev_get_priv(phy->dev);
+ int ret;
+
+ if (priv->vbus_supply) {
+ ret = regulator_set_enable(priv->vbus_supply, true);
+ if (ret)
+ return ret;
+ }
+
+ setbits_le32(priv->regs + USB2_USBCTR, USB2_USBCTR_PLL_RST);
+ clrbits_le32(priv->regs + USB2_USBCTR, USB2_USBCTR_PLL_RST);
+
+ return 0;
+}
+
+static int rcar_gen3_phy_phy_power_off(struct phy *phy)
+{
+ struct rcar_gen3_phy *priv = dev_get_priv(phy->dev);
+
+ if (!priv->vbus_supply)
+ return 0;
+
+ return regulator_set_enable(priv->vbus_supply, false);
+}
+
+static const struct phy_ops rcar_gen3_phy_phy_ops = {
+ .init = rcar_gen3_phy_phy_init,
+ .power_on = rcar_gen3_phy_phy_power_on,
+ .power_off = rcar_gen3_phy_phy_power_off,
+};
+
+static int rcar_gen3_phy_probe(struct udevice *dev)
+{
+ struct rcar_gen3_phy *priv = dev_get_priv(dev);
+ int ret;
+
+ priv->regs = dev_read_addr(dev);
+ if (priv->regs == FDT_ADDR_T_NONE)
+ return -EINVAL;
+
+ ret = device_get_supply_regulator(dev, "vbus-supply",
+ &priv->vbus_supply);
+ if (ret && ret != -ENOENT) {
+ pr_err("Failed to get PHY regulator\n");
+ return ret;
+ }
+
+ /* Enable clock */
+ ret = clk_get_by_index(dev, 0, &priv->clk);
+ if (ret)
+ return ret;
+
+ ret = clk_enable(&priv->clk);
+ if (ret)
+ return ret;
+
+ return 0;
+}
+
+static int rcar_gen3_phy_remove(struct udevice *dev)
+{
+ struct rcar_gen3_phy *priv = dev_get_priv(dev);
+
+ clk_disable(&priv->clk);
+ clk_free(&priv->clk);
+
+ return 0;
+}
+
+static const struct udevice_id rcar_gen3_phy_of_match[] = {
+ { .compatible = "renesas,rcar-gen3-usb2-phy", },
+ { },
+};
+
+U_BOOT_DRIVER(rcar_gen3_phy) = {
+ .name = "rcar-gen3-phy",
+ .id = UCLASS_PHY,
+ .of_match = rcar_gen3_phy_of_match,
+ .ops = &rcar_gen3_phy_phy_ops,
+ .probe = rcar_gen3_phy_probe,
+ .remove = rcar_gen3_phy_remove,
+ .priv_auto_alloc_size = sizeof(struct rcar_gen3_phy),
+};
--
2.18.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 2/2] ARM: rmobile: Enable PHY framework on Gen3
2018-10-02 20:55 [U-Boot] [PATCH 1/2] phy: rcar: Add R-Car Gen3 PHY driver Marek Vasut
@ 2018-10-02 20:55 ` Marek Vasut
2019-03-07 22:18 ` [U-Boot] [PATCH 1/2] phy: rcar: Add R-Car Gen3 PHY driver Eugeniu Rosca
1 sibling, 0 replies; 6+ messages in thread
From: Marek Vasut @ 2018-10-02 20:55 UTC (permalink / raw)
To: u-boot
Enable PHY framework on Gen3, this is required for USB EHCI PHY support.
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---
arch/arm/mach-rmobile/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mach-rmobile/Kconfig b/arch/arm/mach-rmobile/Kconfig
index fc4b3c3219..ac08d6eb12 100644
--- a/arch/arm/mach-rmobile/Kconfig
+++ b/arch/arm/mach-rmobile/Kconfig
@@ -11,6 +11,7 @@ config RCAR_32
config RCAR_GEN3
bool "Renesas ARM SoCs R-Car Gen3 (64bit)"
select ARM64
+ select PHY
endchoice
--
2.18.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 1/2] phy: rcar: Add R-Car Gen3 PHY driver
2018-10-02 20:55 [U-Boot] [PATCH 1/2] phy: rcar: Add R-Car Gen3 PHY driver Marek Vasut
2018-10-02 20:55 ` [U-Boot] [PATCH 2/2] ARM: rmobile: Enable PHY framework on Gen3 Marek Vasut
@ 2019-03-07 22:18 ` Eugeniu Rosca
2019-03-08 2:30 ` Marek Vasut
1 sibling, 1 reply; 6+ messages in thread
From: Eugeniu Rosca @ 2019-03-07 22:18 UTC (permalink / raw)
To: u-boot
Hello Marek cc: Shimoda-san, Morimoto-san,
Is there any USB gadget/peripheral R-Car3 U-Boot driver WIP on your side?
We have something in the official release which looks like a chopped
version of linux usbhs [1], but I believe it has to be converted to DM
to become mainline-grade.
Is there an easier (relatively clean) way to have U-Boot fastboot
support on R-Car3?
[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/usb/renesas_usbhs
Thanks and best regards,
Eugeniu.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 1/2] phy: rcar: Add R-Car Gen3 PHY driver
2019-03-07 22:18 ` [U-Boot] [PATCH 1/2] phy: rcar: Add R-Car Gen3 PHY driver Eugeniu Rosca
@ 2019-03-08 2:30 ` Marek Vasut
2019-03-08 13:40 ` Eugeniu Rosca
0 siblings, 1 reply; 6+ messages in thread
From: Marek Vasut @ 2019-03-08 2:30 UTC (permalink / raw)
To: u-boot
On 3/7/19 11:18 PM, Eugeniu Rosca wrote:
> Hello Marek cc: Shimoda-san, Morimoto-san,
Hi,
> Is there any USB gadget/peripheral R-Car3 U-Boot driver WIP on your side?
Yes, I'm working on a driver, for next release.
> We have something in the official release which looks like a chopped
> version of linux usbhs [1], but I believe it has to be converted to DM
> to become mainline-grade.
> Is there an easier (relatively clean) way to have U-Boot fastboot
> support on R-Car3?
>
> [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/usb/renesas_usbhs
I have the horrible driver that's in the android bsp ported over to the
current release, but cleaning it up and converting it over to DM is a
huge undertaking, so please give me some time to finish it.
I can share the preliminary version with you, but it isn't pretty.
--
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 1/2] phy: rcar: Add R-Car Gen3 PHY driver
2019-03-08 2:30 ` Marek Vasut
@ 2019-03-08 13:40 ` Eugeniu Rosca
2019-03-08 13:51 ` Marek Vasut
0 siblings, 1 reply; 6+ messages in thread
From: Eugeniu Rosca @ 2019-03-08 13:40 UTC (permalink / raw)
To: u-boot
Hello Marek,
On Fri, Mar 08, 2019 at 03:30:02AM +0100, Marek Vasut wrote:
> On 3/7/19 11:18 PM, Eugeniu Rosca wrote:
> > Hello Marek cc: Shimoda-san, Morimoto-san,
>
> Hi,
>
> > Is there any USB gadget/peripheral R-Car3 U-Boot driver WIP on your side?
>
> Yes, I'm working on a driver, for next release.
Sounds great!
> > We have something in the official release which looks like a chopped
> > version of linux usbhs [1], but I believe it has to be converted to DM
> > to become mainline-grade.
> > Is there an easier (relatively clean) way to have U-Boot fastboot
> > support on R-Car3?
> >
> > [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/usb/renesas_usbhs
>
> I have the horrible driver that's in the android bsp ported over to the
> current release, but cleaning it up and converting it over to DM is a
> huge undertaking, so please give me some time to finish it.
>
> I can share the preliminary version with you, but it isn't pretty.
I think for the time being will will stick to the Renesas-delivered
driver, but we are eager to review and test your future proposals, so
please keep the ADIT guys in the loop. Many thanks for your dedication
in supporting the R-Car platform.
>
> --
> Best regards,
> Marek Vasut
Best regards,
Eugeniu.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 1/2] phy: rcar: Add R-Car Gen3 PHY driver
2019-03-08 13:40 ` Eugeniu Rosca
@ 2019-03-08 13:51 ` Marek Vasut
0 siblings, 0 replies; 6+ messages in thread
From: Marek Vasut @ 2019-03-08 13:51 UTC (permalink / raw)
To: u-boot
On 3/8/19 2:40 PM, Eugeniu Rosca wrote:
> Hello Marek,
Hi,
> On Fri, Mar 08, 2019 at 03:30:02AM +0100, Marek Vasut wrote:
>> On 3/7/19 11:18 PM, Eugeniu Rosca wrote:
>>> Hello Marek cc: Shimoda-san, Morimoto-san,
>>
>> Hi,
>>
>>> Is there any USB gadget/peripheral R-Car3 U-Boot driver WIP on your side?
>>
>> Yes, I'm working on a driver, for next release.
>
> Sounds great!
>
>>> We have something in the official release which looks like a chopped
>>> version of linux usbhs [1], but I believe it has to be converted to DM
>>> to become mainline-grade.
>>> Is there an easier (relatively clean) way to have U-Boot fastboot
>>> support on R-Car3?
>>>
>>> [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/usb/renesas_usbhs
>>
>> I have the horrible driver that's in the android bsp ported over to the
>> current release, but cleaning it up and converting it over to DM is a
>> huge undertaking, so please give me some time to finish it.
>>
>> I can share the preliminary version with you, but it isn't pretty.
>
> I think for the time being will will stick to the Renesas-delivered
> driver, but we are eager to review and test your future proposals, so
> please keep the ADIT guys in the loop. Many thanks for your dedication
> in supporting the R-Car platform.
You're welcome.
Please let me know if something is broken and send patches. Thank you
for your testing :)
--
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-03-08 13:51 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-02 20:55 [U-Boot] [PATCH 1/2] phy: rcar: Add R-Car Gen3 PHY driver Marek Vasut
2018-10-02 20:55 ` [U-Boot] [PATCH 2/2] ARM: rmobile: Enable PHY framework on Gen3 Marek Vasut
2019-03-07 22:18 ` [U-Boot] [PATCH 1/2] phy: rcar: Add R-Car Gen3 PHY driver Eugeniu Rosca
2019-03-08 2:30 ` Marek Vasut
2019-03-08 13:40 ` Eugeniu Rosca
2019-03-08 13:51 ` Marek Vasut
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.