ARM: tegra: Update ventana boardfiles for k39

Rebase-Id: Rc1fbe4548e4482dab61877b36a6a7921a8602b57

4 files changed, 5 insertions, 30 deletions

diff --git a/arch/arm/mach-tegra/board-ventana-power.c b/arch/arm/mach-tegra/board-ventana-power.c
index d98266cfce97..1376b1019ff9 100644
--- a/arch/arm/mach-tegra/board-ventana-power.c
+++ b/arch/arm/mach-tegra/board-ventana-power.c
@@ -22,7 +22,6 @@
 #include <linux/regulator/machine.h>
 #include <linux/mfd/tps6586x.h>
 #include <linux/gpio.h>
-#include <mach/suspend.h>
 #include <linux/io.h>
 
 #include <mach/iomap.h>
@@ -32,7 +31,7 @@
 
 #include "gpio-names.h"
 #include "fuse.h"
-#include "power.h"
+#include "pm.h"
 #include "wakeups-t2.h"
 #include "board.h"
 #include "board-ventana.h"
@@ -212,13 +211,8 @@ static struct tegra_suspend_platform_data ventana_suspend_data = {
 	.suspend_mode	= TEGRA_SUSPEND_LP0,
 	.core_timer	= 0x7e7e,
 	.core_off_timer = 0xf,
-	.separate_req	= true,
 	.corereq_high	= false,
 	.sysclkreq_high	= true,
-	.wake_enb	= TEGRA_WAKE_GPIO_PV2,
-	.wake_high	= 0,
-	.wake_low	= TEGRA_WAKE_GPIO_PV2,
-	.wake_any	= 0,
 };
 
 int __init ventana_regulator_init(void)
diff --git a/arch/arm/mach-tegra/board-ventana-sdhci.c b/arch/arm/mach-tegra/board-ventana-sdhci.c
index 13ab48b1c7a1..0396b70935e9 100644
--- a/arch/arm/mach-tegra/board-ventana-sdhci.c
+++ b/arch/arm/mach-tegra/board-ventana-sdhci.c
@@ -67,24 +67,18 @@ static struct resource sdhci_resource3[] = {
 };
 
 static struct tegra_sdhci_platform_data tegra_sdhci_platform_data0 = {
-	.clk_id = NULL,
-	.force_hs = 1,
 	.cd_gpio = -1,
 	.wp_gpio = -1,
 	.power_gpio = -1,
 };
 
 static struct tegra_sdhci_platform_data tegra_sdhci_platform_data2 = {
-	.clk_id = NULL,
-	.force_hs = 1,
 	.cd_gpio = TEGRA_GPIO_PI5,
 	.wp_gpio = TEGRA_GPIO_PH1,
 	.power_gpio = TEGRA_GPIO_PT3,
 };
 
 static struct tegra_sdhci_platform_data tegra_sdhci_platform_data3 = {
-	.clk_id = NULL,
-	.force_hs = 0,
 	.cd_gpio = -1,
 	.wp_gpio = -1,
 	.power_gpio = TEGRA_GPIO_PI6,
@@ -122,20 +116,11 @@ static struct platform_device tegra_sdhci_device3 = {
 
 int __init ventana_sdhci_init(void)
 {
-	gpio_request(tegra_sdhci_platform_data2.power_gpio, "sdhci2_power");
-	gpio_request(tegra_sdhci_platform_data2.cd_gpio, "sdhci2_cd");
-	gpio_request(tegra_sdhci_platform_data2.wp_gpio, "sdhci2_wp");
-	gpio_request(tegra_sdhci_platform_data3.power_gpio, "sdhci3_power");
-
 	tegra_gpio_enable(tegra_sdhci_platform_data2.power_gpio);
 	tegra_gpio_enable(tegra_sdhci_platform_data2.cd_gpio);
 	tegra_gpio_enable(tegra_sdhci_platform_data2.wp_gpio);
 	tegra_gpio_enable(tegra_sdhci_platform_data3.power_gpio);
 
-	gpio_direction_output(tegra_sdhci_platform_data2.power_gpio, 1);
-	gpio_direction_output(tegra_sdhci_platform_data3.power_gpio, 1);
-	gpio_set_value(tegra_sdhci_platform_data3.power_gpio, 1);
-
 	platform_device_register(&tegra_sdhci_device3);
 	platform_device_register(&tegra_sdhci_device2);
 	platform_device_register(&tegra_sdhci_device0);
diff --git a/arch/arm/mach-tegra/board-ventana-sensors.c b/arch/arm/mach-tegra/board-ventana-sensors.c
index 7842a5c0a74c..69567273b6f7 100644
--- a/arch/arm/mach-tegra/board-ventana-sensors.c
+++ b/arch/arm/mach-tegra/board-ventana-sensors.c
@@ -33,7 +33,6 @@
 
 #include <linux/delay.h>
 #include <linux/i2c.h>
-#include <linux/akm8975.h>
 #include <linux/mpu.h>
 #include <linux/i2c/pca954x.h>
 #include <linux/i2c/pca953x.h>
diff --git a/arch/arm/mach-tegra/board-ventana.c b/arch/arm/mach-tegra/board-ventana.c
index 681fc44e89ed..042636a35022 100644
--- a/arch/arm/mach-tegra/board-ventana.c
+++ b/arch/arm/mach-tegra/board-ventana.c
@@ -275,7 +275,7 @@ static struct platform_device tegra_camera = {
 static struct platform_device *ventana_devices[] __initdata = {
 	&tegra_uartb_device,
 	&tegra_uartc_device,
-	&pmu_device,
+	&tegra_pmu_device,
 	&tegra_udc_device,
 	&tegra_ehci2_device,
 	&tegra_gart_device,
@@ -439,8 +439,6 @@ static void ventana_usb_init(void)
 
 static void __init tegra_ventana_init(void)
 {
-	tegra_common_init();
-
 	tegra_clk_init_from_table(ventana_clk_init_table);
 	ventana_pinmux_init();
 	ventana_i2c_init();
@@ -489,11 +487,10 @@ void __init tegra_ventana_reserve(void)
 
 MACHINE_START(VENTANA, "ventana")
 	.boot_params    = 0x00000100,
-	.phys_io        = IO_APB_PHYS,
-	.io_pg_offst    = ((IO_APB_VIRT) >> 18) & 0xfffc,
-	.init_irq       = tegra_init_irq,
-	.init_machine   = tegra_ventana_init,
 	.map_io         = tegra_map_common_io,
 	.reserve        = tegra_ventana_reserve,
+	.init_early	= tegra_init_early,
+	.init_irq	= tegra_init_irq,
 	.timer          = &tegra_timer,
+	.init_machine	= tegra_ventana_init,
 MACHINE_END