ARM: tegra: Update cardhu boardfiles for K39
Dan Willemsen [Mon, 13 Jun 2011 22:35:15 +0000 (15:35 -0700)]
Rebase-Id: R53c264de0e30d06937fd88d97b9709b35c069f6d

arch/arm/mach-tegra/board-cardhu-power.c
arch/arm/mach-tegra/board-cardhu-sdhci.c
arch/arm/mach-tegra/board-cardhu.c

index 75f79c4..db75804 100644 (file)
@@ -24,7 +24,6 @@
 #include <linux/regulator/machine.h>
 #include <linux/mfd/tps6591x.h>
 #include <linux/gpio.h>
-#include <mach/suspend.h>
 #include <linux/io.h>
 #include <linux/regulator/gpio-switch-regulator.h>
 #include <linux/regulator/tps6591x-regulator.h>
@@ -38,7 +37,7 @@
 #include "gpio-names.h"
 #include "board.h"
 #include "board-cardhu.h"
-#include "power.h"
+#include "pm.h"
 #include "wakeups-t3.h"
 
 #define PMC_CTRL               0x0
@@ -952,13 +951,8 @@ static struct tegra_suspend_platform_data cardhu_suspend_data = {
        .suspend_mode   = TEGRA_SUSPEND_LP1,
        .core_timer     = 0x7e7e,
        .core_off_timer = 0,
-       .separate_req   = true,
        .corereq_high   = false,
        .sysclkreq_high = true,
-       .wake_enb       = TEGRA_WAKE_GPIO_PV0 | TEGRA_WAKE_PWR_INT | TEGRA_WAKE_RTC_ALARM,
-       .wake_high      = TEGRA_WAKE_RTC_ALARM,
-       .wake_low       = TEGRA_WAKE_GPIO_PV0 | TEGRA_WAKE_PWR_INT,
-       .wake_any       = 0,
        .cpu_lp2_min_residency = 2000,
 };
 
index a89f60f..b732209 100644 (file)
@@ -76,8 +76,6 @@ static struct resource sdhci_resource3[] = {
 
 
 static struct tegra_sdhci_platform_data tegra_sdhci_platform_data0 = {
-       .clk_id = NULL,
-       .force_hs = 0,
        .cd_gpio = -1,
        .wp_gpio = -1,
        .power_gpio = -1,
@@ -92,8 +90,6 @@ static struct tegra_sdhci_platform_data tegra_sdhci_platform_data0 = {
 };
 
 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,
@@ -108,8 +104,6 @@ static struct tegra_sdhci_platform_data tegra_sdhci_platform_data2 = {
 };
 
 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,
index 367e64e..d1d2037 100644 (file)
@@ -470,7 +470,6 @@ static void cardhu_sata_init(void) { }
 
 static void __init tegra_cardhu_init(void)
 {
-       tegra_common_init();
        tegra_clk_init_from_table(cardhu_clk_init_table);
        cardhu_pinmux_init();
        cardhu_i2c_init();
@@ -513,11 +512,10 @@ static void __init tegra_cardhu_reserve(void)
 
 MACHINE_START(CARDHU, "cardhu")
        .boot_params    = 0x80000100,
-       .phys_io        = IO_APB_PHYS,
-       .io_pg_offst    = ((IO_APB_VIRT) >> 18) & 0xfffc,
-       .init_irq       = tegra_init_irq,
-       .init_machine   = tegra_cardhu_init,
        .map_io         = tegra_map_common_io,
        .reserve        = tegra_cardhu_reserve,
+       .init_early     = tegra_init_early,
+       .init_irq       = tegra_init_irq,
        .timer          = &tegra_timer,
+       .init_machine   = tegra_cardhu_init,
 MACHINE_END