ARM: tegra: Update aruba boardfiles for k39

Rebase-Id: Ra41c8b224481178448d9231ce736b86f3b074865

4 files changed, 10 insertions, 23 deletions

diff --git a/arch/arm/mach-tegra/board-aruba-power.c b/arch/arm/mach-tegra/board-aruba-power.c
index f8c7c9602698..4ffe2fca9c81 100644
--- a/arch/arm/mach-tegra/board-aruba-power.c
+++ b/arch/arm/mach-tegra/board-aruba-power.c
@@ -19,13 +19,12 @@
 #include <linux/pda_power.h>
 #include <linux/platform_device.h>
 #include <linux/resource.h>
-#include <mach/suspend.h>
 #include <linux/io.h>
 
 #include <mach/iomap.h>
 #include <mach/irqs.h>
 
-#include "power.h"
+#include "pm.h"
 #include "board.h"
 #include "wakeups-t3.h"
 
@@ -60,13 +59,8 @@ static struct tegra_suspend_platform_data aruba_suspend_data = {
 	.suspend_mode	= TEGRA_SUSPEND_NONE,
 	.core_timer	= 0x7e7e,
 	.core_off_timer = 0,
-	.separate_req	= true,
 	.corereq_high	= false,
 	.sysclkreq_high	= true,
-	.wake_enb	= 0,
-	.wake_high	= 0,
-	.wake_low	= 0,
-	.wake_any	= 0,
 };
 
 int __init aruba_regulator_init(void)
diff --git a/arch/arm/mach-tegra/board-aruba-sdhci.c b/arch/arm/mach-tegra/board-aruba-sdhci.c
index f6d00ebad978..26b04a9021e1 100644
--- a/arch/arm/mach-tegra/board-aruba-sdhci.c
+++ b/arch/arm/mach-tegra/board-aruba-sdhci.c
@@ -103,8 +103,6 @@ static struct resource sdhci_resource3[] = {
 
 
 static struct tegra_sdhci_platform_data tegra_sdhci_platform_data0 = {
-	.clk_id = NULL,
-	.force_hs = 0,
 #if ARUBA_WIFI  /* !!!FIXME!!! NOT SUPPORTED YET */
 	.register_status_notify	= aruba_wifi_status_register,
 	.cccr   = {
@@ -123,25 +121,21 @@ static struct tegra_sdhci_platform_data tegra_sdhci_platform_data0 = {
 	.cd_gpio = -1,
 	.wp_gpio = -1,
 	.power_gpio = -1,
-	.max_clk = 12000000,
+/*	.max_clk = 12000000, */
 };
 
 static struct tegra_sdhci_platform_data tegra_sdhci_platform_data2 = {
-	.clk_id = NULL,
-	.force_hs = 1,
 	.cd_gpio = -1,
 	.wp_gpio = -1,
 	.power_gpio = -1,
-	.max_clk = 12000000,
+/*	.max_clk = 12000000, */
 };
 
 static struct tegra_sdhci_platform_data tegra_sdhci_platform_data3 = {
-	.clk_id = NULL,
-	.force_hs = 0,
 	.cd_gpio = -1,
 	.wp_gpio = -1,
 	.power_gpio = -1,
-	.max_clk = 12000000,
+/*	.max_clk = 12000000, */
 };
 
 static struct platform_device tegra_sdhci_device0 = {
diff --git a/arch/arm/mach-tegra/board-aruba-sensors.c b/arch/arm/mach-tegra/board-aruba-sensors.c
index 7537d9ae688b..f5ba3d761634 100644
--- a/arch/arm/mach-tegra/board-aruba-sensors.c
+++ b/arch/arm/mach-tegra/board-aruba-sensors.c
@@ -33,7 +33,6 @@
 
 #include <linux/i2c.h>
 #include <mach/gpio.h>
-#include <linux/akm8975.h>
 
 #include "gpio-names.h"
 
diff --git a/arch/arm/mach-tegra/board-aruba.c b/arch/arm/mach-tegra/board-aruba.c
index 7223fd04e1b8..62da1f234d2d 100644
--- a/arch/arm/mach-tegra/board-aruba.c
+++ b/arch/arm/mach-tegra/board-aruba.c
@@ -230,11 +230,13 @@ static struct tegra_audio_platform_data tegra_audio_pdata[] = {
 	}
 };
 
+#if 0
 struct tegra_wired_jack_conf audio_wr_jack_conf = {
 	.hp_det_n = TEGRA_GPIO_PW2,
 	.en_mic_ext = TEGRA_GPIO_PX1,
 	.en_mic_int = TEGRA_GPIO_PX0,
 };
+#endif
 
 static void aruba_i2c_init(void)
 {
@@ -386,7 +388,7 @@ static struct platform_device *aruba_devices[] __initdata = {
 	&tegra_uartc_device,
 	&tegra_uartd_device,
 	&tegra_uarte_device,
-	&pmu_device,
+	&tegra_pmu_device,
 	&tegra_rtc_device,
 	&tegra_udc_device,
 #if defined(CONFIG_TEGRA_IOVMM_SMMU)
@@ -499,7 +501,6 @@ static void aruba_sata_init(void) { }
 
 static void __init tegra_aruba_init(void)
 {
-	tegra_common_init();
 	tegra_clk_init_from_table(aruba_clk_init_table);
 	aruba_pinmux_init();
 
@@ -529,11 +530,10 @@ static void __init tegra_aruba_reserve(void)
 
 MACHINE_START(ARUBA, "aruba")
 	.boot_params    = 0x80000100,
-	.phys_io        = IO_APB_PHYS,
-	.io_pg_offst    = ((IO_APB_VIRT) >> 18) & 0xfffc,
-	.init_irq       = tegra_init_irq,
-	.init_machine   = tegra_aruba_init,
 	.map_io         = tegra_map_common_io,
 	.reserve        = tegra_aruba_reserve,
+	.init_early	= tegra_init_early,
+	.init_irq       = tegra_init_irq,
 	.timer          = &tegra_timer,
+	.init_machine   = tegra_aruba_init,
 MACHINE_END