From patchwork Fri Apr 21 20:40:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 97929 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp496769qgf; Fri, 21 Apr 2017 13:41:20 -0700 (PDT) X-Received: by 10.98.3.193 with SMTP id 184mr10643516pfd.145.1492807279943; Fri, 21 Apr 2017 13:41:19 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s17si11190563pgn.118.2017.04.21.13.41.19; Fri, 21 Apr 2017 13:41:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-usb-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-usb-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-usb-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162483AbdDUUlS (ORCPT + 4 others); Fri, 21 Apr 2017 16:41:18 -0400 Received: from mail-lf0-f48.google.com ([209.85.215.48]:33582 "EHLO mail-lf0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161246AbdDUUlQ (ORCPT ); Fri, 21 Apr 2017 16:41:16 -0400 Received: by mail-lf0-f48.google.com with SMTP id 88so50385756lfr.0 for ; Fri, 21 Apr 2017 13:41:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=I732rPEc1YBEOkZOCnjmOWq9D/bNopL9IZnvEvHWJ8Y=; b=HrzyNvobMDVnCniZexFNV5m9UhSV1kk0TUUt+dEgQe81YJnYzWEhoH6GPukCt21VEm 3gpyfuQJn/F9hz/adN0pg8eP9QGqw2DBpqPB2oHBkVqz5lgU8/sSDY4z3R8ezqkeTDRh NUsHPPCnPxWc84zAgDEFflnrRiOo8Gy/zqib0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=I732rPEc1YBEOkZOCnjmOWq9D/bNopL9IZnvEvHWJ8Y=; b=O12KCtPUsSN9o4t/fRtulk3gbSo8wknYuD8ejZADqBcCXjmQY7+8ySGJqhgBDL4LAU rnBiJTPnjH4VN+D6RITAOIeSMOef/42RbbOQSY/Zi58nYUpSfHNLNdtOep5D0BlqPYEn AE8XI8rRGa2v8F2YzN8iXE8jSi6qPRWPgdNrT5DiAJSKGCkzPK6m1wtmquT1SBElBpdX UACuaRW8EL5KksvjnPLIMrfv9mGd7vHpWWlkHov3CzLQXAAtn8dIYhaeD+y20RM/F1qL eXhxeVPNysKTfCUDkKulWdkubezb9wPcIgGoKtnP76WHrqDpIOWH/bx97pcwuuvzfOwH RGsg== X-Gm-Message-State: AN3rC/44szXTNhg/ybDysO5k4IX7DbvmNLVNOSPM7v2OnwpDyEU3u2RF 1/YX3LaSDA4vbn+a X-Received: by 10.25.16.168 with SMTP id 40mr4918835lfq.75.1492807274772; Fri, 21 Apr 2017 13:41:14 -0700 (PDT) Received: from fabina.bredbandsbolaget.se (c-8a7f71d5.014-348-6c756e10.cust.bredbandsbolaget.se. [213.113.127.138]) by smtp.gmail.com with ESMTPSA id m191sm1770244lfe.43.2017.04.21.13.41.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Apr 2017 13:41:13 -0700 (PDT) From: Linus Walleij To: Hans Ulli Kroll , Florian Fainelli , linux-usb@vger.kernel.org, Greg Kroah-Hartman Cc: Janos Laube , Paulius Zaleckas , openwrt-devel@openwrt.org, linux-arm-kernel@lists.infradead.org, Linus Walleij Subject: [PATCH 4/5 v3] usb: host: fotg2: add Gemini-specific handling Date: Fri, 21 Apr 2017 22:40:57 +0200 Message-Id: <20170421204058.6206-4-linus.walleij@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170421204058.6206-1-linus.walleij@linaro.org> References: <20170421204058.6206-1-linus.walleij@linaro.org> Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org The Cortina Systems Gemini has bolted on a PHY inside the silicon that can be handled by six bits in a MISC register in the system controller. If we are running on Gemini, look up a syscon regmap through a phandle and enable VBUS and optionally the Mini-B connector. If the device is flagged as "wakeup-source" using the standard DT bindings, we also enable this in the global controller for respective port. Signed-off-by: Linus Walleij --- drivers/usb/host/Kconfig | 1 + drivers/usb/host/fotg210-hcd.c | 76 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) -- 2.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 407d947b34ea..9750783e5481 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -375,6 +375,7 @@ config USB_ISP1362_HCD config USB_FOTG210_HCD tristate "FOTG210 HCD support" depends on USB && HAS_DMA && HAS_IOMEM + select MFD_SYSCON ---help--- Faraday FOTG210 is an OTG controller which can be configured as an USB2.0 host. It is designed to meet USB2.0 EHCI specification diff --git a/drivers/usb/host/fotg210-hcd.c b/drivers/usb/host/fotg210-hcd.c index 906e42458791..146f1eb96b60 100644 --- a/drivers/usb/host/fotg210-hcd.c +++ b/drivers/usb/host/fotg210-hcd.c @@ -46,6 +46,10 @@ #include #include #include +#include +/* For Cortina Gemini */ +#include +#include #include #include @@ -5583,6 +5587,72 @@ static void fotg210_init(struct fotg210_hcd *fotg210) iowrite32(value, &fotg210->regs->otgcsr); } +/* + * Gemini-specific initialization function, only executed on the + * Gemini SoC using the global misc control register. + */ +#define GEMINI_GLOBAL_MISC_CTRL 0x30 +#define GEMINI_MISC_USB0_WAKEUP BIT(14) +#define GEMINI_MISC_USB1_WAKEUP BIT(15) +#define GEMINI_MISC_USB0_VBUS_ON BIT(22) +#define GEMINI_MISC_USB1_VBUS_ON BIT(23) +#define GEMINI_MISC_USB0_MINI_B BIT(29) +#define GEMINI_MISC_USB1_MINI_B BIT(30) + +static int fotg210_gemini_init(struct device *dev, struct usb_hcd *hcd) +{ + struct device_node *np = dev->of_node; + struct regmap *map; + bool mini_b; + bool wakeup; + u32 mask, val; + int ret; + + map = syscon_regmap_lookup_by_phandle(np, "syscon"); + if (IS_ERR(map)) { + dev_err(dev, "no syscon\n"); + return PTR_ERR(map); + } + mini_b = of_property_read_bool(np, "cortina,gemini-mini-b"); + wakeup = of_property_read_bool(np, "wakeup-source"); + + /* + * Figure out if this is USB0 or USB1 by simply checking the + * physical base address. + */ + mask = 0; + if (hcd->rsrc_start == 0x69000000) { + val = GEMINI_MISC_USB1_VBUS_ON; + if (mini_b) + val |= GEMINI_MISC_USB1_MINI_B; + else + mask |= GEMINI_MISC_USB1_MINI_B; + if (wakeup) + val |= GEMINI_MISC_USB1_WAKEUP; + else + mask |= GEMINI_MISC_USB1_WAKEUP; + } else { + val = GEMINI_MISC_USB0_VBUS_ON; + if (mini_b) + val |= GEMINI_MISC_USB0_MINI_B; + else + mask |= GEMINI_MISC_USB0_MINI_B; + if (wakeup) + val |= GEMINI_MISC_USB0_WAKEUP; + else + mask |= GEMINI_MISC_USB0_WAKEUP; + } + + ret = regmap_update_bits(map, GEMINI_GLOBAL_MISC_CTRL, mask, val); + if (ret) { + dev_err(dev, "failed to initialize Gemini PHY\n"); + return ret; + } + + dev_info(dev, "initialized Gemini PHY\n"); + return 0; +} + /** * fotg210_hcd_probe - initialize faraday FOTG210 HCDs * @@ -5662,6 +5732,12 @@ static int fotg210_hcd_probe(struct platform_device *pdev) fotg210_init(fotg210); + if (of_device_is_compatible(dev->of_node, "cortina,gemini-usb")) { + retval = fotg210_gemini_init(dev, hcd); + if (retval) + goto failed_dis_clk; + } + retval = usb_add_hcd(hcd, irq, IRQF_SHARED); if (retval) { dev_err(dev, "failed to add hcd with err %d\n", retval);