From: Icenowy Zheng <icenowy@aosc.io>
To: Rob Herring <robh+dt@kernel.org>,
Maxime Ripard <maxime.ripard@bootlin.com>,
Chen-Yu Tsai <wens@csie.org>,
Kishon Vijay Abraham I <kishon@ti.com>
Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com,
Icenowy Zheng <icenowy@aosc.io>
Subject: [PATCH v4 02/10] phy: sun4i-usb: add support for missing USB PHY index
Date: Thu, 4 Oct 2018 20:28:47 +0800 [thread overview]
Message-ID: <20181004122855.22981-3-icenowy@aosc.io> (raw)
In-Reply-To: <20181004122855.22981-1-icenowy@aosc.io>
The new Allwinner H6 SoC's USB2 PHY has two holes -- USB1 (which is a
3.0 port with dedicated PHY) and USB2 (which doesn't exist at all).
Add support for this kind of missing USB PHY index.
Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
---
No changes in v4.
Changes in v3:
- Added Chen-Yu's Review tag.
drivers/phy/allwinner/phy-sun4i-usb.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c
index d4dcd39b8d76..881078ff73f6 100644
--- a/drivers/phy/allwinner/phy-sun4i-usb.c
+++ b/drivers/phy/allwinner/phy-sun4i-usb.c
@@ -126,6 +126,7 @@ struct sun4i_usb_phy_cfg {
bool dedicated_clocks;
bool enable_pmu_unk1;
bool phy0_dual_route;
+ int missing_phys;
};
struct sun4i_usb_phy_data {
@@ -646,6 +647,9 @@ static struct phy *sun4i_usb_phy_xlate(struct device *dev,
if (args->args[0] >= data->cfg->num_phys)
return ERR_PTR(-ENODEV);
+ if (data->cfg->missing_phys & BIT(args->args[0]))
+ return ERR_PTR(-ENODEV);
+
return data->phys[args->args[0]].phy;
}
@@ -741,6 +745,9 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev)
struct sun4i_usb_phy *phy = data->phys + i;
char name[16];
+ if (data->cfg->missing_phys & BIT(i))
+ continue;
+
snprintf(name, sizeof(name), "usb%d_vbus", i);
phy->vbus = devm_regulator_get_optional(dev, name);
if (IS_ERR(phy->vbus)) {
--
2.18.0
next prev parent reply other threads:[~2018-10-04 12:29 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-04 12:28 [PATCH v4 00/10] Allwinner H6 USB support Icenowy Zheng
2018-10-04 12:28 ` [PATCH v4 01/10] dt-bindings: phy: add binding for Allwinner H6 USB2 PHY Icenowy Zheng
2018-10-05 20:53 ` Rob Herring
2018-10-04 12:28 ` Icenowy Zheng [this message]
2018-10-04 12:28 ` [PATCH v4 03/10] phy: sun4i-usb: add support for " Icenowy Zheng
2018-11-02 8:41 ` Icenowy Zheng
2018-11-02 8:43 ` Kishon Vijay Abraham I
2018-11-09 14:04 ` Icenowy Zheng
2018-10-04 12:28 ` [PATCH v4 04/10] arm64: allwinner: dts: h6: add USB2-related device nodes Icenowy Zheng
2018-11-14 10:21 ` [linux-sunxi] " Chen-Yu Tsai
2018-11-14 10:30 ` Icenowy Zheng
2018-11-15 2:16 ` Chen-Yu Tsai
2018-11-15 6:28 ` Chen-Yu Tsai
2018-10-04 12:28 ` [PATCH v4 05/10] arm64: allwinner: dts: h6: add USB Vbus regulator Icenowy Zheng
2018-10-04 12:28 ` [PATCH v4 06/10] arm64: allwinner: dts: h6: enable USB2 on Pine H64 Icenowy Zheng
2018-10-04 12:28 ` [PATCH v4 07/10] dt-bindings: phy: add binding for Allwinner USB3 PHY Icenowy Zheng
2018-10-05 20:58 ` Rob Herring
2018-10-14 2:41 ` Icenowy Zheng
2018-10-18 13:58 ` Rob Herring
2018-10-19 5:54 ` [linux-sunxi] " Icenowy Zheng
2018-11-14 5:15 ` Icenowy Zheng
2018-10-04 12:28 ` [PATCH v4 08/10] phy: allwinner: add phy driver for USB3 PHY on Allwinner H6 SoC Icenowy Zheng
2018-11-14 4:57 ` Icenowy Zheng
2018-11-20 5:11 ` Kishon Vijay Abraham I
2018-10-04 12:28 ` [PATCH v4 09/10] arm64: allwinner: dts: h6: add USB3 device nodes Icenowy Zheng
2018-10-04 12:28 ` [PATCH v4 10/10] arm64: allwinner: dts: h6: enable USB3 port on Pine H64 Icenowy Zheng
2018-10-05 10:44 ` [linux-sunxi] [PATCH v4 00/10] Allwinner H6 USB support Chen-Yu Tsai
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=20181004122855.22981-3-icenowy@aosc.io \
--to=icenowy@aosc.io \
--cc=devicetree@vger.kernel.org \
--cc=kishon@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=maxime.ripard@bootlin.com \
--cc=robh+dt@kernel.org \
--cc=wens@csie.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: 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;
as well as URLs for NNTP newsgroup(s).