Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24dd9ba1 authored Jul 16, 2018 by Greg Kroah-Hartman

Merge tag 'phy-for-4.18-rc' of...

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>

parents 1445cbe4 ad500330

drivers/phy/broadcom/phy-brcm-usb-init.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -962,6 +962,10 @@ void brcm_usb_init_xhci(struct brcm_usb_init_params *params)
		{
		void __iomem *ctrl = params->ctrl_regs;

		USB_CTRL_UNSET(ctrl, USB30_PCTL, PHY3_IDDQ_OVERRIDE);
		/* 1 millisecond - for USB clocks to settle down */
		usleep_range(1000, 2000);

		if (BRCM_ID(params->family_id) == 0x7366) {
		/*
		* The PHY3_SOFT_RESETB bits default to the wrong state.

drivers/phy/motorola/phy-mapphone-mdm6600.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -182,13 +182,13 @@ static void phy_mdm6600_status(struct work_struct *work)
		ddata = container_of(work, struct phy_mdm6600, status_work.work);
		dev = ddata->dev;

		error = gpiod_get_array_value_cansleep(PHY_MDM6600_NR_CMD_LINES,
		error = gpiod_get_array_value_cansleep(PHY_MDM6600_NR_STATUS_LINES,
		ddata->status_gpios->desc,
		values);
		if (error)
		return;

		for (i = 0; i < PHY_MDM6600_NR_CMD_LINES; i++) {
		for (i = 0; i < PHY_MDM6600_NR_STATUS_LINES; i++) {
		val \|= values[i] << i;
		dev_dbg(ddata->dev, "XXX %s: i: %i values[i]: %i val: %i\n",
		__func__, i, values[i], val);