Merge branch 'at91/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[pandora-kernel.git] / arch / arm / mach-tegra / board-trimslice.c

diff --git a/arch/arm/mach-tegra/board-trimslice.c b/arch/arm/mach-tegra/board-trimslice.c
index a8fff42..89a6d2a 100644 (file)
--- a/arch/arm/mach-tegra/board-trimslice.c
+++ b/arch/arm/mach-tegra/board-trimslice.c
@@ -24,8 +24,6 @@
 #include <linux/serial_8250.h>
 #include <linux/io.h>
 #include <linux/i2c.h>
-#include <linux/i2c-tegra.h>
-#include <linux/platform_data/tegra_usb.h>
 #include <linux/gpio.h>
 
 #include <asm/mach-types.h>
@@ -34,7 +32,6 @@
 
 #include <mach/iomap.h>
 #include <mach/sdhci.h>
-#include <mach/usb_phy.h>
 #include <mach/gpio.h>
 
 #include "board.h"
@@ -92,18 +89,6 @@ static struct platform_device *trimslice_devices[] __initdata = {
        &trimslice_audio_device,
 };
 
-static struct tegra_i2c_platform_data trimslice_i2c1_platform_data = {
-       .bus_clk_rate   = 400000,
-};
-
-static struct tegra_i2c_platform_data trimslice_i2c2_platform_data = {
-       .bus_clk_rate   = 400000,
-};
-
-static struct tegra_i2c_platform_data trimslice_i2c3_platform_data = {
-       .bus_clk_rate   = 400000,
-};
-
 static struct i2c_board_info trimslice_i2c3_board_info[] = {
        {
                I2C_BOARD_INFO("tlv320aic23", 0x1a),
@@ -115,10 +100,6 @@ static struct i2c_board_info trimslice_i2c3_board_info[] = {
 
 static void trimslice_i2c_init(void)
 {
-       tegra_i2c_device1.dev.platform_data = &trimslice_i2c1_platform_data;
-       tegra_i2c_device2.dev.platform_data = &trimslice_i2c2_platform_data;
-       tegra_i2c_device3.dev.platform_data = &trimslice_i2c3_platform_data;
-
        platform_device_register(&tegra_i2c_device1);
        platform_device_register(&tegra_i2c_device2);
        platform_device_register(&tegra_i2c_device3);
@@ -127,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,
@@ -158,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);
 }