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

Commit c767c1c6 authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman
Browse files

usb: musb_hdrc build fixes 



Minor musb_hdrc updates:

  - so it'll build on DaVinci, given relevant platform updates;
      * remove support for an un-shipped OTG prototype
      * rely on gpiolib framework conversion for the I2C GPIOs
      * the <asm/arch/hdrc_cnf.h> mechanism has been removed

  - catch comments up to the recent removal of the per-SOC header
    with the silicon configuration data;

  - and remove two inappropriate "inline" declarations which
    just bloat host side code.

There are still some more <asm/arch/XYZ.h> ==> <mach/XYZ.h>
changes needed in this driver, catching up to the relocation
of most of the include/asm-arm/arch-* contents.

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@nokia.com>
Cc: stable <stable@kernel.org> [2.6.27]
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 64ca44a6

drivers/usb/musb/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -33,10 +33,6 @@ config USB_MUSB_SOC 
	default y if ARCH_DAVINCI

	default y if ARCH_OMAP2430

	default y if ARCH_OMAP34XX

	help

	  Use a static <asm/arch/hdrc_cnf.h> file to describe how the

	  controller is configured (endpoints, mechanisms, etc) on the

	  current iteration of a given system-on-chip.



comment "DaVinci 644x USB support"

	depends on USB_MUSB_HDRC && ARCH_DAVINCI

drivers/usb/musb/cppi_dma.h

+2 −2
Original line number Diff line number Diff line
@@ -119,8 +119,8 @@ struct cppi { 
	void __iomem			*mregs;		/* Mentor regs */

	void __iomem			*tibase;	/* TI/CPPI regs */



	struct cppi_channel		tx[MUSB_C_NUM_EPT - 1];

	struct cppi_channel		rx[MUSB_C_NUM_EPR - 1];

	struct cppi_channel		tx[4];

	struct cppi_channel		rx[4];



	struct dma_pool			*pool;

drivers/usb/musb/davinci.c

+4 −16
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/delay.h>

#include <linux/clk.h>

#include <linux/io.h>

#include <linux/gpio.h>



#include <asm/arch/hardware.h>

#include <asm/arch/memory.h>
@@ -39,7 +40,7 @@ 
#include "musb_core.h"



#ifdef CONFIG_MACH_DAVINCI_EVM

#include <asm/arch/i2c-client.h>

#define GPIO_nVBUS_DRV		87

#endif



#include "davinci.h"
@@ -138,7 +139,6 @@ static int vbus_state = -1; 
/* VBUS SWITCHING IS BOARD-SPECIFIC */



#ifdef CONFIG_MACH_DAVINCI_EVM

#ifndef CONFIG_MACH_DAVINCI_EVM_OTG



/* I2C operations are always synchronous, and require a task context.

 * With unloaded systems, using the shared workqueue seems to suffice
@@ -146,12 +146,11 @@ static int vbus_state = -1; 
 */

static void evm_deferred_drvvbus(struct work_struct *ignored)

{

	davinci_i2c_expander_op(0x3a, USB_DRVVBUS, vbus_state);

	gpio_set_value_cansleep(GPIO_nVBUS_DRV, vbus_state);

	vbus_state = !vbus_state;

}

static DECLARE_WORK(evm_vbus_work, evm_deferred_drvvbus);



#endif	/* modified board */

#endif	/* EVM */



static void davinci_source_power(struct musb *musb, int is_on, int immediate)
@@ -165,21 +164,10 @@ static void davinci_source_power(struct musb *musb, int is_on, int immediate) 


#ifdef CONFIG_MACH_DAVINCI_EVM

	if (machine_is_davinci_evm()) {

#ifdef CONFIG_MACH_DAVINCI_EVM_OTG

		/* modified EVM board switching VBUS with GPIO(6) not I2C

		 * NOTE:  PINMUX0.RGB888 (bit23) must be clear

		 */

		if (is_on)

			gpio_set(GPIO(6));

		else

			gpio_clear(GPIO(6));

		immediate = 1;

#else

		if (immediate)

			davinci_i2c_expander_op(0x3a, USB_DRVVBUS, !is_on);

			gpio_set_value_cansleep(GPIO_nVBUS_DRV, vbus_state);

		else

			schedule_work(&evm_vbus_work);

#endif

	}

#endif

	if (immediate)

drivers/usb/musb/musb_core.c

+4 −4
Original line number Diff line number Diff line
@@ -82,9 +82,9 @@ 
/*

 * This gets many kinds of configuration information:

 *	- Kconfig for everything user-configurable

 *	- <asm/arch/hdrc_cnf.h> for SOC or family details

 *	- platform_device for addressing, irq, and platform_data

 *	- platform_data is mostly for board-specific informarion

 *	  (plus recentrly, SOC or family details)

 *

 * Most of the conditional compilation will (someday) vanish.

 */
@@ -974,9 +974,9 @@ static void musb_shutdown(struct platform_device *pdev) 
/*

 * The silicon either has hard-wired endpoint configurations, or else

 * "dynamic fifo" sizing.  The driver has support for both, though at this

 * writing only the dynamic sizing is very well tested.   We use normal

 * idioms to so both modes are compile-tested, but dead code elimination

 * leaves only the relevant one in the object file.

 * writing only the dynamic sizing is very well tested.   Since we switched

 * away from compile-time hardware parameters, we can no longer rely on

 * dead code elimination to leave only the relevant one in the object file.

 *

 * We don't currently use dynamic fifo setup capability to do anything

 * more than selecting one of a bunch of predefined configurations.

drivers/usb/musb/musb_host.c

+3 −3
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum, 
/*

 * Clear TX fifo. Needed to avoid BABBLE errors.

 */

static inline void musb_h_tx_flush_fifo(struct musb_hw_ep *ep)

static void musb_h_tx_flush_fifo(struct musb_hw_ep *ep)

{

	void __iomem	*epio = ep->regs;

	u16		csr;
@@ -435,7 +435,7 @@ musb_advance_schedule(struct musb *musb, struct urb *urb, 
	}

}



static inline u16 musb_h_flush_rxfifo(struct musb_hw_ep *hw_ep, u16 csr)

static u16 musb_h_flush_rxfifo(struct musb_hw_ep *hw_ep, u16 csr)

{

	/* we don't want fifo to fill itself again;

	 * ignore dma (various models),
@@ -1004,7 +1004,7 @@ static bool musb_h_ep0_continue(struct musb *musb, u16 len, struct urb *urb) 


/*

 * Handle default endpoint interrupt as host. Only called in IRQ time

 * from the LinuxIsr() interrupt service routine.

 * from musb_interrupt().

 *

 * called with controller irqlocked

 */