ARM: tegra: integration of slave mode support.
[linux-2.6.git] / arch / arm / mach-tegra / board-whistler.c
index 51e94a8..57bb8d6 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * arch/arm/mach-tegra/board-whistler.c
  *
- * Copyright (c) 2010 - 2011, NVIDIA Corporation.
+ * Copyright (c) 2010-2012 NVIDIA Corporation.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 #include <linux/clk.h>
 #include <linux/serial_8250.h>
 #include <linux/i2c.h>
-#include <linux/i2c/panjit_ts.h>
+#include <linux/synaptics_i2c_rmi.h>
 #include <linux/dma-mapping.h>
 #include <linux/delay.h>
 #include <linux/i2c-tegra.h>
 #include <linux/mfd/max8907c.h>
 #include <linux/memblock.h>
 #include <linux/tegra_uart.h>
+#include <linux/rfkill-gpio.h>
 
 #include <mach/clk.h>
 #include <mach/iomap.h>
 #include <mach/irqs.h>
 #include <mach/pinmux.h>
+#include <mach/pinmux-tegra20.h>
 #include <mach/iomap.h>
 #include <mach/io.h>
 #include <mach/i2s.h>
-#include <mach/tegra_wm8753_pdata.h>
+#include <mach/tegra_asoc_pdata.h>
+#include <mach/gpio-tegra.h>
 
+#include <sound/tlv320aic326x.h>
+
+#include <asm/hardware/gic.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
+#include <asm/hardware/gic.h>
+
 #include <mach/usb_phy.h>
 
 #include "board.h"
 #include "fuse.h"
 #include "pm.h"
 #include "board-whistler-baseband.h"
+#include "common.h"
 
-static struct plat_serial8250_port debug_uart_platform_data[] = {
-       {
-               .membase        = IO_ADDRESS(TEGRA_UARTA_BASE),
-               .mapbase        = TEGRA_UARTA_BASE,
-               .irq            = INT_UARTA,
-               .flags          = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE,
-               .type           = PORT_TEGRA,
-               .iotype         = UPIO_MEM,
-               .regshift       = 2,
-               .uartclk        = 216000000,
-       }, {
-               .flags          = 0,
-       }
-};
+#define SZ_3M (SZ_1M + SZ_2M)
+#define SZ_152M (SZ_128M + SZ_16M + SZ_8M)
+#define USB1_VBUS_GPIO TCA6416_GPIO_BASE
 
-static struct platform_device debug_uart = {
-       .name = "serial8250",
-       .id = PLAT8250_DEV_PLATFORM,
-       .dev = {
-               .platform_data = debug_uart_platform_data,
-       },
-};
 static struct platform_device *whistler_uart_devices[] __initdata = {
        &tegra_uarta_device,
        &tegra_uartb_device,
@@ -101,30 +92,60 @@ static void __init uart_debug_init(void)
        unsigned long rate;
        struct clk *debug_uart_clk;
        struct clk *c;
-
-       /* UARTA is the debug port. */
-       pr_info("Selecting UARTA as the debug console\n");
-       whistler_uart_devices[0] = &debug_uart;
-       debug_uart_port_base = ((struct plat_serial8250_port *)(
-                               debug_uarta_device.dev.platform_data))->mapbase;
-       debug_uart_clk = clk_get_sys("serial8250.0", "uarta");
-
-       /* Clock enable for the debug channel */
-       if (!IS_ERR_OR_NULL(debug_uart_clk)) {
-               rate = debug_uart_platform_data[0].uartclk;
-               pr_info("The debug console clock name is %s\n",
+       int modem_id = tegra_get_modem_id();
+
+       if (modem_id == 0x1) {
+               /* UARTB is the debug port. */
+               pr_info("Selecting UARTB as the debug console\n");
+               whistler_uart_devices[1] = &debug_uartb_device;
+               debug_uart_port_base = ((struct plat_serial8250_port *)(
+                       debug_uartb_device.dev.platform_data))->mapbase;
+               debug_uart_clk = clk_get_sys("serial8250.0", "uartb");
+
+               /* Clock enable for the debug channel */
+               if (!IS_ERR_OR_NULL(debug_uart_clk)) {
+                       rate = ((struct plat_serial8250_port *)(
+                       debug_uartb_device.dev.platform_data))->uartclk;
+                       pr_info("The debug console clock name is %s\n",
+                                               debug_uart_clk->name);
+                       c = tegra_get_clock_by_name("pll_p");
+                       if (IS_ERR_OR_NULL(c))
+                               pr_err("Not getting the parent clock pll_p\n");
+                       else
+                               clk_set_parent(debug_uart_clk, c);
+
+                       clk_enable(debug_uart_clk);
+                       clk_set_rate(debug_uart_clk, rate);
+               } else {
+                       pr_err("Not getting the clock %s for debug console\n",
                                                debug_uart_clk->name);
-               c = tegra_get_clock_by_name("pll_p");
-               if (IS_ERR_OR_NULL(c))
-                       pr_err("Not getting the parent clock pll_p\n");
-               else
-                       clk_set_parent(debug_uart_clk, c);
-
-               clk_enable(debug_uart_clk);
-               clk_set_rate(debug_uart_clk, rate);
+               }
        } else {
-               pr_err("Not getting the clock %s for debug console\n",
-                                       debug_uart_clk->name);
+               /* UARTA is the debug port. */
+               pr_info("Selecting UARTA as the debug console\n");
+               whistler_uart_devices[0] = &debug_uarta_device;
+               debug_uart_port_base = ((struct plat_serial8250_port *)(
+                       debug_uarta_device.dev.platform_data))->mapbase;
+               debug_uart_clk = clk_get_sys("serial8250.0", "uarta");
+
+               /* Clock enable for the debug channel */
+               if (!IS_ERR_OR_NULL(debug_uart_clk)) {
+                       rate = ((struct plat_serial8250_port *)(
+                       debug_uarta_device.dev.platform_data))->uartclk;
+                       pr_info("The debug console clock name is %s\n",
+                                               debug_uart_clk->name);
+                       c = tegra_get_clock_by_name("pll_p");
+                       if (IS_ERR_OR_NULL(c))
+                               pr_err("Not getting the parent clock pll_p\n");
+                       else
+                               clk_set_parent(debug_uart_clk, c);
+
+                       clk_enable(debug_uart_clk);
+                       clk_set_rate(debug_uart_clk, rate);
+               } else {
+                       pr_err("Not getting the clock %s for debug console\n",
+                                               debug_uart_clk->name);
+               }
        }
 }
 
@@ -150,67 +171,64 @@ static void __init whistler_uart_init(void)
        tegra_uartb_device.dev.platform_data = &whistler_uart_pdata;
        tegra_uartc_device.dev.platform_data = &whistler_uart_pdata;
 
-       /* Register low speed only if it is selected */
        if (!is_tegra_debug_uartport_hs())
                uart_debug_init();
 
        platform_add_devices(whistler_uart_devices,
                                ARRAY_SIZE(whistler_uart_devices));
 }
-
-#ifdef CONFIG_BCM4329_RFKILL
-
-static struct resource whistler_bcm4329_rfkill_resources[] = {
+static struct rfkill_gpio_platform_data whistler_bt_rfkill_pdata[] = {
        {
-               .name   = "bcm4329_nshutdown_gpio",
-               .start  = TEGRA_GPIO_PU0,
-               .end    = TEGRA_GPIO_PU0,
-               .flags  = IORESOURCE_IO,
+               .name           = "bt_rfkill",
+               .shutdown_gpio  = TEGRA_GPIO_PU0,
+               .reset_gpio     = TEGRA_GPIO_INVALID,
+               .type           = RFKILL_TYPE_BLUETOOTH,
        },
 };
 
-static struct platform_device whistler_bcm4329_rfkill_device = {
-       .name           = "bcm4329_rfkill",
-       .id             = -1,
-       .num_resources  = ARRAY_SIZE(whistler_bcm4329_rfkill_resources),
-       .resource       = whistler_bcm4329_rfkill_resources,
+static struct platform_device whistler_bt_rfkill_device = {
+       .name = "rfkill_gpio",
+       .id   = -1,
+       .dev  = {
+               .platform_data  = whistler_bt_rfkill_pdata,
+       },
 };
 
-static noinline void __init whistler_bt_rfkill(void)
-{
-       platform_device_register(&whistler_bcm4329_rfkill_device);
-       return;
-}
-#else
-static inline void whistler_bt_rfkill(void) { }
-#endif
-
-static struct tegra_utmip_config utmi_phy_config[] = {
+static struct resource whistler_bluesleep_resources[] = {
        [0] = {
-                       .hssync_start_delay = 9,
-                       .idle_wait_delay = 17,
-                       .elastic_limit = 16,
-                       .term_range_adj = 6,
-                       .xcvr_setup = 15,
-                       .xcvr_lsfslew = 2,
-                       .xcvr_lsrslew = 2,
-               },
+               .name = "gpio_host_wake",
+                       .start  = TEGRA_GPIO_PU6,
+                       .end    = TEGRA_GPIO_PU6,
+                       .flags  = IORESOURCE_IO,
+       },
        [1] = {
-                       .hssync_start_delay = 9,
-                       .idle_wait_delay = 17,
-                       .elastic_limit = 16,
-                       .term_range_adj = 6,
-                       .xcvr_setup = 8,
-                       .xcvr_lsfslew = 2,
-                       .xcvr_lsrslew = 2,
-               },
+               .name = "gpio_ext_wake",
+                       .start  = TEGRA_GPIO_PU1,
+                       .end    = TEGRA_GPIO_PU1,
+                       .flags  = IORESOURCE_IO,
+       },
+       [2] = {
+               .name = "host_wake",
+                       .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
+       },
 };
 
-static struct tegra_ulpi_config ulpi_phy_config = {
-       .reset_gpio = TEGRA_GPIO_PG2,
-       .clk = "clk_dev2",
+static struct platform_device whistler_bluesleep_device = {
+       .name           = "bluesleep",
+       .id             = -1,
+       .num_resources  = ARRAY_SIZE(whistler_bluesleep_resources),
+       .resource       = whistler_bluesleep_resources,
 };
 
+static void __init whistler_setup_bluesleep(void)
+{
+       whistler_bluesleep_resources[2].start =
+               whistler_bluesleep_resources[2].end =
+                       gpio_to_irq(TEGRA_GPIO_PU6);
+       platform_device_register(&whistler_bluesleep_device);
+       return;
+}
+
 static __initdata struct tegra_clk_init_table whistler_clk_init_table[] = {
        /* name         parent          rate            enabled */
        { "pwm",        "clk_32k",      32768,          false},
@@ -226,6 +244,10 @@ static struct tegra_i2c_platform_data whistler_i2c1_platform_data = {
        .adapter_nr     = 0,
        .bus_count      = 1,
        .bus_clk_rate   = { 400000, 0 },
+       .scl_gpio               = {TEGRA_GPIO_PC4, 0},
+       .sda_gpio               = {TEGRA_GPIO_PC5, 0},
+       .arb_recovery = arb_lost_recovery,
+       .slave_addr = 0xFC,
 };
 
 static const struct tegra_pingroup_config i2c2_ddc = {
@@ -241,15 +263,23 @@ static const struct tegra_pingroup_config i2c2_gen2 = {
 static struct tegra_i2c_platform_data whistler_i2c2_platform_data = {
        .adapter_nr     = 1,
        .bus_count      = 2,
-       .bus_clk_rate   = { 100000, 100000 },
+       .bus_clk_rate   = { 10000, 100000 },
        .bus_mux        = { &i2c2_ddc, &i2c2_gen2 },
        .bus_mux_len    = { 1, 1 },
+       .scl_gpio               = {0, TEGRA_GPIO_PT5},
+       .sda_gpio               = {0, TEGRA_GPIO_PT6},
+       .arb_recovery = arb_lost_recovery,
+       .slave_addr = 0xFC,
 };
 
 static struct tegra_i2c_platform_data whistler_i2c3_platform_data = {
        .adapter_nr     = 3,
        .bus_count      = 1,
        .bus_clk_rate   = { 400000, 0 },
+       .scl_gpio               = {TEGRA_GPIO_PBB2, 0},
+       .sda_gpio               = {TEGRA_GPIO_PBB3, 0},
+       .arb_recovery = arb_lost_recovery,
+       .slave_addr = 0xFC,
 };
 
 static struct tegra_i2c_platform_data whistler_dvc_platform_data = {
@@ -257,11 +287,24 @@ static struct tegra_i2c_platform_data whistler_dvc_platform_data = {
        .bus_count      = 1,
        .bus_clk_rate   = { 400000, 0 },
        .is_dvc         = true,
+       .scl_gpio               = {TEGRA_GPIO_PZ6, 0},
+       .sda_gpio               = {TEGRA_GPIO_PZ7, 0},
+       .arb_recovery = arb_lost_recovery,
 };
 
-static struct i2c_board_info __initdata wm8753_board_info = {
-       I2C_BOARD_INFO("wm8753", 0x1a),
-       .irq = TEGRA_GPIO_TO_IRQ(TEGRA_GPIO_HP_DET),
+static struct aic326x_pdata whistler_aic3262_pdata = {
+       /* debounce time */
+       .debounce_time_ms = 512,
+};
+
+static struct i2c_board_info __initdata wm8753_board_info[] = {
+       {
+               I2C_BOARD_INFO("wm8753", 0x1a),
+       },
+       {
+               I2C_BOARD_INFO("aic3262-codec", 0x18),
+               .platform_data = &whistler_aic3262_pdata,
+       },
 };
 
 static void whistler_i2c_init(void)
@@ -276,7 +319,10 @@ static void whistler_i2c_init(void)
        platform_device_register(&tegra_i2c_device2);
        platform_device_register(&tegra_i2c_device1);
 
-       i2c_register_board_info(4, &wm8753_board_info, 1);
+       wm8753_board_info[0].irq = wm8753_board_info[1].irq =
+               gpio_to_irq(TEGRA_GPIO_HP_DET);
+       i2c_register_board_info(4, wm8753_board_info,
+               ARRAY_SIZE(wm8753_board_info));
 }
 
 #define GPIO_SCROLL(_pinaction, _gpio, _desc)  \
@@ -313,16 +359,44 @@ static struct platform_device tegra_camera = {
        .id = -1,
 };
 
-static struct tegra_wm8753_platform_data whistler_audio_pdata = {
-       .gpio_spkr_en = TEGRA_GPIO_SPKR_EN,
-       .gpio_hp_det = TEGRA_GPIO_HP_DET,
-       .gpio_hp_mute = -1,
-       .gpio_int_mic_en = -1,
-       .gpio_ext_mic_en = -1,
-       .debounce_time_hp = 200,
+static struct tegra_asoc_platform_data whistler_audio_pdata = {
+       .gpio_spkr_en           = -1,
+       .gpio_hp_det            = TEGRA_GPIO_HP_DET,
+       .gpio_hp_mute           = -1,
+       .gpio_int_mic_en        = -1,
+       .gpio_ext_mic_en        = -1,
+       .debounce_time_hp       = 200,
+       .i2s_param[HIFI_CODEC]  = {
+               .audio_port_id  = 0,
+               .is_i2s_master  = 1,
+               .i2s_mode       = TEGRA_DAIFMT_I2S,
+               .sample_size    = 16,
+       },
+       .i2s_param[BASEBAND]    = {
+               .audio_port_id  = 2,
+               .is_i2s_master  = 1,
+               .i2s_mode       = TEGRA_DAIFMT_DSP_A,
+               .sample_size    = 16,
+               .rate           = 8000,
+               .channels       = 1,
+       },
+       .i2s_param[BT_SCO]      = {
+               .sample_size    = 16,
+               .audio_port_id  = 3,
+               .is_i2s_master  = 1,
+               .i2s_mode       = TEGRA_DAIFMT_DSP_A,
+       },
+};
+
+static struct platform_device whistler_audio_aic326x_device = {
+       .name   = "tegra-snd-aic326x",
+       .id     = 0,
+       .dev    = {
+               .platform_data  = &whistler_audio_pdata,
+       },
 };
 
-static struct platform_device whistler_audio_device = {
+static struct platform_device whistler_audio_wm8753_device = {
        .name   = "tegra-snd-wm8753",
        .id     = 0,
        .dev    = {
@@ -334,6 +408,7 @@ static struct platform_device *whistler_devices[] __initdata = {
        &tegra_pmu_device,
        &tegra_udc_device,
        &tegra_gart_device,
+       &tegra_aes_device,
        &tegra_wdt_device,
        &tegra_avp_device,
        &whistler_scroll_device,
@@ -344,161 +419,118 @@ static struct platform_device *whistler_devices[] __initdata = {
        &tegra_das_device,
        &spdif_dit_device,
        &bluetooth_dit_device,
+       &baseband_dit_device,
+       &whistler_bt_rfkill_device,
        &tegra_pcm_device,
-       &whistler_audio_device,
+       &whistler_audio_aic326x_device,
+       &whistler_audio_wm8753_device,
+};
+
+static struct synaptics_i2c_rmi_platform_data synaptics_pdata = {
+       .flags          = SYNAPTICS_FLIP_X | SYNAPTICS_FLIP_Y | SYNAPTICS_SWAP_XY,
+       .irqflags       = IRQF_TRIGGER_LOW,
 };
 
-static int __init whistler_scroll_init(void)
+static struct i2c_board_info whistler_i2c_touch_info[] = {
+       {
+               I2C_BOARD_INFO("synaptics-rmi-ts", 0x20),
+               .platform_data  = &synaptics_pdata,
+       },
+};
+
+static int __init whistler_touch_init(void)
 {
-       int i;
-       for (i = 0; i < ARRAY_SIZE(scroll_keys); i++)
-               tegra_gpio_enable(scroll_keys[i].gpio);
+       whistler_i2c_touch_info[0].irq = gpio_to_irq(TEGRA_GPIO_PC6);
+       i2c_register_board_info(0, whistler_i2c_touch_info, 1);
 
        return 0;
 }
 
-static struct usb_phy_plat_data tegra_usb_phy_pdata[] = {
-       [0] = {
-                       .instance = 0,
-                       .vbus_irq = MAX8907C_INT_BASE + MAX8907C_IRQ_VCHG_DC_R,
-                       .vbus_gpio = TEGRA_GPIO_PN6,
+static struct tegra_usb_platform_data tegra_udc_pdata = {
+       .port_otg = true,
+       .has_hostpc = false,
+       .builtin_host_disabled = true,
+       .phy_intf = TEGRA_USB_PHY_INTF_UTMI,
+       .op_mode = TEGRA_USB_OPMODE_DEVICE,
+       .u_data.dev = {
+               .vbus_pmu_irq = MAX8907C_INT_BASE + MAX8907C_IRQ_VCHG_DC_R,
+               .vbus_gpio = -1,
+               .charging_supported = false,
+               .remote_wakeup_supported = false,
        },
-       [1] = {
-                       .instance = 1,
-                       .vbus_gpio = -1,
-       },
-       [2] = {
-                       .instance = 2,
-                       .vbus_gpio = -1,
+       .u_cfg.utmi = {
+               .hssync_start_delay = 0,
+               .elastic_limit = 16,
+               .idle_wait_delay = 17,
+               .term_range_adj = 6,
+               .xcvr_setup = 8,
+               .xcvr_lsfslew = 2,
+               .xcvr_lsrslew = 2,
+               .xcvr_setup_offset = 0,
+               .xcvr_use_fuses = 1,
        },
 };
 
-static struct tegra_ehci_platform_data tegra_ehci_pdata[] = {
-       [0] = {
-                       .phy_config = &utmi_phy_config[0],
-                       .operating_mode = TEGRA_USB_HOST,
-                       .power_down_on_bus_suspend = 1,
-               },
-       [1] = {
-                       .phy_config = &ulpi_phy_config,
-                       .operating_mode = TEGRA_USB_HOST,
-                       .power_down_on_bus_suspend = 1,
-               },
-       [2] = {
-                       .phy_config = &utmi_phy_config[1],
-                       .operating_mode = TEGRA_USB_HOST,
-                       .power_down_on_bus_suspend = 1,
+static struct tegra_usb_platform_data tegra_ehci1_utmi_pdata = {
+       .port_otg = true,
+       .has_hostpc = false,
+       .builtin_host_disabled = true,
+       .phy_intf = TEGRA_USB_PHY_INTF_UTMI,
+       .op_mode        = TEGRA_USB_OPMODE_HOST,
+       .u_data.host = {
+               .vbus_gpio = TEGRA_GPIO_PN6,
+               .vbus_reg = NULL,
+               .hot_plug = true,
+               .remote_wakeup_supported = false,
+               .power_off_on_suspend = true,
+       },
+       .u_cfg.utmi = {
+               .hssync_start_delay = 9,
+               .elastic_limit = 16,
+               .idle_wait_delay = 17,
+               .term_range_adj = 6,
+               .xcvr_setup = 8,
+               .xcvr_lsfslew = 2,
+               .xcvr_lsrslew = 2,
        },
 };
 
-static struct platform_device *tegra_usb_otg_host_register(void)
-{
-       struct platform_device *pdev;
-       void *platform_data;
-       int val;
-
-       pdev = platform_device_alloc(tegra_ehci1_device.name,
-                       tegra_ehci1_device.id);
-       if (!pdev)
-               return NULL;
-
-       val = platform_device_add_resources(pdev, tegra_ehci1_device.resource,
-               tegra_ehci1_device.num_resources);
-       if (val)
-               goto error;
-
-       pdev->dev.dma_mask =  tegra_ehci1_device.dev.dma_mask;
-       pdev->dev.coherent_dma_mask = tegra_ehci1_device.dev.coherent_dma_mask;
-
-       platform_data = kmalloc(sizeof(struct tegra_ehci_platform_data),
-                               GFP_KERNEL);
-       if (!platform_data)
-               goto error;
-
-       memcpy(platform_data, &tegra_ehci_pdata[0],
-                               sizeof(struct tegra_ehci_platform_data));
-       pdev->dev.platform_data = platform_data;
-
-       val = platform_device_add(pdev);
-       if (val)
-               goto error_add;
-
-       return pdev;
-
-error_add:
-       kfree(platform_data);
-error:
-       pr_err("%s: failed to add the host contoller device\n", __func__);
-       platform_device_put(pdev);
-       return NULL;
-}
-
-static void tegra_usb_otg_host_unregister(struct platform_device *pdev)
-{
-       kfree(pdev->dev.platform_data);
-       platform_device_unregister(pdev);
-}
-
-static struct tegra_otg_platform_data tegra_otg_pdata = {
-       .host_register = &tegra_usb_otg_host_register,
-       .host_unregister = &tegra_usb_otg_host_unregister,
+static struct tegra_usb_otg_data tegra_otg_pdata = {
+       .ehci_device = &tegra_ehci1_device,
+       .ehci_pdata = &tegra_ehci1_utmi_pdata,
 };
 
-static int __init whistler_gps_init(void)
-{
-       tegra_gpio_enable(TEGRA_GPIO_PU4);
-       return 0;
-}
-
-static void whistler_power_off(void)
-{
-       int ret;
-
-       ret = max8907c_power_off();
-       if (ret)
-               pr_err("whistler: failed to power off\n");
-
-       while (1);
-}
-
-static void __init whistler_power_off_init(void)
-{
-       pm_power_off = whistler_power_off;
-}
-
+#define SERIAL_NUMBER_LENGTH 20
 static void whistler_usb_init(void)
 {
-       tegra_usb_phy_init(tegra_usb_phy_pdata, ARRAY_SIZE(tegra_usb_phy_pdata));
-
        tegra_otg_device.dev.platform_data = &tegra_otg_pdata;
        platform_device_register(&tegra_otg_device);
 
-       tegra_ehci3_device.dev.platform_data = &tegra_ehci_pdata[2];
-       platform_device_register(&tegra_ehci3_device);
+       tegra_udc_device.dev.platform_data = &tegra_udc_pdata;
 }
 
 static void __init tegra_whistler_init(void)
 {
-       char serial[20];
-
+       int modem_id = tegra_get_modem_id();
        tegra_clk_init_from_table(whistler_clk_init_table);
+       whistler_emc_init();
+       tegra_enable_pinmux();
        whistler_pinmux_init();
        whistler_i2c_init();
        whistler_uart_init();
        platform_add_devices(whistler_devices, ARRAY_SIZE(whistler_devices));
-
+       tegra_ram_console_debug_init();
        whistler_sdhci_init();
        whistler_regulator_init();
        whistler_panel_init();
        whistler_sensors_init();
+       whistler_touch_init();
        whistler_kbc_init();
-       whistler_bt_rfkill();
-       whistler_gps_init();
        whistler_usb_init();
-       whistler_scroll_init();
-       whistler_power_off_init();
        whistler_emc_init();
-       whistler_baseband_init();
+       if (modem_id == 0x1)
+               whistler_baseband_init();
+       whistler_setup_bluesleep();
        tegra_release_bootloader_fb();
 }
 
@@ -513,15 +545,19 @@ void __init tegra_whistler_reserve(void)
        if (memblock_reserve(0x0, 4096) < 0)
                pr_warn("Cannot reserve first 4K of memory for safety\n");
 
-       tegra_reserve(SZ_128M, SZ_8M, SZ_16M);
+       tegra_reserve(SZ_152M, SZ_3M, SZ_1M);
+       tegra_ram_console_debug_reserve(SZ_1M);
 }
 
 MACHINE_START(WHISTLER, "whistler")
-       .boot_params    = 0x00000100,
+       .atag_offset    = 0x100,
+       .soc            = &tegra_soc_desc,
        .map_io         = tegra_map_common_io,
-       .reserve        = tegra_whistler_reserve,
-       .init_early     = tegra_init_early,
+       .init_early     = tegra20_init_early,
        .init_irq       = tegra_init_irq,
+       .handle_irq     = gic_handle_irq,
+       .reserve        = tegra_whistler_reserve,
        .timer          = &tegra_timer,
        .init_machine   = tegra_whistler_init,
+       .restart        = tegra_assert_system_reset,
 MACHINE_END