remove useless patch according to 5.0.y
This commit is contained in:
parent
cdb000d9d5
commit
d0bb121478
@ -1,50 +0,0 @@
|
||||
From 985ed5bad1214be8b15749edc5f4e66c1ae3107b Mon Sep 17 00:00:00 2001
|
||||
From: Icenowy Zheng <icenowy@aosc.io>
|
||||
Date: Fri, 5 Jan 2018 18:31:27 +0800
|
||||
Subject: [PATCH 25/35] phy: sun4i-usb: add support for missing USB PHY index
|
||||
|
||||
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>
|
||||
---
|
||||
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 aa857be..d243695 100644
|
||||
--- a/drivers/phy/allwinner/phy-sun4i-usb.c
|
||||
+++ b/drivers/phy/allwinner/phy-sun4i-usb.c
|
||||
@@ -125,6 +125,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 {
|
||||
@@ -643,6 +644,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;
|
||||
}
|
||||
|
||||
@@ -738,6 +742,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.7.4
|
||||
|
||||
Loading…
Reference in New Issue
Block a user