Skip to contentSkip to conversation

Register at91 OHCI into DM and add SAMA7 USB PHY's

PATCH In review Sergiu Moga 2 participants 5 messages Jan 4, 2023

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

v3 cover Register at91 OHCI into DM and add SAMA7 USB PHY's

This patch series originates from a bigger patch series:
https://lists.denx.de/pipermail/u-boot/2022-December/502865.html

Register ohci-at91 driver into Driver Model. In order for the VBUS to stay enabled, a child_pre_probe method has been added to overcome the DM core disabling it in usb_scan_device: when the generic device_probe method is called, the pinctrl is processed once again, undoing whatever changes have been made in our driver's probe method.
In order to enable USB on SAMA7G5 the addition of the USB 2.0 PHY drivers were required.

v1 -> v2:
- squashed previous 3/4 patch into 2/4 patch
- used *_bulk API's
- re-wrote at91_for_each_port
- use dev_read_u32_default for pdata->ports

v2 -> v3:
- corrected memory leak in the utmi phy driver probe method
- checked dev_read_addr return value
- add clk_disable in case of failure after at91_start_hc
- prefer using if (CONFIG_IS_ENABLED(...))
- add comment regarding why non-DM version must stay

Sergiu Moga (3):
phy: at91: Add support for the USB 2.0 PHY's of SAMA7
usb: ohci-at91: Enable OHCI functionality and register into DM
usb: ohci-at91: Add USB PHY functionality

 drivers/phy/Kconfig              |  10 ++
 drivers/phy/Makefile             |   1 +
 drivers/phy/phy-sama7-usb.c      |  90 +++++++++++++
 drivers/phy/phy-sama7-utmi-clk.c | 216 +++++++++++++++++++++++++++++++
 drivers/usb/host/Kconfig         |   1 +
 drivers/usb/host/ohci-at91.c     | 187 ++++++++++++++++++++++++++
 6 files changed, 505 insertions(+)
 create mode 100644 drivers/phy/phy-sama7-usb.c
 create mode 100644 drivers/phy/phy-sama7-utmi-clk.c
Signature · 1 line
2.34.1
#1 lore raw

PATCH v3 1/3 phy: at91: Add support for the USB 2.0 PHY's of SAMA7

In order to have USB functionality, drivers for SAMA7's USB 2.0 PHY's have been added. There is one driver for UTMI clock's SFR and RESET required functionalities and one for its three possible subclocks of the phy's themselves. In order for this layout to properly work in conjunction with CCF and DT, the former driver will also act as a clock provider for the three phy's with the help of a custom hook into the driver's of_xlate method.

---

v1 -> v2:
- Nothing

v2 -> v3:
- fix memory leak in the probe method

 drivers/phy/Kconfig              |  10 ++
 drivers/phy/Makefile             |   1 +
 drivers/phy/phy-sama7-usb.c      |  90 +++++++++++++
 drivers/phy/phy-sama7-utmi-clk.c | 216 +++++++++++++++++++++++++++++++
 4 files changed, 317 insertions(+)
 create mode 100644 drivers/phy/phy-sama7-usb.c
 create mode 100644 drivers/phy/phy-sama7-utmi-clk.c
drivers/phy/Kconfig +10 -0
index cf4d5908d7..9fbb956783 100644
@@ -281,6 +281,16 @@ config PHY_XILINX_ZYNQMP
 	  Enable this to support ZynqMP High Speed Gigabit Transceiver
 	  that is part of ZynqMP SoC.
 
+config PHY_MICROCHIP_SAMA7_USB
+       tristate "Microchip SAMA7 USB 2.0 PHY"
+       depends on PHY && ARCH_AT91
+       help
+	 Enable this to support SAMA7 USB 2.0 PHY.
+
+	 The USB 2.0 PHY integrates high-speed, full-speed and low-speed
+	 termination and signal switching. With a single resistor, it
+	 requires minimal external components.
+
 source "drivers/phy/rockchip/Kconfig"
 source "drivers/phy/cadence/Kconfig"
 source "drivers/phy/ti/Kconfig"
drivers/phy/Makefile +1 -0
index a3b9f3c5b1..9d50affd47 100644
@@ -38,6 +38,7 @@ obj-$(CONFIG_PHY_MTK_TPHY) += phy-mtk-tphy.o
 obj-$(CONFIG_PHY_NPCM_USB) += phy-npcm-usb.o
 obj-$(CONFIG_PHY_IMX8MQ_USB) += phy-imx8mq-usb.o
 obj-$(CONFIG_PHY_XILINX_ZYNQMP) += phy-zynqmp.o
+obj-$(CONFIG_PHY_MICROCHIP_SAMA7_USB)  += phy-sama7-utmi-clk.o phy-sama7-usb.o
 obj-y += cadence/
 obj-y += ti/
 obj-y += qcom/
drivers/phy/phy-sama7-usb.c new file +90 -0

90 lines not on this page · raw message

drivers/phy/phy-sama7-utmi-clk.c new file +216 -0

216 lines not on this page · raw message

Signature · 1 line
2.34.1
#2 lore raw

PATCH v3 2/3 usb: ohci-at91: Enable OHCI functionality and register into DM

In reply to Sergiu Moga

Register the OHCI driver into DM by properly initializing the required clocks and pins required by the DT node of OHCI. In order for the VBUS to stay enabled, a child_pre_probe method has been added to overcome the DM core disabling it in usb_scan_device: when the generic device_probe method is called, the pinctrl is processed once again, undoing whatever changes have been made in our driver's probe method.

Furthermore, enable CONFIG_DM_GPIO whenever this driver and CONFIG_DM_USB are selected.

---

v1 -> v2:
- squashed 3/4 into this patch
- removed bool clocked
- use *_blk API's
- select DM_GPIO in Kconfig if DM_USB enabled
- use dev_read_u32_default

v2 -> v3:
- check value of dev_read_addr
- clk_disable in case of failure after at91_start_hc

 drivers/usb/host/Kconfig     |   1 +
 drivers/usb/host/ohci-at91.c | 159 +++++++++++++++++++++++++++++++++++
 2 files changed, 160 insertions(+)
drivers/usb/host/Kconfig +1 -0
index 6213b3c95f..bb1443a338 100644
@@ -424,6 +424,7 @@ config USB_ATMEL
 	depends on ARCH_AT91
 	select SYS_USB_OHCI_CPU_INIT
 	select USB_OHCI_NEW
+	select DM_GPIO if DM_USB
 
 choice
 	prompt "Clock for OHCI"
drivers/usb/host/ohci-at91.c +159 -0

168 lines not on this page · raw message

Signature · 1 line
2.34.1
#3 lore raw

PATCH v3 3/3 usb: ohci-at91: Add USB PHY functionality

In reply to Sergiu Moga

Add the ability to enable/disable whatever USB PHY's are passed to the AT91 OHCI driver through DT.

---

v1 -> v2:
- use *_bulk API's

v2 -> v3:
- use if (CONFIG_IS_ENABLED(...))

 drivers/usb/host/ohci-at91.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
drivers/usb/host/ohci-at91.c +28 -0
index 92d0ab7184..171245ef6e 100644
@@ -73,6 +73,7 @@ int usb_cpu_init_fail(void)
 #include <asm/gpio.h>
 #include <usb.h>
 #include "ohci.h"
+#include <generic-phy.h>
 
 #define AT91_MAX_USBH_PORTS        3
 
@@ -90,15 +91,32 @@ struct at91_usbh_data {
 struct ohci_at91_priv {
 	ohci_t ohci;
 	struct clk_bulk clks;
+	struct phy_bulk phys;
 };
 
 static int at91_start_clock(struct ohci_at91_priv *ohci_at91)
 {
+	if (CONFIG_IS_ENABLED(PHY_MICROCHIP_SAMA7_USB)) {
+		int ret;
+
+		ret = generic_phy_power_on_bulk(&ohci_at91->phys);
+		if (ret)
+			return ret;
+	}
+
 	return clk_enable_bulk(&ohci_at91->clks);
 }
 
 static int at91_stop_clock(struct ohci_at91_priv *ohci_at91)
 {
+	if (CONFIG_IS_ENABLED(PHY_MICROCHIP_SAMA7_USB)) {
+		int ret;
+
+		ret = generic_phy_power_off_bulk(&ohci_at91->phys);
+		if (ret)
+			return ret;
+	}
+
 	return clk_disable_bulk(&ohci_at91->clks);
 }
 
@@ -185,6 +203,16 @@ static int ohci_atmel_probe(struct udevice *dev)
 	if (ret)
 		goto fail;
 
+	if (CONFIG_IS_ENABLED(PHY_MICROCHIP_SAMA7_USB)) {
+		ret = generic_phy_get_bulk(dev, &ohci_at91->phys);
+		if (ret)
+			goto fail;
+
+		ret = generic_phy_init_bulk(&ohci_at91->phys);
+		if (ret)
+			goto fail;
+	}
+
 	ret = at91_start_hc(dev);
 	if (ret)
 		goto fail;
Signature · 1 line
2.34.1