Commit 9fe15316 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: omap1: innovator: move ohci phy power handling to board file 



The innovator board needs a special case for its phy control.

Move the corresponding code into the board file and out of the
common code by adding another callback.

Acked-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 0ae41a0b

arch/arm/mach-omap1/board-innovator.c

+19 −0
Original line number Original line Diff line number Diff line
@@ -290,6 +290,23 @@ static void __init innovator_init_smc91x(void) 
}

}





#ifdef CONFIG_ARCH_OMAP15XX

#ifdef CONFIG_ARCH_OMAP15XX

/*

 * Board specific gang-switched transceiver power on/off.

 */

static int innovator_omap_ohci_transceiver_power(int on)

{

	if (on)

		__raw_writeb(__raw_readb(INNOVATOR_FPGA_CAM_USB_CONTROL)

				| ((1 << 5/*usb1*/) | (1 << 3/*usb2*/)),

			       INNOVATOR_FPGA_CAM_USB_CONTROL);

	else

		__raw_writeb(__raw_readb(INNOVATOR_FPGA_CAM_USB_CONTROL)

				& ~((1 << 5/*usb1*/) | (1 << 3/*usb2*/)),

			       INNOVATOR_FPGA_CAM_USB_CONTROL);



	return 0;

}



static struct omap_usb_config innovator1510_usb_config __initdata = {

static struct omap_usb_config innovator1510_usb_config __initdata = {

	/* for bundled non-standard host and peripheral cables */

	/* for bundled non-standard host and peripheral cables */

	.hmc_mode	= 4,

	.hmc_mode	= 4,
@@ -300,6 +317,8 @@ static struct omap_usb_config innovator1510_usb_config __initdata = { 




	.register_dev	= 1,

	.register_dev	= 1,

	.pins[0]	= 2,

	.pins[0]	= 2,



	.transceiver_power = innovator_omap_ohci_transceiver_power,

};

};





static const struct omap_lcd_config innovator1510_lcd_config __initconst = {

static const struct omap_lcd_config innovator1510_lcd_config __initconst = {

drivers/usb/host/ohci-omap.c

+5 −26
Original line number Original line Diff line number Diff line
@@ -67,31 +67,6 @@ static void omap_ohci_clock_power(struct ohci_omap_priv *priv, int on) 
	}

	}

}

}





/*

 * Board specific gang-switched transceiver power on/off.

 * NOTE:  OSK supplies power from DC, not battery.

 */

static int omap_ohci_transceiver_power(struct ohci_omap_priv *priv, int on)

{

	if (on) {

		if (machine_is_omap_innovator() && cpu_is_omap1510())

			__raw_writeb(__raw_readb(INNOVATOR_FPGA_CAM_USB_CONTROL)

				| ((1 << 5/*usb1*/) | (1 << 3/*usb2*/)),

			       INNOVATOR_FPGA_CAM_USB_CONTROL);

		else if (priv->power)

			gpiod_set_value_cansleep(priv->power, 0);

	} else {

		if (machine_is_omap_innovator() && cpu_is_omap1510())

			__raw_writeb(__raw_readb(INNOVATOR_FPGA_CAM_USB_CONTROL)

				& ~((1 << 5/*usb1*/) | (1 << 3/*usb2*/)),

			       INNOVATOR_FPGA_CAM_USB_CONTROL);

		else if (priv->power)

			gpiod_set_value_cansleep(priv->power, 1);

	}



	return 0;

}



#ifdef	CONFIG_USB_OTG

#ifdef	CONFIG_USB_OTG





static void start_hnp(struct ohci_hcd *ohci)

static void start_hnp(struct ohci_hcd *ohci)
@@ -202,7 +177,11 @@ static int ohci_omap_reset(struct usb_hcd *hcd) 
	}

	}





	/* FIXME hub_wq hub requests should manage power switching */

	/* FIXME hub_wq hub requests should manage power switching */

	omap_ohci_transceiver_power(priv, 1);

	if (config->transceiver_power)

		return config->transceiver_power(1);



	if (priv->power)

		gpiod_set_value_cansleep(priv->power, 0);





	/* board init will have already handled HMC and mux setup.

	/* board init will have already handled HMC and mux setup.

	 * any external transceiver should already be initialized

	 * any external transceiver should already be initialized

include/linux/platform_data/usb-omap1.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -50,6 +50,8 @@ struct omap_usb_config { 
	int (*ocpi_enable)(void);

	int (*ocpi_enable)(void);





	void (*lb_reset)(void);

	void (*lb_reset)(void);



	int (*transceiver_power)(int on);

};

};





#endif /* __LINUX_USB_OMAP1_H */
 
#endif /* __LINUX_USB_OMAP1_H */