Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 26D7EC4332F for ; Wed, 4 Jan 2023 14:08:44 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 10590852B5; Wed, 4 Jan 2023 15:08:29 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=microchip.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=microchip.com header.i=@microchip.com header.b="qUWAcYAj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4886380A55; Wed, 4 Jan 2023 15:08:24 +0100 (CET) Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.153.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 50D40852B5 for ; Wed, 4 Jan 2023 15:08:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=microchip.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Sergiu.Moga@microchip.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1672841300; x=1704377300; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zBRdYI8frubizsuhyCBWD701cVbTuWATFbt612hp/K8=; b=qUWAcYAjfecZfno7oKTxl0/4esCF96qUMsWzPQoV3J/sBou9O1ifvHxu k2Niuczv5aNm1Bj0VkbIRrntone58en0vtulDT1uFm2SaEmWLOnmbdwM6 hV+BuJ5QKxzJtsEp1jf/QqRQlO72yp3C3ByhDrsz2QKpKEQKvtLHmmJ/B mRj289OXFI/j3k7VqnpyMr0WvP9GCIMg2j7iifvZJdqmyjSHM9fn0ZW+i LR4e7ZwDk4aa9ua+mGUaueibW42EZv2mLDNHrBybw9PEpKSarh0yYj9R1 J/fj1L+hY+U3UqC5OBInqHwN3juViKgaREZBgNm9eJBpjHEU5AGMDTrFw w==; X-IronPort-AV: E=Sophos;i="5.96,300,1665471600"; d="scan'208";a="195388838" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa5.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 04 Jan 2023 07:08:18 -0700 Received: from chn-vm-ex02.mchp-main.com (10.10.87.72) by chn-vm-ex02.mchp-main.com (10.10.87.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Wed, 4 Jan 2023 07:08:16 -0700 Received: from ROB-ULT-M68701.mchp-main.com (10.10.115.15) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server id 15.1.2507.16 via Frontend Transport; Wed, 4 Jan 2023 07:08:14 -0700 From: Sergiu Moga To: , , , , , , , , , CC: Subject: [PATCH v3 2/3] usb: ohci-at91: Enable OHCI functionality and register into DM Date: Wed, 4 Jan 2023 16:08:06 +0200 Message-ID: <20230104140806.150097-3-sergiu.moga@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230104140806.150097-1-sergiu.moga@microchip.com> References: <20230104140806.150097-1-sergiu.moga@microchip.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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. Signed-off-by: Sergiu Moga --- 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(+) diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 6213b3c95f..bb1443a338 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -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" diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c index 9b955c1bd6..92d0ab7184 100644 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c @@ -5,6 +5,9 @@ */ #include + +#if !(CONFIG_IS_ENABLED(DM_USB)) + #include int usb_cpu_init(void) @@ -62,3 +65,159 @@ int usb_cpu_init_fail(void) { return usb_cpu_stop(); } + +#else + +#include +#include +#include +#include +#include "ohci.h" + +#define AT91_MAX_USBH_PORTS 3 + +#define at91_for_each_port(index, ports) \ + for ((index) = 0; \ + (index) < min_t(u32, AT91_MAX_USBH_PORTS, (ports)); \ + (index)++) + +struct at91_usbh_data { + enum usb_init_type init_type; + struct gpio_desc vbus_pin[AT91_MAX_USBH_PORTS]; + u32 ports; /* number of ports on root hub */ +}; + +struct ohci_at91_priv { + ohci_t ohci; + struct clk_bulk clks; +}; + +static int at91_start_clock(struct ohci_at91_priv *ohci_at91) +{ + return clk_enable_bulk(&ohci_at91->clks); +} + +static int at91_stop_clock(struct ohci_at91_priv *ohci_at91) +{ + return clk_disable_bulk(&ohci_at91->clks); +} + +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 int at91_start_hc(struct udevice *dev) +{ + struct ohci_at91_priv *ohci_at91 = dev_get_priv(dev); + + return at91_start_clock(ohci_at91); +} + +static int at91_stop_hc(struct udevice *dev) +{ + struct ohci_at91_priv *ohci_at91 = dev_get_priv(dev); + + return at91_stop_clock(ohci_at91); +} + +static int ohci_atmel_deregister(struct udevice *dev) +{ + struct at91_usbh_data *pdata = dev_get_plat(dev); + int ret, i; + + ret = at91_stop_hc(dev); + if (ret) + return ret; + + at91_for_each_port(i, pdata->ports) + 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, pdata->ports) + ohci_at91_set_power(pdata, i, true); + + return 0; +} + +static int ohci_atmel_probe(struct udevice *dev) +{ + struct ohci_at91_priv *ohci_at91 = dev_get_priv(dev); + struct at91_usbh_data *pdata = dev_get_plat(dev); + struct ohci_regs *regs; + int ret; + u32 i; + + regs = (struct ohci_regs *)dev_read_addr(dev); + if (IS_ERR(regs)) { + ret = PTR_ERR(regs); + goto fail; + } + + pdata->ports = dev_read_u32_default(dev, "num-ports", 3); + + at91_for_each_port(i, pdata->ports) + gpio_request_by_name(dev, "atmel,vbus-gpio", i, + &pdata->vbus_pin[i], GPIOD_IS_OUT | + GPIOD_IS_OUT_ACTIVE); + + ret = clk_get_bulk(dev, &ohci_at91->clks); + if (ret) + goto fail; + + ret = clk_enable_bulk(&ohci_at91->clks); + if (ret) + goto fail; + + ret = at91_start_hc(dev); + if (ret) + goto fail; + + return ohci_register(dev, regs); + +fail: + at91_for_each_port(i, pdata->ports) + if (dm_gpio_is_valid(&pdata->vbus_pin[i])) + gpio_free(pdata->vbus_pin[i].offset); + + clk_disable_bulk(&ohci_at91->clks); + + return ret; +} + +static const struct udevice_id ohci_usb_ids[] = { + { .compatible = "atmel,at91rm9200-ohci", }, + { .compatible = "microchip,sama7g5-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) */ -- 2.34.1