Commit 11e00292 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

usb: omap: avoid mach/*.h headers 



The omap usb drivers still rely on mach/*.h headers that
are explicitly or implicitly included, but all the required
definitions are now in include/linux/soc/ti/, so use those
instead and allow compile-testing on other architectures.

Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
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 804f7f19

drivers/usb/gadget/udc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ config USB_GR_UDC 


config USB_OMAP

	tristate "OMAP USB Device Controller"

	depends on ARCH_OMAP1

	depends on ARCH_OMAP1 || (ARCH_OMAP && COMPILE_TEST)

	depends on ISP1301_OMAP || !(MACH_OMAP_H2 || MACH_OMAP_H3)

	help

	   Many Texas Instruments OMAP processors have flexible full

drivers/usb/gadget/udc/omap_udc.c

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ 
#include <linux/platform_data/usb-omap1.h>



#include <linux/soc/ti/omap1-usb.h>

#include <linux/soc/ti/omap1-soc.h>

#include <linux/soc/ti/omap1-io.h>



#include "omap_udc.h"

drivers/usb/host/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ config USB_EHCI_HCD_NPCM7XX 


config USB_EHCI_HCD_OMAP

	tristate "EHCI support for OMAP3 and later chips"

	depends on ARCH_OMAP

	depends on ARCH_OMAP || COMPILE_TEST

	depends on NOP_USB_XCEIV

	default y

	help

drivers/usb/host/ohci-omap.c

+3 −4
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ 
#include <linux/platform_device.h>

#include <linux/platform_data/usb-omap1.h>

#include <linux/soc/ti/omap1-usb.h>

#include <linux/soc/ti/omap1-mux.h>

#include <linux/soc/ti/omap1-soc.h>

#include <linux/soc/ti/omap1-io.h>

#include <linux/signal.h>

#include <linux/usb.h>

#include <linux/usb/hcd.h>
@@ -36,10 +39,6 @@ 
#include <asm/io.h>

#include <asm/mach-types.h>



#include <mach/mux.h>



#include <mach/hardware.h>



#define DRIVER_DESC "OHCI OMAP driver"



struct ohci_omap_priv {

drivers/usb/phy/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ config FSL_USB2_OTG 


config ISP1301_OMAP

	tristate "Philips ISP1301 with OMAP OTG"

	depends on I2C && ARCH_OMAP_OTG

	depends on I2C

	depends on ARCH_OMAP_OTG || (ARM && COMPILE_TEST)

	depends on USB

	depends on USB_GADGET || !USB_GADGET # if USB_GADGET=m, this can't be 'y'

	select USB_PHY