From: Sergiu Moga <sergiu.moga@microchip.com>
To: <eugen.hristev@microchip.com>, <durai.manickamkr@microchip.com>,
<sandeep.sheriker@microchip.com>, <greg@embeddedgreg.com>,
<nicolas.ferre@microchip.com>, <ludovic.desroches@microchip.com>,
<lukma@denx.de>, <seanga2@gmail.com>, <marex@denx.de>,
<sergiu.moga@microchip.com>, <michael@walle.cc>, <hs@denx.de>,
<claudiu.beznea@microchip.com>,
<balamanikandan.gunasundar@microchip.com>,
<michael@amarulasolutions.com>,
<dario.binacchi@amarulasolutions.com>,
<cristian.birsan@microchip.com>, <peng.fan@nxp.com>,
<mihai.sain@microchip.com>, <weijie.gao@mediatek.com>,
<sumit.garg@linaro.org>, <jim.t90615@gmail.com>,
<michal.simek@amd.com>, <sjg@chromium.org>, <j-keerthy@ti.com>,
<ashok.reddy.soma@xilinx.com>
Cc: <u-boot@lists.denx.de>
Subject: [PATCH v4 06/19] usb: ohci-at91: Enable OHCI functionality and register into DM
Date: Mon, 19 Dec 2022 10:46:14 +0200 [thread overview]
Message-ID: <20221219084626.34606-7-sergiu.moga@microchip.com> (raw)
In-Reply-To: <20221219084626.34606-1-sergiu.moga@microchip.com>
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.
Signed-off-by: Sergiu Moga <sergiu.moga@microchip.com>
---
v1 -> v2:
- Move ` #include <asm/arch/clk.h>` below `#if !(CONFIG_IS_ENABLED(DM_USB))` to
avoid implicit declarations warnings/errors
v2 -> v4:
- No change
drivers/usb/host/ohci-at91.c | 183 +++++++++++++++++++++++++++++++++++
1 file changed, 183 insertions(+)
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index 9b955c1bd6..8a10a29564 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -5,6 +5,9 @@
*/
#include <common.h>
+
+#if !(CONFIG_IS_ENABLED(DM_USB))
+
#include <asm/arch/clk.h>
int usb_cpu_init(void)
@@ -62,3 +65,183 @@ int usb_cpu_init_fail(void)
{
return usb_cpu_stop();
}
+
+#elif CONFIG_IS_ENABLED(DM_GPIO)
+
+#include <clk.h>
+#include <dm.h>
+#include <asm/gpio.h>
+#include <usb.h>
+#include "ohci.h"
+
+#define AT91_MAX_USBH_PORTS 3
+
+#define at91_for_each_port(index) \
+ for ((index) = 0; (index) < AT91_MAX_USBH_PORTS; (index)++)
+
+struct at91_usbh_data {
+ enum usb_init_type init_type;
+ struct gpio_desc vbus_pin[AT91_MAX_USBH_PORTS];
+ u8 ports; /* number of ports on root hub */
+};
+
+struct ohci_at91_priv {
+ struct clk *iclk;
+ struct clk *fclk;
+ struct clk *hclk;
+ bool clocked;
+};
+
+static void at91_start_clock(struct ohci_at91_priv *ohci_at91)
+{
+ if (ohci_at91->clocked)
+ return;
+
+ clk_set_rate(ohci_at91->fclk, 48000000);
+ clk_prepare_enable(ohci_at91->hclk);
+ clk_prepare_enable(ohci_at91->iclk);
+ clk_prepare_enable(ohci_at91->fclk);
+ ohci_at91->clocked = true;
+}
+
+static void at91_stop_clock(struct ohci_at91_priv *ohci_at91)
+{
+ if (!ohci_at91->clocked)
+ return;
+
+ clk_disable_unprepare(ohci_at91->fclk);
+ clk_disable_unprepare(ohci_at91->iclk);
+ clk_disable_unprepare(ohci_at91->hclk);
+ ohci_at91->clocked = false;
+}
+
+static void ohci_at91_set_power(struct at91_usbh_data *pdata, int port,
+ bool enable)
+{
+ if (!dm_gpio_is_valid(&pdata->vbus_pin[port]))
+ return;
+
+ if (enable)
+ dm_gpio_set_dir_flags(&pdata->vbus_pin[port],
+ GPIOD_IS_OUT | GPIOD_IS_OUT_ACTIVE);
+ else
+ dm_gpio_set_dir_flags(&pdata->vbus_pin[port], 0);
+}
+
+static void at91_start_hc(struct udevice *dev)
+{
+ struct ohci_at91_priv *ohci_at91 = dev_get_priv(dev);
+
+ at91_start_clock(ohci_at91);
+}
+
+static void at91_stop_hc(struct udevice *dev)
+{
+ struct ohci_at91_priv *ohci_at91 = dev_get_priv(dev);
+
+ at91_stop_clock(ohci_at91);
+}
+
+static int ohci_atmel_deregister(struct udevice *dev)
+{
+ struct at91_usbh_data *pdata = dev_get_plat(dev);
+ int i;
+
+ at91_stop_hc(dev);
+
+ at91_for_each_port(i) {
+ if (i >= pdata->ports)
+ break;
+
+ ohci_at91_set_power(pdata, i, false);
+ }
+
+ return ohci_deregister(dev);
+}
+
+static int ohci_atmel_child_pre_probe(struct udevice *dev)
+{
+ struct udevice *ohci_controller = dev_get_parent(dev);
+ struct at91_usbh_data *pdata = dev_get_plat(ohci_controller);
+ int i;
+
+ at91_for_each_port(i) {
+ if (i >= pdata->ports)
+ break;
+
+ ohci_at91_set_power(pdata, i, true);
+ }
+
+ return 0;
+}
+
+static int ohci_atmel_probe(struct udevice *dev)
+{
+ struct at91_usbh_data *pdata = dev_get_plat(dev);
+ struct ohci_at91_priv *ohci_at91 = dev_get_priv(dev);
+ int i;
+ int ret;
+ u32 ports;
+ struct ohci_regs *regs = (struct ohci_regs *)dev_read_addr(dev);
+
+ if (!dev_read_u32(dev, "num-ports", &ports))
+ pdata->ports = ports;
+
+ at91_for_each_port(i) {
+ if (i >= pdata->ports)
+ break;
+
+ gpio_request_by_name(dev, "atmel,vbus-gpio", i,
+ &pdata->vbus_pin[i], GPIOD_IS_OUT |
+ GPIOD_IS_OUT_ACTIVE);
+ }
+
+ ohci_at91->iclk = devm_clk_get(dev, "ohci_clk");
+ if (IS_ERR(ohci_at91->iclk)) {
+ ret = PTR_ERR(ohci_at91->iclk);
+ goto fail;
+ }
+
+ ohci_at91->fclk = devm_clk_get(dev, "uhpck");
+ if (IS_ERR(ohci_at91->fclk)) {
+ ret = PTR_ERR(ohci_at91->fclk);
+ goto fail;
+ }
+
+ ohci_at91->hclk = devm_clk_get(dev, "hclk");
+ if (IS_ERR(ohci_at91->hclk)) {
+ ret = PTR_ERR(ohci_at91->hclk);
+ goto fail;
+ }
+
+ at91_start_hc(dev);
+
+ return ohci_register(dev, regs);
+
+fail:
+ at91_for_each_port(i)
+ if (&pdata->vbus_pin[i])
+ gpio_free(pdata->vbus_pin[i].offset);
+
+ return ret;
+}
+
+static const struct udevice_id ohci_usb_ids[] = {
+ { .compatible = "atmel,at91rm9200-ohci", },
+ { }
+};
+
+U_BOOT_DRIVER(ohci_atmel) = {
+ .name = "ohci_atmel",
+ .id = UCLASS_USB,
+ .of_match = ohci_usb_ids,
+ .probe = ohci_atmel_probe,
+ .remove = ohci_atmel_deregister,
+ .child_pre_probe = ohci_atmel_child_pre_probe,
+ .ops = &ohci_usb_ops,
+ .plat_auto = sizeof(struct at91_usbh_data),
+ .priv_auto = sizeof(struct ohci_at91_priv),
+ .flags = DM_FLAG_ALLOC_PRIV_DMA,
+};
+
+#endif /* CONFIG_IS_ENABLED(DM_USB) && CONFIG_IS_ENABLED(DM_GPIO) */
--
2.34.1
next prev parent reply other threads:[~2022-12-19 8:48 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-19 8:46 [PATCH v4 00/19] Add USB on SAM9X60, SAMA7G5 and SAMA5D2 boards Sergiu Moga
2022-12-19 8:46 ` [PATCH v4 01/19] ARM: dts: sam9x60: Add OHCI and EHCI DT nodes Sergiu Moga
2022-12-19 8:46 ` [PATCH v4 02/19] clk: at91: Add support for sam9x60 USB clock Sergiu Moga
2022-12-19 8:46 ` [PATCH v4 03/19] clk: at91: sam9x60: Register the required clocks for USB Sergiu Moga
2022-12-19 8:46 ` [PATCH v4 04/19] clk: at91: pmc: export clock setup to pmc Sergiu Moga
2022-12-19 8:46 ` [PATCH v4 05/19] clk: at91: sam9x60: Add initial setup of UPLL and USBCK rates Sergiu Moga
2022-12-19 8:46 ` Sergiu Moga [this message]
2022-12-19 8:46 ` [PATCH v4 07/19] dt-bindings: reset: add sama7g5 definitions Sergiu Moga
2022-12-19 8:46 ` [PATCH v4 08/19] dt-bindings: clk: at91: Define additional UTMI related clocks Sergiu Moga
2022-12-19 8:46 ` [PATCH v4 09/19] ARM: dts: at91: sama7: Add USB related DT nodes Sergiu Moga
2022-12-19 8:46 ` [PATCH v4 10/19] ARM: at91: add sama7 SFR definitions Sergiu Moga
2022-12-19 8:46 ` [PATCH v4 11/19] reset: at91: Add reset driver for basic assert/deassert operations Sergiu Moga
2022-12-19 8:46 ` [PATCH v4 12/19] phy: at91: Add support for the USB 2.0 PHY's of SAMA7 Sergiu Moga
2022-12-19 8:46 ` [PATCH v4 13/19] usb: ohci-at91: Add USB PHY functionality Sergiu Moga
2022-12-19 8:46 ` [PATCH v4 14/19] ARM: dts: at91: sama5d2_icp: Add pinctrl nodes for USB related DT nodes Sergiu Moga
2022-12-19 8:46 ` [PATCH v4 15/19] ARM: dts: at91: sama5d27_wlsom1_ek: Add pinctrl nodes for USB " Sergiu Moga
2022-12-19 8:46 ` [PATCH v4 16/19] configs: at91: sam9x60ek: Add required configs for the USB command Sergiu Moga
2022-12-19 8:46 ` [PATCH v4 17/19] configs: at91: sama5d2: Enable OHCI/EHCI related configs Sergiu Moga
2022-12-19 8:46 ` [PATCH v4 18/19] configs: at91: sama7: Enable USB and RESET functionality Sergiu Moga
2022-12-19 8:46 ` [PATCH v4 19/19] usb: ohci-at91: Add `ohci_t` field in `ohci_at91_priv` Sergiu Moga
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221219084626.34606-7-sergiu.moga@microchip.com \
--to=sergiu.moga@microchip.com \
--cc=ashok.reddy.soma@xilinx.com \
--cc=balamanikandan.gunasundar@microchip.com \
--cc=claudiu.beznea@microchip.com \
--cc=cristian.birsan@microchip.com \
--cc=dario.binacchi@amarulasolutions.com \
--cc=durai.manickamkr@microchip.com \
--cc=eugen.hristev@microchip.com \
--cc=greg@embeddedgreg.com \
--cc=hs@denx.de \
--cc=j-keerthy@ti.com \
--cc=jim.t90615@gmail.com \
--cc=ludovic.desroches@microchip.com \
--cc=lukma@denx.de \
--cc=marex@denx.de \
--cc=michael@amarulasolutions.com \
--cc=michael@walle.cc \
--cc=michal.simek@amd.com \
--cc=mihai.sain@microchip.com \
--cc=nicolas.ferre@microchip.com \
--cc=peng.fan@nxp.com \
--cc=sandeep.sheriker@microchip.com \
--cc=seanga2@gmail.com \
--cc=sjg@chromium.org \
--cc=sumit.garg@linaro.org \
--cc=u-boot@lists.denx.de \
--cc=weijie.gao@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox