tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'phy-for-4.18-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-linus
Kishon writes:
phy: for 4.18-rc
*) Fix to get xhci working after disable<->enable cycle
*) Fix wrong enum used for status lines (also fixes a compilation
warning).
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
+6
-2
+4
drivers/phy/broadcom/phy-brcm-usb-init.c
+4
drivers/phy/broadcom/phy-brcm-usb-init.c
···
962
962
{
963
963
void __iomem *ctrl = params->ctrl_regs;
964
964
965
+
USB_CTRL_UNSET(ctrl, USB30_PCTL, PHY3_IDDQ_OVERRIDE);
966
+
/* 1 millisecond - for USB clocks to settle down */
967
+
usleep_range(1000, 2000);
968
+
965
969
if (BRCM_ID(params->family_id) == 0x7366) {
966
970
/*
967
971
* The PHY3_SOFT_RESETB bits default to the wrong state.
+2
-2
drivers/phy/motorola/phy-mapphone-mdm6600.c
+2
-2
drivers/phy/motorola/phy-mapphone-mdm6600.c
···
182
182
ddata = container_of(work, struct phy_mdm6600, status_work.work);
183
183
dev = ddata->dev;
184
184
185
-
error = gpiod_get_array_value_cansleep(PHY_MDM6600_NR_CMD_LINES,
185
+
error = gpiod_get_array_value_cansleep(PHY_MDM6600_NR_STATUS_LINES,
186
186
ddata->status_gpios->desc,
187
187
values);
188
188
if (error)
189
189
return;
190
190
191
-
for (i = 0; i < PHY_MDM6600_NR_CMD_LINES; i++) {
191
+
for (i = 0; i < PHY_MDM6600_NR_STATUS_LINES; i++) {
192
192
val |= values[i] << i;
193
193
dev_dbg(ddata->dev, "XXX %s: i: %i values[i]: %i val: %i\n",
194
194
__func__, i, values[i], val);