diff options
| author | Colin Cross <ccross@android.com> | 2011-07-10 23:59:45 +0200 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-07-13 05:39:40 +0200 |
| commit | 681e6edc25a452e26e263386caaa4afb02b5f131 (patch) | |
| tree | 1937aaf7057031bda8d03608314e422aa818fd0f /arch/arm/mach-tegra/board-trimslice.c | |
| parent | ARM: tegra: remove copy-and-pasted i2c platform data in boards (diff) | |
| download | linux-681e6edc25a452e26e263386caaa4afb02b5f131.tar.xz linux-681e6edc25a452e26e263386caaa4afb02b5f131.zip | |
ARM: tegra: remove copy-and-pasted usb platform data from boards
trimslice and paz00 both have functionally identical platform
data for the tegra-ehci driver. Move the platform data into
devices.c, and remove it from all the board files.
Signed-off-by: Colin Cross <ccross@android.com>
Tested-by: Konstantin Sinyuk <kostyas@compulab.co.il>
Acked-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-tegra/board-trimslice.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-trimslice.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/arm/mach-tegra/board-trimslice.c b/arch/arm/mach-tegra/board-trimslice.c index e1d7e67ca85c..89a6d2adc1de 100644 --- a/arch/arm/mach-tegra/board-trimslice.c +++ b/arch/arm/mach-tegra/board-trimslice.c @@ -24,7 +24,6 @@ #include <linux/serial_8250.h> #include <linux/io.h> #include <linux/i2c.h> -#include <linux/platform_data/tegra_usb.h> #include <linux/gpio.h> #include <asm/mach-types.h> @@ -33,7 +32,6 @@ #include <mach/iomap.h> #include <mach/sdhci.h> -#include <mach/usb_phy.h> #include <mach/gpio.h> #include "board.h" @@ -110,28 +108,12 @@ static void trimslice_i2c_init(void) ARRAY_SIZE(trimslice_i2c3_board_info)); } -struct tegra_ulpi_config ehci2_phy_config = { - .reset_gpio = TRIMSLICE_GPIO_USB2_RST, - .clk = "cdev2", -}; - -static struct tegra_ehci_platform_data ehci_ulpi_data = { - .operating_mode = TEGRA_USB_HOST, - .phy_config = &ehci2_phy_config, -}; - -static struct tegra_ehci_platform_data ehci_utmi_data = { - .operating_mode = TEGRA_USB_HOST, -}; - static void trimslice_usb_init(void) { int err; - tegra_ehci3_device.dev.platform_data = &ehci_utmi_data; platform_device_register(&tegra_ehci3_device); - tegra_ehci2_device.dev.platform_data = &ehci_ulpi_data; platform_device_register(&tegra_ehci2_device); err = gpio_request_one(TRIMSLICE_GPIO_USB1_MODE, GPIOF_OUT_INIT_HIGH, @@ -141,7 +123,6 @@ static void trimslice_usb_init(void) return; } - tegra_ehci1_device.dev.platform_data = &ehci_utmi_data; platform_device_register(&tegra_ehci1_device); } |