aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-tegra/board-trimslice.c
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2011-07-10 17:59:45 -0400
committerColin Cross <ccross@android.com>2011-07-12 23:39:40 -0400
commit681e6edc25a452e26e263386caaa4afb02b5f131 (patch)
tree1937aaf7057031bda8d03608314e422aa818fd0f /arch/arm/mach-tegra/board-trimslice.c
parent78702e43c1cadd600e35374411caba82ad9354b6 (diff)
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.c19
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 @@
24#include <linux/serial_8250.h> 24#include <linux/serial_8250.h>
25#include <linux/io.h> 25#include <linux/io.h>
26#include <linux/i2c.h> 26#include <linux/i2c.h>
27#include <linux/platform_data/tegra_usb.h>
28#include <linux/gpio.h> 27#include <linux/gpio.h>
29 28
30#include <asm/mach-types.h> 29#include <asm/mach-types.h>
@@ -33,7 +32,6 @@
33 32
34#include <mach/iomap.h> 33#include <mach/iomap.h>
35#include <mach/sdhci.h> 34#include <mach/sdhci.h>
36#include <mach/usb_phy.h>
37#include <mach/gpio.h> 35#include <mach/gpio.h>
38 36
39#include "board.h" 37#include "board.h"
@@ -110,28 +108,12 @@ static void trimslice_i2c_init(void)
110 ARRAY_SIZE(trimslice_i2c3_board_info)); 108 ARRAY_SIZE(trimslice_i2c3_board_info));
111} 109}
112 110
113struct tegra_ulpi_config ehci2_phy_config = {
114 .reset_gpio = TRIMSLICE_GPIO_USB2_RST,
115 .clk = "cdev2",
116};
117
118static struct tegra_ehci_platform_data ehci_ulpi_data = {
119 .operating_mode = TEGRA_USB_HOST,
120 .phy_config = &ehci2_phy_config,
121};
122
123static struct tegra_ehci_platform_data ehci_utmi_data = {
124 .operating_mode = TEGRA_USB_HOST,
125};
126
127static void trimslice_usb_init(void) 111static void trimslice_usb_init(void)
128{ 112{
129 int err; 113 int err;
130 114
131 tegra_ehci3_device.dev.platform_data = &ehci_utmi_data;
132 platform_device_register(&tegra_ehci3_device); 115 platform_device_register(&tegra_ehci3_device);
133 116
134 tegra_ehci2_device.dev.platform_data = &ehci_ulpi_data;
135 platform_device_register(&tegra_ehci2_device); 117 platform_device_register(&tegra_ehci2_device);
136 118
137 err = gpio_request_one(TRIMSLICE_GPIO_USB1_MODE, GPIOF_OUT_INIT_HIGH, 119 err = gpio_request_one(TRIMSLICE_GPIO_USB1_MODE, GPIOF_OUT_INIT_HIGH,
@@ -141,7 +123,6 @@ static void trimslice_usb_init(void)
141 return; 123 return;
142 } 124 }
143 125
144 tegra_ehci1_device.dev.platform_data = &ehci_utmi_data;
145 platform_device_register(&tegra_ehci1_device); 126 platform_device_register(&tegra_ehci1_device);
146} 127}
147 128