Commit b80e3e81 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-ci-v5.7-rc1' of... 

Merge tag 'usb-ci-v5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-next

Peter writes:

- Improve the runtime pm
- Cover one cover case during suspend/resume
- Some SPDX License changes

The code changes are at my ci-for-usb-next many days,
no issue is reported.

* tag 'usb-ci-v5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb:
  USB: chipidea: Use the correct style for SPDX License Identifier
  usb: chipidea: otg: handling vbus disconnect event occurred during system suspend
  usb: chipidea: udc: using structure ci_hdrc device for runtime PM
parents cfe20827 d9958306

drivers/usb/chipidea/bits.h

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* SPDX-License-Identifier: GPL-2.0 */

/*

 * bits.h - register bits of the ChipIdea USB IP core

 *

drivers/usb/chipidea/ci.h

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* SPDX-License-Identifier: GPL-2.0 */

/*

 * ci.h - common structures, functions, and macros of the ChipIdea driver

 *

drivers/usb/chipidea/ci_hdrc_imx.h

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

/* SPDX-License-Identifier: GPL-2.0+ */

/*

 * Copyright 2012 Freescale Semiconductor, Inc.

 */

drivers/usb/chipidea/otg.c

+7 −0
Original line number Diff line number Diff line
@@ -170,6 +170,13 @@ static void ci_handle_id_switch(struct ci_hdrc *ci) 
		dev_dbg(ci->dev, "switching from %s to %s\n",

			ci_role(ci)->name, ci->roles[role]->name);



		if (ci->vbus_active && ci->role == CI_ROLE_GADGET)

			/*

			 * vbus disconnect event is lost due to role

			 * switch occurs during system suspend.

			 */

			usb_gadget_vbus_disconnect(&ci->gadget);



		ci_role_stop(ci);



		if (role == CI_ROLE_GADGET &&

drivers/usb/chipidea/otg.h

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (C) 2013-2014 Freescale Semiconductor, Inc.

 *

CRA Git | Maintained and supported by SUSTech CRA and CCSE