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

Commit eb9eef61 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'fixes-for-cleanup' of... 

Merge branch 'fixes-for-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup

* 'fixes-for-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP: OTG integration: fix compiler warning
  ARM: OMAP1: USB: fix ocpi_enable compile problem on non-1610 builds
parents 86822f81 19b08b33

arch/arm/mach-omap1/common.h

+4 −0
Original line number Diff line number Diff line
@@ -67,6 +67,10 @@ extern bool omap_32k_timer_init(void); 


extern u32 omap_irq_flags;



#ifdef CONFIG_ARCH_OMAP16XX

extern int ocpi_enable(void);

#else

static inline int ocpi_enable(void) { return 0; }

#endif



#endif /* __ARCH_ARM_MACH_OMAP1_COMMON_H */

arch/arm/plat-omap/usb.c

+3 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ void __init 
omap_otg_init(struct omap_usb_config *config)

{

	u32		syscon;

	int		status;

	int		alt_pingroup = 0;



	/* NOTE:  no bus or clock setup (yet?) */
@@ -102,6 +101,7 @@ omap_otg_init(struct omap_usb_config *config) 
#ifdef	CONFIG_USB_GADGET_OMAP

	if (config->otg || config->register_dev) {

		struct platform_device *udc_device = config->udc_device;

		int status;



		syscon &= ~DEV_IDLE_EN;

		udc_device->dev.platform_data = config;
@@ -114,6 +114,7 @@ omap_otg_init(struct omap_usb_config *config) 
#if	defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)

	if (config->otg || config->register_host) {

		struct platform_device *ohci_device = config->ohci_device;

		int status;



		syscon &= ~HST_IDLE_EN;

		ohci_device->dev.platform_data = config;
@@ -126,6 +127,7 @@ omap_otg_init(struct omap_usb_config *config) 
#ifdef	CONFIG_USB_OTG

	if (config->otg) {

		struct platform_device *otg_device = config->otg_device;

		int status;



		syscon &= ~OTG_IDLE_EN;

		otg_device->dev.platform_data = config;