Skip to content

Commit cedd5f6

Browse files
torvaldstorvalds
committed
Merge tag 'usb-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB / PHY driver fixes from Greg KH: "Here's a number of USB and PHY driver fixes for 4.0-rc5. The largest thing here is a revert of a gadget function driver patch that removes 500 lines of code. Other than that, it's a number of reported bugs fixes and new quirk/id entries. All have been in linux-next for a while" * tag 'usb-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (33 commits) usb: common: otg-fsm: only signal connect after switching to peripheral uas: Add US_FL_NO_ATA_1X for Initio Corporation controllers / devices USB: ehci-atmel: rework clk handling MAINTAINERS: add entry for USB OTG FSM usb: chipidea: otg: add a_alt_hnp_support response for B device phy: omap-usb2: Fix missing clk_prepare call when using old dt name phy: ti/omap: Fix modalias phy: core: Fixup return value of phy_exit when !pm_runtime_enabled phy: miphy28lp: Convert to devm_kcalloc and fix wrong sizof phy: miphy365x: Convert to devm_kcalloc and fix wrong sizeof phy: twl4030-usb: Remove redundant assignment for twl->linkstat phy: exynos5-usbdrd: Fix off-by-one valid value checking for args->args[0] phy: Find the right match in devm_phy_destroy() phy: rockchip-usb: Fixup rockchip_usb_phy_power_on failure path phy: ti-pipe3: Simplify ti_pipe3_dpll_wait_lock implementation phy: samsung-usb2: Remove NULL terminating entry from phys array phy: hix5hd2-sata: Check return value of platform_get_resource phy: exynos-dp-video: Kill exynos_dp_video_phy_pwr_isol function Revert "usb: gadget: zero: Add support for interrupt EP" Revert "xhci: Clear the host side toggle manually when endpoint is 'soft reset'" ...
2 parents f897522 + a886bd9 commit cedd5f6

34 files changed

+131
-719
lines changed

‎MAINTAINERS

+7
Original file line numberDiff line numberDiff line change
@@ -10207,6 +10207,13 @@ S: Maintained
1020710207
F: Documentation/usb/ohci.txt
1020810208
F: drivers/usb/host/ohci*
1020910209

10210+
USB OTG FSM (Finite State Machine)
10211+
M: Peter Chen <[email protected]>
10212+
T: git git://github.com/hzpeterchen/linux-usb.git
10213+
L: [email protected]
10214+
S: Maintained
10215+
F: drivers/usb/common/usb-otg-fsm.c
10216+
1021010217
USB OVER IP DRIVER
1021110218
M: Valentina Manea <[email protected]>
1021210219
M: Shuah Khan <[email protected]>

‎drivers/phy/phy-armada375-usb2.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ static int armada375_usb_phy_init(struct phy *phy)
3737
struct armada375_cluster_phy *cluster_phy;
3838
u32 reg;
3939

40-
cluster_phy = dev_get_drvdata(phy->dev.parent);
40+
cluster_phy = phy_get_drvdata(phy);
4141
if (!cluster_phy)
4242
return -ENODEV;
4343

@@ -131,6 +131,7 @@ static int armada375_usb_phy_probe(struct platform_device *pdev)
131131
cluster_phy->reg = usb_cluster_base;
132132

133133
dev_set_drvdata(dev, cluster_phy);
134+
phy_set_drvdata(phy, cluster_phy);
134135

135136
phy_provider = devm_of_phy_provider_register(&pdev->dev,
136137
armada375_usb_phy_xlate);

‎drivers/phy/phy-core.c

+6-5
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ static void devm_phy_consume(struct device *dev, void *res)
5252

5353
static int devm_phy_match(struct device *dev, void *res, void *match_data)
5454
{
55-
return res == match_data;
55+
struct phy **phy = res;
56+
57+
return *phy == match_data;
5658
}
5759

5860
/**
@@ -223,6 +225,7 @@ int phy_init(struct phy *phy)
223225
ret = phy_pm_runtime_get_sync(phy);
224226
if (ret < 0 && ret != -ENOTSUPP)
225227
return ret;
228+
ret = 0; /* Override possible ret == -ENOTSUPP */
226229

227230
mutex_lock(&phy->mutex);
228231
if (phy->init_count == 0 && phy->ops->init) {
@@ -231,8 +234,6 @@ int phy_init(struct phy *phy)
231234
dev_err(&phy->dev, "phy init failed --> %d\n", ret);
232235
goto out;
233236
}
234-
} else {
235-
ret = 0; /* Override possible ret == -ENOTSUPP */
236237
}
237238
++phy->init_count;
238239

@@ -253,6 +254,7 @@ int phy_exit(struct phy *phy)
253254
ret = phy_pm_runtime_get_sync(phy);
254255
if (ret < 0 && ret != -ENOTSUPP)
255256
return ret;
257+
ret = 0; /* Override possible ret == -ENOTSUPP */
256258

257259
mutex_lock(&phy->mutex);
258260
if (phy->init_count == 1 && phy->ops->exit) {
@@ -287,6 +289,7 @@ int phy_power_on(struct phy *phy)
287289
ret = phy_pm_runtime_get_sync(phy);
288290
if (ret < 0 && ret != -ENOTSUPP)
289291
return ret;
292+
ret = 0; /* Override possible ret == -ENOTSUPP */
290293

291294
mutex_lock(&phy->mutex);
292295
if (phy->power_count == 0 && phy->ops->power_on) {
@@ -295,8 +298,6 @@ int phy_power_on(struct phy *phy)
295298
dev_err(&phy->dev, "phy poweron failed --> %d\n", ret);
296299
goto out;
297300
}
298-
} else {
299-
ret = 0; /* Override possible ret == -ENOTSUPP */
300301
}
301302
++phy->power_count;
302303
mutex_unlock(&phy->mutex);

‎drivers/phy/phy-exynos-dp-video.c

+4-20
Original file line numberDiff line numberDiff line change
@@ -30,38 +30,22 @@ struct exynos_dp_video_phy {
3030
const struct exynos_dp_video_phy_drvdata *drvdata;
3131
};
3232

33-
static void exynos_dp_video_phy_pwr_isol(struct exynos_dp_video_phy *state,
34-
unsigned int on)
35-
{
36-
unsigned int val;
37-
38-
if (IS_ERR(state->regs))
39-
return;
40-
41-
val = on ? 0 : EXYNOS5_PHY_ENABLE;
42-
43-
regmap_update_bits(state->regs, state->drvdata->phy_ctrl_offset,
44-
EXYNOS5_PHY_ENABLE, val);
45-
}
46-
4733
static int exynos_dp_video_phy_power_on(struct phy *phy)
4834
{
4935
struct exynos_dp_video_phy *state = phy_get_drvdata(phy);
5036

5137
/* Disable power isolation on DP-PHY */
52-
exynos_dp_video_phy_pwr_isol(state, 0);
53-
54-
return 0;
38+
return regmap_update_bits(state->regs, state->drvdata->phy_ctrl_offset,
39+
EXYNOS5_PHY_ENABLE, EXYNOS5_PHY_ENABLE);
5540
}
5641

5742
static int exynos_dp_video_phy_power_off(struct phy *phy)
5843
{
5944
struct exynos_dp_video_phy *state = phy_get_drvdata(phy);
6045

6146
/* Enable power isolation on DP-PHY */
62-
exynos_dp_video_phy_pwr_isol(state, 1);
63-
64-
return 0;
47+
return regmap_update_bits(state->regs, state->drvdata->phy_ctrl_offset,
48+
EXYNOS5_PHY_ENABLE, 0);
6549
}
6650

6751
static struct phy_ops exynos_dp_video_phy_ops = {

‎drivers/phy/phy-exynos-mipi-video.c

+4-7
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ struct exynos_mipi_video_phy {
4343
} phys[EXYNOS_MIPI_PHYS_NUM];
4444
spinlock_t slock;
4545
void __iomem *regs;
46-
struct mutex mutex;
4746
struct regmap *regmap;
4847
};
4948

@@ -59,8 +58,9 @@ static int __set_phy_state(struct exynos_mipi_video_phy *state,
5958
else
6059
reset = EXYNOS4_MIPI_PHY_SRESETN;
6160

62-
if (state->regmap) {
63-
mutex_lock(&state->mutex);
61+
spin_lock(&state->slock);
62+
63+
if (!IS_ERR(state->regmap)) {
6464
regmap_read(state->regmap, offset, &val);
6565
if (on)
6666
val |= reset;
@@ -72,11 +72,9 @@ static int __set_phy_state(struct exynos_mipi_video_phy *state,
7272
else if (!(val & EXYNOS4_MIPI_PHY_RESET_MASK))
7373
val &= ~EXYNOS4_MIPI_PHY_ENABLE;
7474
regmap_write(state->regmap, offset, val);
75-
mutex_unlock(&state->mutex);
7675
} else {
7776
addr = state->regs + EXYNOS_MIPI_PHY_CONTROL(id / 2);
7877

79-
spin_lock(&state->slock);
8078
val = readl(addr);
8179
if (on)
8280
val |= reset;
@@ -90,9 +88,9 @@ static int __set_phy_state(struct exynos_mipi_video_phy *state,
9088
val &= ~EXYNOS4_MIPI_PHY_ENABLE;
9189

9290
writel(val, addr);
93-
spin_unlock(&state->slock);
9491
}
9592

93+
spin_unlock(&state->slock);
9694
return 0;
9795
}
9896

@@ -158,7 +156,6 @@ static int exynos_mipi_video_phy_probe(struct platform_device *pdev)
158156

159157
dev_set_drvdata(dev, state);
160158
spin_lock_init(&state->slock);
161-
mutex_init(&state->mutex);
162159

163160
for (i = 0; i < EXYNOS_MIPI_PHYS_NUM; i++) {
164161
struct phy *phy = devm_phy_create(dev, NULL,

‎drivers/phy/phy-exynos4210-usb2.c

-1
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,6 @@ static const struct samsung_usb2_common_phy exynos4210_phys[] = {
250250
.power_on = exynos4210_power_on,
251251
.power_off = exynos4210_power_off,
252252
},
253-
{},
254253
};
255254

256255
const struct samsung_usb2_phy_config exynos4210_usb2_phy_config = {

‎drivers/phy/phy-exynos4x12-usb2.c

-1
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,6 @@ static const struct samsung_usb2_common_phy exynos4x12_phys[] = {
361361
.power_on = exynos4x12_power_on,
362362
.power_off = exynos4x12_power_off,
363363
},
364-
{},
365364
};
366365

367366
const struct samsung_usb2_phy_config exynos3250_usb2_phy_config = {

‎drivers/phy/phy-exynos5-usbdrd.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ static struct phy *exynos5_usbdrd_phy_xlate(struct device *dev,
531531
{
532532
struct exynos5_usbdrd_phy *phy_drd = dev_get_drvdata(dev);
533533

534-
if (WARN_ON(args->args[0] > EXYNOS5_DRDPHYS_NUM))
534+
if (WARN_ON(args->args[0] >= EXYNOS5_DRDPHYS_NUM))
535535
return ERR_PTR(-ENODEV);
536536

537537
return phy_drd->phys[args->args[0]].phy;

‎drivers/phy/phy-exynos5250-usb2.c

-1
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,6 @@ static const struct samsung_usb2_common_phy exynos5250_phys[] = {
391391
.power_on = exynos5250_power_on,
392392
.power_off = exynos5250_power_off,
393393
},
394-
{},
395394
};
396395

397396
const struct samsung_usb2_phy_config exynos5250_usb2_phy_config = {

‎drivers/phy/phy-hix5hd2-sata.c

+3
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,9 @@ static int hix5hd2_sata_phy_probe(struct platform_device *pdev)
147147
return -ENOMEM;
148148

149149
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
150+
if (!res)
151+
return -EINVAL;
152+
150153
priv->base = devm_ioremap(dev, res->start, resource_size(res));
151154
if (!priv->base)
152155
return -ENOMEM;

‎drivers/phy/phy-miphy28lp.c

+7-6
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ struct miphy28lp_dev {
228228
struct regmap *regmap;
229229
struct mutex miphy_mutex;
230230
struct miphy28lp_phy **phys;
231+
int nphys;
231232
};
232233

233234
struct miphy_initval {
@@ -1116,7 +1117,7 @@ static struct phy *miphy28lp_xlate(struct device *dev,
11161117
return ERR_PTR(-EINVAL);
11171118
}
11181119

1119-
for (index = 0; index < of_get_child_count(dev->of_node); index++)
1120+
for (index = 0; index < miphy_dev->nphys; index++)
11201121
if (phynode == miphy_dev->phys[index]->phy->dev.of_node) {
11211122
miphy_phy = miphy_dev->phys[index];
11221123
break;
@@ -1138,6 +1139,7 @@ static struct phy *miphy28lp_xlate(struct device *dev,
11381139

11391140
static struct phy_ops miphy28lp_ops = {
11401141
.init = miphy28lp_init,
1142+
.owner = THIS_MODULE,
11411143
};
11421144

11431145
static int miphy28lp_probe_resets(struct device_node *node,
@@ -1200,16 +1202,15 @@ static int miphy28lp_probe(struct platform_device *pdev)
12001202
struct miphy28lp_dev *miphy_dev;
12011203
struct phy_provider *provider;
12021204
struct phy *phy;
1203-
int chancount, port = 0;
1204-
int ret;
1205+
int ret, port = 0;
12051206

12061207
miphy_dev = devm_kzalloc(&pdev->dev, sizeof(*miphy_dev), GFP_KERNEL);
12071208
if (!miphy_dev)
12081209
return -ENOMEM;
12091210

1210-
chancount = of_get_child_count(np);
1211-
miphy_dev->phys = devm_kzalloc(&pdev->dev, sizeof(phy) * chancount,
1212-
GFP_KERNEL);
1211+
miphy_dev->nphys = of_get_child_count(np);
1212+
miphy_dev->phys = devm_kcalloc(&pdev->dev, miphy_dev->nphys,
1213+
sizeof(*miphy_dev->phys), GFP_KERNEL);
12131214
if (!miphy_dev->phys)
12141215
return -ENOMEM;
12151216

‎drivers/phy/phy-miphy365x.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ struct miphy365x_dev {
150150
struct regmap *regmap;
151151
struct mutex miphy_mutex;
152152
struct miphy365x_phy **phys;
153+
int nphys;
153154
};
154155

155156
/*
@@ -485,7 +486,7 @@ static struct phy *miphy365x_xlate(struct device *dev,
485486
return ERR_PTR(-EINVAL);
486487
}
487488

488-
for (index = 0; index < of_get_child_count(dev->of_node); index++)
489+
for (index = 0; index < miphy_dev->nphys; index++)
489490
if (phynode == miphy_dev->phys[index]->phy->dev.of_node) {
490491
miphy_phy = miphy_dev->phys[index];
491492
break;
@@ -541,16 +542,15 @@ static int miphy365x_probe(struct platform_device *pdev)
541542
struct miphy365x_dev *miphy_dev;
542543
struct phy_provider *provider;
543544
struct phy *phy;
544-
int chancount, port = 0;
545-
int ret;
545+
int ret, port = 0;
546546

547547
miphy_dev = devm_kzalloc(&pdev->dev, sizeof(*miphy_dev), GFP_KERNEL);
548548
if (!miphy_dev)
549549
return -ENOMEM;
550550

551-
chancount = of_get_child_count(np);
552-
miphy_dev->phys = devm_kzalloc(&pdev->dev, sizeof(phy) * chancount,
553-
GFP_KERNEL);
551+
miphy_dev->nphys = of_get_child_count(np);
552+
miphy_dev->phys = devm_kcalloc(&pdev->dev, miphy_dev->nphys,
553+
sizeof(*miphy_dev->phys), GFP_KERNEL);
554554
if (!miphy_dev->phys)
555555
return -ENOMEM;
556556

‎drivers/phy/phy-omap-control.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ static void __exit omap_control_phy_exit(void)
360360
}
361361
module_exit(omap_control_phy_exit);
362362

363-
MODULE_ALIAS("platform: omap_control_phy");
363+
MODULE_ALIAS("platform:omap_control_phy");
364364
MODULE_AUTHOR("Texas Instruments Inc.");
365365
MODULE_DESCRIPTION("OMAP Control Module PHY Driver");
366366
MODULE_LICENSE("GPL v2");

‎drivers/phy/phy-omap-usb2.c

+4-3
Original file line numberDiff line numberDiff line change
@@ -296,10 +296,11 @@ static int omap_usb2_probe(struct platform_device *pdev)
296296
dev_warn(&pdev->dev,
297297
"found usb_otg_ss_refclk960m, please fix DTS\n");
298298
}
299-
} else {
300-
clk_prepare(phy->optclk);
301299
}
302300

301+
if (!IS_ERR(phy->optclk))
302+
clk_prepare(phy->optclk);
303+
303304
usb_add_phy_dev(&phy->phy);
304305

305306
return 0;
@@ -383,7 +384,7 @@ static struct platform_driver omap_usb2_driver = {
383384

384385
module_platform_driver(omap_usb2_driver);
385386

386-
MODULE_ALIAS("platform: omap_usb2");
387+
MODULE_ALIAS("platform:omap_usb2");
387388
MODULE_AUTHOR("Texas Instruments Inc.");
388389
MODULE_DESCRIPTION("OMAP USB2 phy driver");
389390
MODULE_LICENSE("GPL v2");

‎drivers/phy/phy-rockchip-usb.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ static int rockchip_usb_phy_power_off(struct phy *_phy)
6161
return ret;
6262

6363
clk_disable_unprepare(phy->clk);
64-
if (ret)
65-
return ret;
6664

6765
return 0;
6866
}
@@ -78,8 +76,10 @@ static int rockchip_usb_phy_power_on(struct phy *_phy)
7876

7977
/* Power up usb phy analog blocks by set siddq 0 */
8078
ret = rockchip_usb_phy_power(phy, 0);
81-
if (ret)
79+
if (ret) {
80+
clk_disable_unprepare(phy->clk);
8281
return ret;
82+
}
8383

8484
return 0;
8585
}

‎drivers/phy/phy-ti-pipe3.c

+4-8
Original file line numberDiff line numberDiff line change
@@ -165,15 +165,11 @@ static int ti_pipe3_dpll_wait_lock(struct ti_pipe3 *phy)
165165
cpu_relax();
166166
val = ti_pipe3_readl(phy->pll_ctrl_base, PLL_STATUS);
167167
if (val & PLL_LOCK)
168-
break;
168+
return 0;
169169
} while (!time_after(jiffies, timeout));
170170

171-
if (!(val & PLL_LOCK)) {
172-
dev_err(phy->dev, "DPLL failed to lock\n");
173-
return -EBUSY;
174-
}
175-
176-
return 0;
171+
dev_err(phy->dev, "DPLL failed to lock\n");
172+
return -EBUSY;
177173
}
178174

179175
static int ti_pipe3_dpll_program(struct ti_pipe3 *phy)
@@ -608,7 +604,7 @@ static struct platform_driver ti_pipe3_driver = {
608604

609605
module_platform_driver(ti_pipe3_driver);
610606

611-
MODULE_ALIAS("platform: ti_pipe3");
607+
MODULE_ALIAS("platform:ti_pipe3");
612608
MODULE_AUTHOR("Texas Instruments Inc.");
613609
MODULE_DESCRIPTION("TI PIPE3 phy driver");
614610
MODULE_LICENSE("GPL v2");

‎drivers/phy/phy-twl4030-usb.c

-1
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,6 @@ static int twl4030_usb_probe(struct platform_device *pdev)
666666
twl->dev = &pdev->dev;
667667
twl->irq = platform_get_irq(pdev, 0);
668668
twl->vbus_supplied = false;
669-
twl->linkstat = -EINVAL;
670669
twl->linkstat = OMAP_MUSB_UNKNOWN;
671670

672671
twl->phy.dev = twl->dev;

0 commit comments

Comments
 (0)