From: Heikki Krogerus <heikki.krogerus@linux.intel.com> To: Stephen Boyd <stephen.boyd@linaro.org> Cc: linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Andy Gross <andy.gross@linaro.org>, Bjorn Andersson <bjorn.andersson@linaro.org>, Neil Armstrong <narmstrong@baylibre.com>, Arnd Bergmann <arnd@arndb.de>, Felipe Balbi <balbi@kernel.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, devicetree@vger.kernel.org, Rob Herring <robh+dt@kernel.org> Subject: Re: [PATCH 02/21] usb: ulpi: Support device discovery via DT Date: Mon, 27 Jun 2016 17:34:22 +0300 [thread overview] Message-ID: <20160627143422.GB21398@kuha.fi.intel.com> (raw) In-Reply-To: <20160626072838.28082-3-stephen.boyd@linaro.org> Hi, I'm fine with most of the patch, except.. On Sun, Jun 26, 2016 at 12:28:19AM -0700, Stephen Boyd wrote: > @@ -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; I don't like this part. We should match separately like that only if the bus does not support native enumeration, and of course ULPI with its vendor and product IDs does. There really should always be IDs to match with here. So exceptions have to be solved before we attempt matching. Since we also have to support platforms where the PHY is initially powered off and reading the IDs from the registers is not possible because of that, I think we should consider getting the product and vendor IDs optionally from device properties. Something like this: diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c index 01c0c04..6228a85 100644 --- a/drivers/usb/common/ulpi.c +++ b/drivers/usb/common/ulpi.c @@ -152,7 +152,7 @@ EXPORT_SYMBOL_GPL(ulpi_unregister_driver); /* -------------------------------------------------------------------------- */ -static int ulpi_register(struct device *dev, struct ulpi *ulpi) +static int ulpi_read_id(struct ulpi *ulpi) { int ret; @@ -174,6 +174,21 @@ static int ulpi_register(struct device *dev, struct ulpi *ulpi) ulpi->id.product = ulpi_read(ulpi, ULPI_PRODUCT_ID_LOW); ulpi->id.product |= ulpi_read(ulpi, ULPI_PRODUCT_ID_HIGH) << 8; + return 0; +} + +static int ulpi_register(struct device *dev, struct ulpi *ulpi) +{ + int ret; + + ret = device_property_read_u16(dev, "ulpi-vendor", &ulpi->id.vendor); + ret |= device_property_read_u16(dev, "ulpi-product", &ulpi->id.product); + if (ret) { + ret = ulpi_read_id(ulpi); + if (ret) + return ret; + } + ulpi->dev.parent = dev; ulpi->dev.bus = &ulpi_bus; ulpi->dev.type = &ulpi_dev_type; That should cover both cases. You would just have to create the IDs yourself in this case. Thanks, -- heikki
WARNING: multiple messages have this Message-ID (diff)
From: heikki.krogerus@linux.intel.com (Heikki Krogerus) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 02/21] usb: ulpi: Support device discovery via DT Date: Mon, 27 Jun 2016 17:34:22 +0300 [thread overview] Message-ID: <20160627143422.GB21398@kuha.fi.intel.com> (raw) In-Reply-To: <20160626072838.28082-3-stephen.boyd@linaro.org> Hi, I'm fine with most of the patch, except.. On Sun, Jun 26, 2016 at 12:28:19AM -0700, Stephen Boyd wrote: > @@ -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; I don't like this part. We should match separately like that only if the bus does not support native enumeration, and of course ULPI with its vendor and product IDs does. There really should always be IDs to match with here. So exceptions have to be solved before we attempt matching. Since we also have to support platforms where the PHY is initially powered off and reading the IDs from the registers is not possible because of that, I think we should consider getting the product and vendor IDs optionally from device properties. Something like this: diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c index 01c0c04..6228a85 100644 --- a/drivers/usb/common/ulpi.c +++ b/drivers/usb/common/ulpi.c @@ -152,7 +152,7 @@ EXPORT_SYMBOL_GPL(ulpi_unregister_driver); /* -------------------------------------------------------------------------- */ -static int ulpi_register(struct device *dev, struct ulpi *ulpi) +static int ulpi_read_id(struct ulpi *ulpi) { int ret; @@ -174,6 +174,21 @@ static int ulpi_register(struct device *dev, struct ulpi *ulpi) ulpi->id.product = ulpi_read(ulpi, ULPI_PRODUCT_ID_LOW); ulpi->id.product |= ulpi_read(ulpi, ULPI_PRODUCT_ID_HIGH) << 8; + return 0; +} + +static int ulpi_register(struct device *dev, struct ulpi *ulpi) +{ + int ret; + + ret = device_property_read_u16(dev, "ulpi-vendor", &ulpi->id.vendor); + ret |= device_property_read_u16(dev, "ulpi-product", &ulpi->id.product); + if (ret) { + ret = ulpi_read_id(ulpi); + if (ret) + return ret; + } + ulpi->dev.parent = dev; ulpi->dev.bus = &ulpi_bus; ulpi->dev.type = &ulpi_dev_type; That should cover both cases. You would just have to create the IDs yourself in this case. Thanks, -- heikki
next prev parent reply other threads:[~2016-06-27 14:34 UTC|newest] Thread overview: 214+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-06-26 7:28 [PATCH 00/21] Support qcom's HSIC USB and rewrite USB2 HS phy support Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-26 7:28 ` [PATCH 01/21] of: device: Support loading a module with OF based modalias Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-28 4:17 ` Bjorn Andersson 2016-06-28 4:17 ` Bjorn Andersson 2016-06-28 4:39 ` Rob Herring [not found] ` <20160626072838.28082-1-stephen.boyd-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2016-06-26 7:28 ` [PATCH 02/21] usb: ulpi: Support device discovery via DT Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd [not found] ` <20160626072838.28082-3-stephen.boyd-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2016-06-27 4:21 ` kbuild test robot 2016-06-27 4:21 ` kbuild test robot 2016-06-27 4:21 ` kbuild test robot 2016-06-27 14:34 ` Heikki Krogerus [this message] 2016-06-27 14:34 ` Heikki Krogerus 2016-06-27 22:10 ` Stephen Boyd 2016-06-27 22:10 ` Stephen Boyd 2016-06-28 11:42 ` Heikki Krogerus 2016-06-28 11:42 ` Heikki Krogerus 2016-06-28 18:27 ` Stephen Boyd 2016-06-28 18:27 ` Stephen Boyd 2016-06-29 1:53 ` Peter Chen 2016-06-29 1:53 ` Peter Chen 2016-06-28 20:56 ` Rob Herring 2016-06-28 20:56 ` Rob Herring 2016-06-28 22:09 ` Stephen Boyd 2016-06-28 22:09 ` Stephen Boyd 2016-07-01 0:59 ` Rob Herring 2016-07-01 0:59 ` Rob Herring 2016-07-01 0:59 ` Rob Herring 2016-07-06 6:16 ` Stephen Boyd 2016-07-06 6:16 ` Stephen Boyd 2016-06-26 7:28 ` [PATCH 03/21] usb: ulpi: Avoid reading/writing in device creation with OF devices Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-26 7:28 ` [PATCH 14/21] usb: chipidea: msm: Add proper clk and reset support Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-29 7:02 ` Peter Chen 2016-06-29 7:02 ` Peter Chen 2016-06-26 7:28 ` [PATCH 20/21] phy: Add support for Qualcomm's USB HSIC phy Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-28 8:49 ` Neil Armstrong 2016-06-28 8:49 ` Neil Armstrong 2016-06-28 21:58 ` Stephen Boyd 2016-06-28 21:58 ` Stephen Boyd 2016-06-28 21:58 ` Stephen Boyd 2016-06-29 9:16 ` Neil Armstrong 2016-06-29 9:16 ` Neil Armstrong 2016-06-29 9:16 ` Neil Armstrong [not found] ` <57739203.9000601-rdvid1DuHRBWk0Htik3J/w@public.gmane.org> 2016-06-29 18:54 ` Stephen Boyd 2016-06-29 18:54 ` Stephen Boyd 2016-06-29 18:54 ` Stephen Boyd 2016-06-26 7:28 ` [PATCH 21/21] phy: Add support for Qualcomm's USB HS phy Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-28 3:09 ` [PATCH 00/21] Support qcom's HSIC USB and rewrite USB2 HS phy support John Stultz 2016-06-28 3:09 ` John Stultz 2016-06-28 3:09 ` John Stultz 2016-06-28 8:34 ` Stephen Boyd 2016-06-28 8:34 ` Stephen Boyd 2016-07-02 6:03 ` John Stultz 2016-07-02 6:03 ` John Stultz 2016-07-02 6:03 ` John Stultz 2016-07-05 19:22 ` Stephen Boyd 2016-07-05 19:22 ` Stephen Boyd 2016-07-05 19:33 ` John Stultz 2016-07-05 19:33 ` John Stultz 2016-07-05 19:33 ` John Stultz 2016-06-26 7:28 ` [PATCH 04/21] usb: chipidea: Only read/write OTGSC from one place Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-27 8:04 ` Jun Li 2016-06-27 8:04 ` Jun Li 2016-06-27 8:04 ` Jun Li [not found] ` <AM4PR04MB213088094DF074BB5CB3DD0689210-WOempg8NbQQzjTQnahXoOs9NdZoXdze2vxpqHgZTriW3zl9H0oFU5g@public.gmane.org> 2016-06-27 19:07 ` Stephen Boyd 2016-06-27 19:07 ` Stephen Boyd 2016-06-27 19:07 ` Stephen Boyd 2016-06-28 9:36 ` Peter Chen 2016-06-28 9:36 ` Peter Chen 2016-06-28 9:36 ` Peter Chen 2016-06-28 22:10 ` Stephen Boyd 2016-06-28 22:10 ` Stephen Boyd 2016-06-26 7:28 ` [PATCH 05/21] usb: chipidea: Handle extcon events properly Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-28 10:01 ` Peter Chen 2016-06-28 10:01 ` Peter Chen 2016-06-26 7:28 ` [PATCH 06/21] usb: chipidea: Initialize and reinitialize phy later Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-29 2:30 ` Peter Chen 2016-06-29 2:30 ` Peter Chen 2016-06-30 1:23 ` Stephen Boyd 2016-06-30 1:23 ` Stephen Boyd 2016-06-30 1:22 ` Peter Chen 2016-06-30 1:22 ` Peter Chen 2016-06-26 7:28 ` [PATCH 07/21] usb: chipidea: Notify of reset when switching into host mode Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-26 7:28 ` [PATCH 08/21] usb: chipidea: Kick OTG state machine for AVVIS with vbus extcon Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd [not found] ` <20160626072838.28082-9-stephen.boyd-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2016-06-29 3:09 ` Peter Chen 2016-06-29 3:09 ` Peter Chen 2016-06-29 3:09 ` Peter Chen 2016-06-30 1:19 ` Stephen Boyd 2016-06-30 1:19 ` Stephen Boyd 2016-06-30 1:26 ` Peter Chen 2016-06-30 1:26 ` Peter Chen 2016-06-30 1:26 ` Peter Chen 2016-06-30 1:50 ` Jun Li 2016-06-30 1:50 ` Jun Li 2016-06-30 1:50 ` Jun Li 2016-06-26 7:28 ` [PATCH 09/21] usb: chipidea: Add support for ULPI PHY bus Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-29 6:26 ` Peter Chen 2016-06-29 6:26 ` Peter Chen 2016-06-30 1:29 ` Stephen Boyd 2016-06-30 1:29 ` Stephen Boyd 2016-06-26 7:28 ` [PATCH 10/21] usb: chipidea: msm: Rely on core to override AHBBURST Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-29 6:32 ` Peter Chen 2016-06-29 6:32 ` Peter Chen 2016-06-29 18:59 ` Stephen Boyd 2016-06-29 18:59 ` Stephen Boyd 2016-06-30 1:18 ` Peter Chen 2016-06-30 1:18 ` Peter Chen 2016-06-30 1:18 ` Peter Chen 2016-06-30 1:41 ` Stephen Boyd 2016-06-30 1:41 ` Stephen Boyd 2016-06-26 7:28 ` [PATCH 11/21] usb: chipidea: msm: Use hw_write_id_reg() instead of writel directly Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-29 6:37 ` Peter Chen 2016-06-29 6:37 ` Peter Chen 2016-06-26 7:28 ` [PATCH 12/21] usb: chipidea: msm: Keep device runtime enabled Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-29 6:46 ` Peter Chen 2016-06-29 6:46 ` Peter Chen 2016-06-30 0:43 ` Stephen Boyd 2016-06-30 0:43 ` Stephen Boyd 2016-06-30 1:39 ` Peter Chen 2016-06-30 1:39 ` Peter Chen 2016-06-30 20:30 ` Stephen Boyd 2016-06-30 20:30 ` Stephen Boyd 2016-07-01 3:20 ` Peter Chen 2016-07-01 3:20 ` Peter Chen 2016-06-26 7:28 ` [PATCH 13/21] usb: chipidea: msm: Allow core to get usb phy Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-29 6:48 ` Peter Chen 2016-06-29 6:48 ` Peter Chen 2016-06-29 11:34 ` Peter Chen 2016-06-29 11:34 ` Peter Chen 2016-06-29 19:31 ` Stephen Boyd 2016-06-29 19:31 ` Stephen Boyd 2016-06-30 1:43 ` Peter Chen 2016-06-30 1:43 ` Peter Chen 2016-06-30 1:43 ` Peter Chen 2016-06-26 7:28 ` [PATCH 15/21] usb: chipidea: msm: Mux over secondary phy at the right time Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd [not found] ` <20160626072838.28082-16-stephen.boyd-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2016-06-28 4:51 ` Bjorn Andersson 2016-06-28 4:51 ` Bjorn Andersson 2016-06-28 4:51 ` Bjorn Andersson 2016-06-28 8:39 ` Stephen Boyd 2016-06-28 8:39 ` Stephen Boyd 2016-06-29 8:08 ` Peter Chen 2016-06-29 8:08 ` Peter Chen 2016-06-29 19:28 ` Stephen Boyd 2016-06-29 19:28 ` Stephen Boyd 2016-06-30 1:52 ` Peter Chen 2016-06-30 1:52 ` Peter Chen 2016-06-30 1:35 ` Stephen Boyd 2016-06-30 1:35 ` Stephen Boyd 2016-06-26 7:28 ` [PATCH 16/21] usb: chipidea: msm: Restore wrapper settings after reset Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-29 8:26 ` Peter Chen 2016-06-29 8:26 ` Peter Chen 2016-06-29 19:13 ` Stephen Boyd 2016-06-29 19:13 ` Stephen Boyd 2016-06-30 8:54 ` Peter Chen 2016-06-30 8:54 ` Peter Chen 2016-06-30 16:24 ` Stephen Boyd 2016-06-30 16:24 ` Stephen Boyd 2016-06-30 16:24 ` Stephen Boyd 2016-06-26 7:28 ` [PATCH 17/21] usb: chipidea: msm: Make platform data driver local instead of global Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-29 11:29 ` Peter Chen 2016-06-29 11:29 ` Peter Chen 2016-06-29 19:17 ` Stephen Boyd 2016-06-29 19:17 ` Stephen Boyd 2016-06-30 9:08 ` Peter Chen 2016-06-30 9:08 ` Peter Chen 2016-06-26 7:28 ` [PATCH 18/21] usb: chipidea: msm: Add reset controller for PHY POR bit Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-27 3:41 ` kbuild test robot 2016-06-27 3:41 ` kbuild test robot 2016-06-27 4:51 ` kbuild test robot 2016-06-27 4:51 ` kbuild test robot 2016-06-27 7:50 ` kbuild test robot 2016-06-27 7:50 ` kbuild test robot 2016-06-28 1:27 ` Stephen Boyd 2016-06-28 1:27 ` Stephen Boyd 2016-06-29 11:45 ` Peter Chen 2016-06-29 11:45 ` Peter Chen 2016-06-26 7:28 ` [PATCH 19/21] usb: chipidea: msm: Be silent on probe defer errors Stephen Boyd 2016-06-26 7:28 ` Stephen Boyd 2016-06-30 1:06 ` Peter Chen 2016-06-30 1:06 ` Peter Chen 2016-06-30 1:06 ` Peter Chen 2016-06-30 1:26 ` Stephen Boyd 2016-06-30 1:26 ` Stephen Boyd
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=20160627143422.GB21398@kuha.fi.intel.com \ --to=heikki.krogerus@linux.intel.com \ --cc=andy.gross@linaro.org \ --cc=arnd@arndb.de \ --cc=balbi@kernel.org \ --cc=bjorn.andersson@linaro.org \ --cc=devicetree@vger.kernel.org \ --cc=gregkh@linuxfoundation.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-usb@vger.kernel.org \ --cc=narmstrong@baylibre.com \ --cc=robh+dt@kernel.org \ --cc=stephen.boyd@linaro.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.