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

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

Merge tag 'usb-ci-v4.5-rc1' of... 

Merge tag 'usb-ci-v4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-testing

Peter writes:

The chipidea changes for v4.5-rc1

- Delete static debug for chipidea driver.
- Suspend USB core when A device tries to switch to peripheral mode,
  at former design, it just stopped SoF simply but USB core doesn't know it.
- Several small changes.
parents 87cf5586 8c100e74

Documentation/usb/chipidea.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -7,8 +7,8 @@ with 2 Freescale i.MX6Q sabre SD boards. 
---------------------------------------

---------------------------------------

Select CONFIG_USB_OTG_FSM, rebuild kernel Image and modules.

Select CONFIG_USB_OTG_FSM, rebuild kernel Image and modules.

If you want to check some internal variables for otg fsm,

If you want to check some internal variables for otg fsm,

select CONFIG_USB_CHIPIDEA_DEBUG, there are 2 files which

mount debugfs, there are 2 files which can show otg fsm

can show otg fsm variables and some controller registers value:

variables and some controller registers value:

cat /sys/kernel/debug/ci_hdrc.0/otg

cat /sys/kernel/debug/ci_hdrc.0/otg

cat /sys/kernel/debug/ci_hdrc.0/registers

cat /sys/kernel/debug/ci_hdrc.0/registers

drivers/usb/chipidea/Kconfig

+0 −5
Original line number Original line Diff line number Diff line
@@ -37,9 +37,4 @@ config USB_CHIPIDEA_HOST 
	  Say Y here to enable host controller functionality of the

	  Say Y here to enable host controller functionality of the

	  ChipIdea driver.

	  ChipIdea driver.





config USB_CHIPIDEA_DEBUG

	bool "ChipIdea driver debug"

	help

	  Say Y here to enable debugging output of the ChipIdea driver.



endif
 
endif

drivers/usb/chipidea/Makefile

+1 −4
Original line number Original line Diff line number Diff line 
ccflags-$(CONFIG_USB_CHIPIDEA_DEBUG) := -DDEBUG



obj-$(CONFIG_USB_CHIPIDEA)		+= ci_hdrc.o

obj-$(CONFIG_USB_CHIPIDEA)		+= ci_hdrc.o





ci_hdrc-y				:= core.o otg.o

ci_hdrc-y				:= core.o otg.o debug.o

ci_hdrc-$(CONFIG_USB_CHIPIDEA_UDC)	+= udc.o

ci_hdrc-$(CONFIG_USB_CHIPIDEA_UDC)	+= udc.o

ci_hdrc-$(CONFIG_USB_CHIPIDEA_HOST)	+= host.o

ci_hdrc-$(CONFIG_USB_CHIPIDEA_HOST)	+= host.o

ci_hdrc-$(CONFIG_USB_CHIPIDEA_DEBUG)	+= debug.o

ci_hdrc-$(CONFIG_USB_OTG_FSM)		+= otg_fsm.o

ci_hdrc-$(CONFIG_USB_OTG_FSM)		+= otg_fsm.o





# Glue/Bridge layers go here

# Glue/Bridge layers go here

drivers/usb/chipidea/ci.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -433,4 +433,7 @@ int hw_wait_reg(struct ci_hdrc *ci, enum ci_hw_regs reg, u32 mask, 




void ci_platform_configure(struct ci_hdrc *ci);

void ci_platform_configure(struct ci_hdrc *ci);





int dbg_create_files(struct ci_hdrc *ci);



void dbg_remove_files(struct ci_hdrc *ci);

#endif	/* __DRIVERS_USB_CHIPIDEA_CI_H */
 
#endif	/* __DRIVERS_USB_CHIPIDEA_CI_H */

drivers/usb/chipidea/ci_hdrc_imx.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -345,6 +345,11 @@ static int ci_hdrc_imx_remove(struct platform_device *pdev) 
	return 0;

	return 0;

}

}





static void ci_hdrc_imx_shutdown(struct platform_device *pdev)

{

	ci_hdrc_imx_remove(pdev);

}



#ifdef CONFIG_PM

#ifdef CONFIG_PM

static int imx_controller_suspend(struct device *dev)

static int imx_controller_suspend(struct device *dev)

{

{
@@ -462,6 +467,7 @@ static const struct dev_pm_ops ci_hdrc_imx_pm_ops = { 
static struct platform_driver ci_hdrc_imx_driver = {

static struct platform_driver ci_hdrc_imx_driver = {

	.probe = ci_hdrc_imx_probe,

	.probe = ci_hdrc_imx_probe,

	.remove = ci_hdrc_imx_remove,

	.remove = ci_hdrc_imx_remove,

	.shutdown = ci_hdrc_imx_shutdown,

	.driver = {

	.driver = {

		.name = "imx_usb",

		.name = "imx_usb",

		.of_match_table = ci_hdrc_imx_dt_ids,

		.of_match_table = ci_hdrc_imx_dt_ids,