From patchwork Sun Jun 26 07:28:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 70856 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp554638qgy; Sun, 26 Jun 2016 00:29:05 -0700 (PDT) X-Received: by 10.66.167.103 with SMTP id zn7mr22455923pab.149.1466926143570; Sun, 26 Jun 2016 00:29:03 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x13si18088022pal.215.2016.06.26.00.29.03; Sun, 26 Jun 2016 00:29:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-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 devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752085AbcFZH2u (ORCPT + 7 others); Sun, 26 Jun 2016 03:28:50 -0400 Received: from mail-pf0-f178.google.com ([209.85.192.178]:33594 "EHLO mail-pf0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752020AbcFZH2p (ORCPT ); Sun, 26 Jun 2016 03:28:45 -0400 Received: by mail-pf0-f178.google.com with SMTP id i123so51900894pfg.0 for ; Sun, 26 Jun 2016 00:28:44 -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=n5bW9sdVKZuOhXIpy028t/eZasinVgU2rzjLNlI13c0=; b=OF5UovYmgX3SNWQ/ajCKJTWpq1p50YARZFaDs2/ia+2J4LQhEj0/g89dZ1JQXDo0X+ TWXpxq6wh4yu/Iz6t9YzB7ZBTLPrs9vLNJDLoQjxpqttEOKdJofsP/1tTBKMWYo1pjFQ ofNQBR9kYiDb8lvz+5BaZZHtG18Pf6Ow/0ICk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=n5bW9sdVKZuOhXIpy028t/eZasinVgU2rzjLNlI13c0=; b=hFrlUAg10L35CXxzyPXr1pCFpdz1xTBbcOmJ3fwCy4FE2hq6gNcmxAi7zeFPoeCDuI i3TanQEA+iQxgJ51NSzLF/2Epvox/3Yrh7vHtshaQPi21rxAjeQXwpStd14lPgCHWBMs x1ZbyBOHs98WLiZMZUYa8LpDhENgBAIk4BkdgaVQ90oJfY5EjpT4p1whdIfktDN3kx6q DyVNQiCiZ9xnnjTdIzf+rrarccuHmw21ysoX6Z1+SxrjwHnn4IOZoJ6w/r5gufGJMEN4 N/8LE/jMjeZfuAE6gnyHtJ/tpGvRnvGlASgvSb4WtnAHbqeH7fkR76eeuKHMrHvKB3QJ cKqA== X-Gm-Message-State: ALyK8tLhaQu8aKTnJ9zdb0Skxjg/rMf6LC/t0MbD5Ohw+rQgirr7tHUKYxs0hjztyGUXjeuN X-Received: by 10.98.79.17 with SMTP id d17mr8554126pfb.127.1466926124269; Sun, 26 Jun 2016 00:28:44 -0700 (PDT) Received: from localhost.localdomain (ip68-101-172-78.sd.sd.cox.net. [68.101.172.78]) by smtp.gmail.com with ESMTPSA id f138sm3790495pfa.17.2016.06.26.00.28.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 26 Jun 2016 00:28:43 -0700 (PDT) From: Stephen Boyd To: linux-usb@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Andy Gross , Bjorn Andersson , Neil Armstrong , Arnd Bergmann , Felipe Balbi , Greg Kroah-Hartman , Heikki Krogerus , devicetree@vger.kernel.org, Rob Herring Subject: [PATCH 02/21] usb: ulpi: Support device discovery via DT Date: Sun, 26 Jun 2016 00:28:19 -0700 Message-Id: <20160626072838.28082-3-stephen.boyd@linaro.org> X-Mailer: git-send-email 2.9.0.rc2.8.ga28705d In-Reply-To: <20160626072838.28082-1-stephen.boyd@linaro.org> References: <20160626072838.28082-1-stephen.boyd@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The qcom HSIC ulpi phy doesn't have any bits set in the vendor or product id ulpi registers. This makes it impossible to make a ulpi driver match against the id registers. Add support to discover the ulpi phys via DT to help alleviate this problem. We'll look for a ulpi bus node underneath the device registering the ulpi viewport (or the parent of that device to support chipidea's device layout) and then match up the phy node underneath that with the ulpi device that's created. The side benefit of this is that we can use standard DT properties in the phy node like clks, regulators, gpios, etc. because we don't have firmware like ACPI to turn these things on for us. And we can use the DT phy binding to point our phy consumer to the phy provider. Cc: Greg Kroah-Hartman Cc: Heikki Krogerus Cc: Cc: Rob Herring Signed-off-by: Stephen Boyd --- Documentation/devicetree/bindings/usb/ulpi.txt | 20 +++++++++ drivers/usb/common/ulpi.c | 56 +++++++++++++++++++++++++- 2 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 Documentation/devicetree/bindings/usb/ulpi.txt -- 2.9.0.rc2.8.ga28705d -- To unsubscribe from this list: send the line "unsubscribe devicetree" 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/Documentation/devicetree/bindings/usb/ulpi.txt b/Documentation/devicetree/bindings/usb/ulpi.txt new file mode 100644 index 000000000000..ca179dc4bd50 --- /dev/null +++ b/Documentation/devicetree/bindings/usb/ulpi.txt @@ -0,0 +1,20 @@ +ULPI bus binding +---------------- + +Phys that are behind a ULPI connection can be described with the following +binding. The host controller shall have a "ulpi" named node as a child, and +that node shall have one enabled node underneath it representing the ulpi +device on the bus. + +EXAMPLE +------- + +usb { + compatible = "vendor,usb-controller"; + + ulpi { + phy { + compatible = "vendor,phy"; + }; + }; +}; diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c index 01c0c0477a9e..980af672bfe3 100644 --- a/drivers/usb/common/ulpi.c +++ b/drivers/usb/common/ulpi.c @@ -16,6 +16,9 @@ #include #include #include +#include +#include +#include /* -------------------------------------------------------------------------- */ @@ -39,7 +42,10 @@ static int ulpi_match(struct device *dev, struct device_driver *driver) struct ulpi *ulpi = to_ulpi_dev(dev); const struct ulpi_device_id *id; - for (id = drv->id_table; id->vendor; id++) + if (of_driver_match_device(dev, driver)) + return 1; + + for (id = drv->id_table; id && id->vendor; id++) if (id->vendor == ulpi->id.vendor && id->product == ulpi->id.product) return 1; @@ -50,6 +56,11 @@ static int ulpi_match(struct device *dev, struct device_driver *driver) static int ulpi_uevent(struct device *dev, struct kobj_uevent_env *env) { struct ulpi *ulpi = to_ulpi_dev(dev); + int ret; + + ret = of_device_uevent_modalias(dev, env); + if (ret != -ENODEV) + return ret; if (add_uevent_var(env, "MODALIAS=ulpi:v%04xp%04x", ulpi->id.vendor, ulpi->id.product)) @@ -60,6 +71,11 @@ static int ulpi_uevent(struct device *dev, struct kobj_uevent_env *env) static int ulpi_probe(struct device *dev) { struct ulpi_driver *drv = to_ulpi_driver(dev->driver); + int ret; + + ret = of_clk_set_defaults(dev->of_node, false); + if (ret < 0) + return ret; return drv->probe(to_ulpi_dev(dev)); } @@ -87,8 +103,13 @@ static struct bus_type ulpi_bus = { static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, char *buf) { + int len; struct ulpi *ulpi = to_ulpi_dev(dev); + len = of_device_get_modalias(dev, buf, PAGE_SIZE - 1); + if (len != -ENODEV) + return len; + return sprintf(buf, "ulpi:v%04xp%04x\n", ulpi->id.vendor, ulpi->id.product); } @@ -152,6 +173,28 @@ EXPORT_SYMBOL_GPL(ulpi_unregister_driver); /* -------------------------------------------------------------------------- */ +static int ulpi_of_register(struct ulpi *ulpi) +{ + struct device_node *np = NULL, *child; + + /* Find a ulpi bus underneath the parent or the parent of the parent */ + if (ulpi->dev.parent->of_node) + np = of_find_node_by_name(ulpi->dev.parent->of_node, "ulpi"); + else if (ulpi->dev.parent->parent && + ulpi->dev.parent->parent->of_node) + np = of_find_node_by_name(ulpi->dev.parent->parent->of_node, "ulpi"); + if (!np) + return 0; + + child = of_get_next_available_child(np, NULL); + if (!child) + return -EINVAL; + + ulpi->dev.of_node = child; + + return 0; +} + static int ulpi_register(struct device *dev, struct ulpi *ulpi) { int ret; @@ -181,7 +224,15 @@ static int ulpi_register(struct device *dev, struct ulpi *ulpi) ACPI_COMPANION_SET(&ulpi->dev, ACPI_COMPANION(dev)); - request_module("ulpi:v%04xp%04x", ulpi->id.vendor, ulpi->id.product); + if (IS_ENABLED(CONFIG_OF)) { + ret = ulpi_of_register(ulpi); + if (ret) + return ret; + } + + if (of_device_request_module(&ulpi->dev)) + request_module("ulpi:v%04xp%04x", ulpi->id.vendor, + ulpi->id.product); ret = device_register(&ulpi->dev); if (ret) @@ -232,6 +283,7 @@ EXPORT_SYMBOL_GPL(ulpi_register_interface); */ void ulpi_unregister_interface(struct ulpi *ulpi) { + of_node_put(ulpi->dev.of_node); device_unregister(&ulpi->dev); } EXPORT_SYMBOL_GPL(ulpi_unregister_interface);