ARM: tegra: Whistler K39 updates
Dan Willemsen [Thu, 23 Jun 2011 23:45:48 +0000 (16:45 -0700)]
Rebase-Id: Ra87c1d4245a0ce31e3fe7529f06ca18fbe703706

arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/board-whistler-power.c
arch/arm/mach-tegra/board-whistler-sdhci.c
arch/arm/mach-tegra/board-whistler.c

index b292e45..da2eadd 100644 (file)
@@ -107,7 +107,7 @@ obj-${CONFIG_MACH_WHISTLER}             += board-whistler-sdhci.o
 obj-${CONFIG_MACH_WHISTLER}             += board-whistler-power.o
 obj-${CONFIG_MACH_WHISTLER}             += board-whistler-panel.o
 obj-${CONFIG_MACH_WHISTLER}             += board-whistler-sensors.o
-obj-${CONFIG_MACH_WHISTLER}             += board-whistler-kbc.o
+#obj-${CONFIG_MACH_WHISTLER}             += board-whistler-kbc.o
 obj-${CONFIG_MACH_WHISTLER}             += board-whistler-baseband.o
 obj-${CONFIG_MACH_WHISTLER}             += board-whistler-memory.o
 
index bbfd4f5..3c89852 100644 (file)
@@ -23,7 +23,6 @@
 #include <linux/mfd/max8907c.h>
 #include <linux/regulator/max8907c-regulator.h>
 #include <linux/gpio.h>
-#include <mach/suspend.h>
 #include <linux/io.h>
 
 #include <mach/iomap.h>
@@ -31,7 +30,7 @@
 
 #include "gpio-names.h"
 #include "fuse.h"
-#include "power.h"
+#include "pm.h"
 #include "wakeups-t2.h"
 #include "board.h"
 
@@ -247,10 +246,6 @@ static struct tegra_suspend_platform_data whistler_suspend_data = {
        .separate_req   = false,
        .corereq_high   = true,
        .sysclkreq_high = true,
-       .wake_enb       = TEGRA_WAKE_KBC_EVENT,
-       .wake_high      = 0,
-       .wake_low       = 0,
-       .wake_any       = TEGRA_WAKE_KBC_EVENT,
 };
 
 int __init whistler_regulator_init(void)
index 8933864..b5f64a9 100644 (file)
@@ -67,24 +67,18 @@ 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,
 };
 
 static struct tegra_sdhci_platform_data tegra_sdhci_platform_data2 = {
-       .clk_id = NULL,
-       .force_hs = 0,
        .cd_gpio = WHISTLER_EXT_SDCARD_DETECT,
        .wp_gpio = -1,
        .power_gpio = -1,
 };
 
 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,
@@ -124,15 +118,7 @@ int __init whistler_sdhci_init(void)
 {
        int ret;
 
-       ret = gpio_request(WHISTLER_EXT_SDCARD_DETECT, "card_detect");
-       if (ret < 0) {
-               tegra_sdhci_platform_data2.cd_gpio = -1;
-               pr_err("card_detect gpio not found\n");
-       }
-       else {
-               tegra_gpio_enable(WHISTLER_EXT_SDCARD_DETECT);
-               gpio_direction_input(WHISTLER_EXT_SDCARD_DETECT);
-       }
+       tegra_gpio_enable(WHISTLER_EXT_SDCARD_DETECT);
 
        platform_device_register(&tegra_sdhci_device3);
        platform_device_register(&tegra_sdhci_device2);
index 5f6ec0f..45b980f 100644 (file)
@@ -229,7 +229,7 @@ static struct platform_device tegra_camera = {
 static struct platform_device *whistler_devices[] __initdata = {
        &tegra_uartb_device,
        &tegra_uartc_device,
-       &pmu_device,
+       &tegra_pmu_device,
        &tegra_udc_device,
        &tegra_gart_device,
        &tegra_wdt_device,
@@ -371,7 +371,6 @@ static void __init tegra_whistler_init(void)
 {
        char serial[20];
 
-       tegra_common_init();
        tegra_clk_init_from_table(whistler_clk_init_table);
        whistler_pinmux_init();
        whistler_i2c_init();
@@ -411,11 +410,10 @@ void __init tegra_whistler_reserve(void)
 
 MACHINE_START(WHISTLER, "whistler")
        .boot_params    = 0x00000100,
-       .phys_io        = IO_APB_PHYS,
-       .io_pg_offst    = ((IO_APB_VIRT) >> 18) & 0xfffc,
-       .init_irq       = tegra_init_irq,
-       .init_machine   = tegra_whistler_init,
        .map_io         = tegra_map_common_io,
        .reserve        = tegra_whistler_reserve,
+       .init_early     = tegra_init_early,
+       .init_irq       = tegra_init_irq,
        .timer          = &tegra_timer,
+       .init_machine   = tegra_whistler_init,
 MACHINE_END