ARM: tegra: Check regulator_enable return values
[linux-3.10.git] / arch / arm / mach-tegra / board-pluto.c
index 4ce0f13..54ccf4b 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * arch/arm/mach-tegra/board-pluto.c
  *
- * Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2012-2013, NVIDIA CORPORATION. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -35,8 +35,9 @@
 #include <linux/spi/rm31080a_ts.h>
 #include <linux/tegra_uart.h>
 #include <linux/memblock.h>
-#include <linux/spi-tegra.h>
+#include <linux/spi/spi-tegra.h>
 #include <linux/nfc/pn544.h>
+#include <linux/nfc/bcm2079x.h>
 #include <linux/rfkill-gpio.h>
 #include <linux/skbuff.h>
 #include <linux/ti_wilink_st.h>
 #include <linux/mfd/max8831.h>
 #include <linux/of_platform.h>
 #include <linux/a2220.h>
-
-#include <asm/hardware/gic.h>
+#include <linux/mfd/tlv320aic3262-registers.h>
+#include <linux/mfd/tlv320aic3xxx-core.h>
+#include <linux/usb/tegra_usb_phy.h>
 
 #include <mach/clk.h>
-#include <mach/iomap.h>
 #include <mach/irqs.h>
 #include <mach/pinmux.h>
-#include <mach/pinmux-tegra30.h>
-#include <mach/iomap.h>
-#include <mach/io.h>
+#include <mach/pinmux-t11.h>
 #include <mach/io_dpd.h>
 #include <mach/i2s.h>
+#include <mach/isomgr.h>
 #include <mach/tegra_asoc_pdata.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
-#include <mach/usb_phy.h>
 #include <mach/gpio-tegra.h>
 #include <mach/tegra_fiq_debugger.h>
 #include <mach/tegra-bb-power.h>
-#include <mach/edp.h>
-#include <mach/tegra_usb_modem_power.h>
+#include <mach/tegra_wakeup_monitor.h>
+#include <linux/platform_data/tegra_usb_modem_power.h>
+#include <mach/xusb.h>
 
 #include "board.h"
 #include "board-common.h"
+#include "board-touch.h"
 #include "board-touch-raydium.h"
 #include "clock.h"
 #include "board-pluto.h"
+#include "baseband-xmm-power.h"
 #include "tegra-board-id.h"
 #include "devices.h"
 #include "gpio-names.h"
 #include "fuse.h"
 #include "pm.h"
 #include "common.h"
+#include "iomap.h"
+
 
+#ifdef CONFIG_BT_BLUESLEEP
 static struct rfkill_gpio_platform_data pluto_bt_rfkill_pdata = {
        .name           = "bt_rfkill",
        .shutdown_gpio  = TEGRA_GPIO_PQ7,
@@ -136,6 +141,54 @@ static noinline void __init pluto_setup_bluesleep(void)
        platform_device_register(&pluto_bluesleep_device);
        return;
 }
+#elif defined CONFIG_BLUEDROID_PM
+static struct resource pluto_bluedroid_pm_resources[] = {
+       [0] = {
+               .name   = "shutdown_gpio",
+               .start  = TEGRA_GPIO_PQ7,
+               .end    = TEGRA_GPIO_PQ7,
+               .flags  = IORESOURCE_IO,
+       },
+       [1] = {
+               .name = "host_wake",
+               .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
+       },
+       [2] = {
+               .name = "gpio_ext_wake",
+               .start  = TEGRA_GPIO_PEE1,
+               .end    = TEGRA_GPIO_PEE1,
+               .flags  = IORESOURCE_IO,
+       },
+       [3] = {
+               .name = "gpio_host_wake",
+               .start  = TEGRA_GPIO_PU6,
+               .end    = TEGRA_GPIO_PU6,
+               .flags  = IORESOURCE_IO,
+       },
+       [4] = {
+               .name = "reset_gpio",
+               .start  = TEGRA_GPIO_PQ6,
+               .end    = TEGRA_GPIO_PQ6,
+               .flags  = IORESOURCE_IO,
+       },
+};
+
+static struct platform_device pluto_bluedroid_pm_device = {
+       .name = "bluedroid_pm",
+       .id             = 0,
+       .num_resources  = ARRAY_SIZE(pluto_bluedroid_pm_resources),
+       .resource       = pluto_bluedroid_pm_resources,
+};
+
+static noinline void __init pluto_setup_bluedroid_pm(void)
+{
+       pluto_bluedroid_pm_resources[1].start =
+               pluto_bluedroid_pm_resources[1].end =
+                                       gpio_to_irq(TEGRA_GPIO_PU6);
+       platform_device_register(&pluto_bluedroid_pm_device);
+}
+#endif
+
 static __initdata struct tegra_clk_init_table pluto_clk_init_table[] = {
        /* name         parent          rate            enabled */
        { "pll_m",      NULL,           0,              false},
@@ -151,6 +204,7 @@ static __initdata struct tegra_clk_init_table pluto_clk_init_table[] = {
        { "dam0",       "clk_m",        12000000,       false},
        { "dam1",       "clk_m",        12000000,       false},
        { "dam2",       "clk_m",        12000000,       false},
+       { "audio0",     "i2s0_sync",    0,              false},
        { "audio1",     "i2s1_sync",    0,              false},
        { "audio2",     "i2s2_sync",    0,              false},
        { "audio3",     "i2s3_sync",    0,              false},
@@ -164,54 +218,101 @@ static __initdata struct tegra_clk_init_table pluto_clk_init_table[] = {
        { "i2c3",       "pll_p",        3200000,        false},
        { "i2c4",       "pll_p",        3200000,        false},
        { "i2c5",       "pll_p",        3200000,        false},
+       { "sbc1",       "pll_p",        25000000,       false},
+       { "sbc2",       "pll_p",        25000000,       false},
+       { "sbc3",       "pll_p",        25000000,       false},
+       { "sbc4",       "pll_p",        25000000,       false},
+       { "sbc5",       "pll_p",        25000000,       false},
+       { "sbc6",       "pll_p",        25000000,       false},
        { "extern3",    "clk_m",        12000000,       false},
+       { "dsia",       "pll_d2_out0",  0,              false},
        { NULL,         NULL,           0,              0},
 };
 
+static struct bcm2079x_platform_data nfc_pdata = {
+       .irq_gpio = TEGRA_GPIO_PW2,
+       .en_gpio = TEGRA_GPIO_PU4,
+       .wake_gpio = TEGRA_GPIO_PX7,
+       };
+
+static struct i2c_board_info __initdata pluto_i2c_bus3_board_info[] = {
+       {
+               I2C_BOARD_INFO("bcm2079x-i2c", 0x77),
+               .platform_data = &nfc_pdata,
+       },
+};
+
 static struct tegra_i2c_platform_data pluto_i2c1_platform_data = {
-       .adapter_nr     = 0,
-       .bus_count      = 1,
-       .bus_clk_rate   = { 100000, 0 },
-       .scl_gpio               = {TEGRA_GPIO_I2C1_SCL, 0},
-       .sda_gpio               = {TEGRA_GPIO_I2C1_SDA, 0},
-       .arb_recovery = arb_lost_recovery,
+       .bus_clk_rate   = 100000,
+       .scl_gpio       = TEGRA_GPIO_I2C1_SCL,
+       .sda_gpio       = TEGRA_GPIO_I2C1_SDA,
 };
 
 static struct tegra_i2c_platform_data pluto_i2c2_platform_data = {
-       .adapter_nr     = 1,
-       .bus_count      = 1,
-       .bus_clk_rate   = { 100000, 0 },
+       .bus_clk_rate   = 100000,
        .is_clkon_always = true,
-       .scl_gpio               = {TEGRA_GPIO_I2C2_SCL, 0},
-       .sda_gpio               = {TEGRA_GPIO_I2C2_SDA, 0},
-       .arb_recovery = arb_lost_recovery,
+       .scl_gpio       = TEGRA_GPIO_I2C2_SCL,
+       .sda_gpio       = TEGRA_GPIO_I2C2_SDA,
 };
 
 static struct tegra_i2c_platform_data pluto_i2c3_platform_data = {
-       .adapter_nr     = 2,
-       .bus_count      = 1,
-       .bus_clk_rate   = { 100000, 0 },
-       .scl_gpio               = {TEGRA_GPIO_I2C3_SCL, 0},
-       .sda_gpio               = {TEGRA_GPIO_I2C3_SDA, 0},
-       .arb_recovery = arb_lost_recovery,
+       .bus_clk_rate   = 400000,
+       .scl_gpio       = TEGRA_GPIO_I2C3_SCL,
+       .sda_gpio       = TEGRA_GPIO_I2C3_SDA,
 };
 
 static struct tegra_i2c_platform_data pluto_i2c4_platform_data = {
-       .adapter_nr     = 3,
-       .bus_count      = 1,
-       .bus_clk_rate   = { 10000, 0 },
-       .scl_gpio               = {TEGRA_GPIO_I2C4_SCL, 0},
-       .sda_gpio               = {TEGRA_GPIO_I2C4_SDA, 0},
-       .arb_recovery = arb_lost_recovery,
+       .bus_clk_rate   = 10000,
+       .scl_gpio       = TEGRA_GPIO_I2C4_SCL,
+       .sda_gpio       = TEGRA_GPIO_I2C4_SDA,
 };
 
 static struct tegra_i2c_platform_data pluto_i2c5_platform_data = {
-       .adapter_nr     = 4,
-       .bus_count      = 1,
-       .bus_clk_rate   = { 400000, 0 },
-       .scl_gpio               = {TEGRA_GPIO_I2C5_SCL, 0},
-       .sda_gpio               = {TEGRA_GPIO_I2C5_SDA, 0},
-       .arb_recovery = arb_lost_recovery,
+       .bus_clk_rate   = 400000,
+       .scl_gpio       = TEGRA_GPIO_I2C5_SCL,
+       .sda_gpio       = TEGRA_GPIO_I2C5_SDA,
+       .needs_cl_dvfs_clock = true,
+};
+
+static struct aic3262_gpio_setup aic3262_gpio[] = {
+       /* GPIO 1*/
+       {
+               .used = 1,
+               .in = 0,
+               .value = AIC3262_GPIO1_FUNC_INT1_OUTPUT ,
+       },
+       /* GPIO 2*/
+       {
+               .used = 1,
+               .in = 0,
+               .value = AIC3262_GPIO2_FUNC_ADC_MOD_CLK_OUTPUT,
+       },
+       /* GPI1 */
+       {
+               .used = 1,
+               .in = 1,
+       },
+       /* GPI2 */
+       {
+               .used = 1,
+               .in = 1,
+               .in_reg = AIC3262_DMIC_INPUT_CNTL,
+               .in_reg_bitmask = AIC3262_DMIC_CONFIGURE_MASK,
+               .in_reg_shift = AIC3262_DMIC_CONFIGURE_SHIFT,
+               .value = AIC3262_DMIC_GPI2_LEFT_GPI2_RIGHT,
+       },
+       /* GPO1 */
+       {
+               .used = 1,
+               .in = 0,
+               .value = AIC3262_GPO1_FUNC_MSO_OUTPUT_FOR_SPI,
+       },
+};
+static struct aic3xxx_pdata aic3262_codec_pdata = {
+       .gpio_irq       = 0,
+       .gpio           = aic3262_gpio,
+       .naudint_irq    = 0,
+       .irq_base       = AIC3262_CODEC_IRQ_BASE,
 };
 
 static struct i2c_board_info __initdata cs42l73_board_info = {
@@ -222,28 +323,13 @@ static struct i2c_board_info __initdata pluto_codec_a2220_info = {
        I2C_BOARD_INFO("audience_a2220", 0x3E),
 };
 
+static struct i2c_board_info __initdata pluto_codec_aic326x_info = {
+       I2C_BOARD_INFO("tlv320aic3262", 0x18),
+       .platform_data = &aic3262_codec_pdata,
+};
 
 static void pluto_i2c_init(void)
 {
-       struct board_info board_info;
-
-       tegra_get_board_info(&board_info);
-#ifndef CONFIG_ARCH_TEGRA_11x_SOC
-       tegra_i2c_device1.dev.platform_data = &pluto_i2c1_platform_data;
-       tegra_i2c_device2.dev.platform_data = &pluto_i2c2_platform_data;
-       tegra_i2c_device3.dev.platform_data = &pluto_i2c3_platform_data;
-       tegra_i2c_device4.dev.platform_data = &pluto_i2c4_platform_data;
-       tegra_i2c_device5.dev.platform_data = &pluto_i2c5_platform_data;
-
-       i2c_register_board_info(1, &pluto_i2c_led_info, 1);
-
-       platform_device_register(&tegra_i2c_device5);
-       platform_device_register(&tegra_i2c_device4);
-       platform_device_register(&tegra_i2c_device3);
-       platform_device_register(&tegra_i2c_device2);
-       platform_device_register(&tegra_i2c_device1);
-
-#else
        tegra11_i2c_device1.dev.platform_data = &pluto_i2c1_platform_data;
        tegra11_i2c_device2.dev.platform_data = &pluto_i2c2_platform_data;
        tegra11_i2c_device3.dev.platform_data = &pluto_i2c3_platform_data;
@@ -252,14 +338,18 @@ static void pluto_i2c_init(void)
 
        platform_device_register(&tegra11_i2c_device5);
        platform_device_register(&tegra11_i2c_device4);
+#ifndef CONFIG_OF
        platform_device_register(&tegra11_i2c_device3);
+#endif
        platform_device_register(&tegra11_i2c_device2);
        platform_device_register(&tegra11_i2c_device1);
 
-#endif
-
        i2c_register_board_info(0, &pluto_codec_a2220_info, 1);
        i2c_register_board_info(0, &cs42l73_board_info, 1);
+       i2c_register_board_info(0, &pluto_codec_aic326x_info, 1);
+       pluto_i2c_bus3_board_info[0].irq = gpio_to_irq(TEGRA_GPIO_PW2);
+       i2c_register_board_info(0, pluto_i2c_bus3_board_info, 1);
+       i2c_register_board_info(0, &pluto_codec_aic326x_info, 1);
 }
 
 static struct platform_device *pluto_uart_devices[] __initdata = {
@@ -343,6 +433,22 @@ static struct platform_device tegra_rtc_device = {
        .num_resources = ARRAY_SIZE(tegra_rtc_resources),
 };
 
+#if defined(CONFIG_TEGRA_WAKEUP_MONITOR)
+static struct tegra_wakeup_monitor_platform_data
+                       pluto_tegra_wakeup_monitor_pdata = {
+       .wifi_wakeup_source     = 6,
+       .rtc_wakeup_source      = 18,
+};
+
+static struct platform_device pluto_tegra_wakeup_monitor_device = {
+       .name = "tegra_wakeup_monitor",
+       .id   = -1,
+       .dev  = {
+               .platform_data = &pluto_tegra_wakeup_monitor_pdata,
+       },
+};
+#endif
+
 static struct tegra_asoc_platform_data pluto_audio_pdata = {
        .gpio_spkr_en           = TEGRA_GPIO_SPKR_EN,
        .gpio_hp_det            = TEGRA_GPIO_HP_DET,
@@ -350,6 +456,8 @@ static struct tegra_asoc_platform_data pluto_audio_pdata = {
        .gpio_int_mic_en        = TEGRA_GPIO_INT_MIC_EN,
        .gpio_ext_mic_en        = TEGRA_GPIO_EXT_MIC_EN,
        .gpio_ldo1_en           = TEGRA_GPIO_LDO1_EN,
+       .edp_support            =  true,
+       .edp_states             = {1776, 888, 0},
        .i2s_param[HIFI_CODEC]  = {
                .audio_port_id  = 1,
                .is_i2s_master  = 0,
@@ -364,12 +472,67 @@ static struct tegra_asoc_platform_data pluto_audio_pdata = {
                .sample_size    = 16,
                .rate           = 16000,
                .channels       = 2,
+               .bit_clk        = 1024000,
+       },
+       .i2s_param[BT_SCO]      = {
+               .audio_port_id  = 3,
+               .is_i2s_master  = 1,
+               .i2s_mode       = TEGRA_DAIFMT_DSP_A,
+               .sample_size    = 16,
+               .channels       = 1,
+               .bit_clk        = 512000,
+       },
+       .i2s_param[VOICE_CODEC] = {
+               .audio_port_id  = 0,
+               .is_i2s_master  = 1,
+               .i2s_mode       = TEGRA_DAIFMT_I2S,
+               .sample_size    = 16,
+               .rate           = 16000,
+               .channels       = 2,
+       },
+};
+
+static struct tegra_asoc_platform_data pluto_aic3262_pdata = {
+       .gpio_spkr_en           = TEGRA_GPIO_SPKR_EN,
+       .gpio_hp_det            = TEGRA_GPIO_HP_DET,
+       .gpio_hp_mute           = -1,
+       .gpio_int_mic_en        = TEGRA_GPIO_INT_MIC_EN,
+       .gpio_ext_mic_en        = TEGRA_GPIO_EXT_MIC_EN,
+       .gpio_ldo1_en           = TEGRA_GPIO_LDO1_EN,
+       .edp_support            = true,
+       .edp_states             = {1776, 888, 0},
+       .i2s_param[HIFI_CODEC]  = {
+               .audio_port_id  = 1,
+               .is_i2s_master  = 0,
+               .i2s_mode       = TEGRA_DAIFMT_I2S,
+               .sample_size    = 16,
+               .rate           = 48000,
+               .channels       = 2,
+       },
+       .i2s_param[BASEBAND]    = {
+               .audio_port_id  = 2,
+               .is_i2s_master  = 1,
+               .i2s_mode       = TEGRA_DAIFMT_I2S,
+               .sample_size    = 16,
+               .rate           = 16000,
+               .channels       = 2,
+               .bit_clk        = 1024000,
        },
        .i2s_param[BT_SCO]      = {
                .audio_port_id  = 3,
                .is_i2s_master  = 1,
                .i2s_mode       = TEGRA_DAIFMT_DSP_A,
                .sample_size    = 16,
+               .channels       = 1,
+               .bit_clk        = 512000,
+       },
+       .i2s_param[VOICE_CODEC] = {
+               .audio_port_id  = 0,
+               .is_i2s_master  = 1,
+               .i2s_mode       = TEGRA_DAIFMT_I2S,
+               .sample_size    = 16,
+               .rate           = 16000,
+               .channels       = 2,
        },
 };
 
@@ -381,9 +544,28 @@ static struct platform_device pluto_audio_device = {
        },
 };
 
-static struct platform_device tegra_camera = {
-       .name = "tegra_camera",
-       .id = -1,
+static struct platform_device pluto_audio_aic326x_device = {
+       .name   = "tegra-snd-aic326x",
+       .id     = 2,
+       .dev    = {
+               .platform_data  = &pluto_aic3262_pdata,
+       },
+};
+
+static struct tegra_spi_device_controller_data dev_bdata = {
+       .rx_clk_tap_delay = 0,
+       .tx_clk_tap_delay = 0,
+};
+static struct spi_board_info aic326x_spi_board_info[] = {
+       {
+               .modalias = "tlv320aic3xxx",
+               .bus_num = 3,
+               .chip_select = 0,
+               .max_speed_hz = 4*1000*1000,
+               .mode = SPI_MODE_1,
+               .controller_data = &dev_bdata,
+               .platform_data = &aic3262_codec_pdata,
+       },
 };
 
 #ifdef CONFIG_MHI_NETDEV
@@ -397,13 +579,12 @@ static struct platform_device *pluto_devices[] __initdata = {
        &tegra_pmu_device,
        &tegra_rtc_device,
        &tegra_udc_device,
-#if defined(CONFIG_TEGRA_IOVMM_SMMU) || defined(CONFIG_TEGRA_IOMMU_SMMU)
-       &tegra_smmu_device,
+#if defined(CONFIG_TEGRA_WATCHDOG)
+       &tegra_wdt0_device,
 #endif
 #if defined(CONFIG_TEGRA_AVP)
        &tegra_avp_device,
 #endif
-       &tegra_camera,
 #if defined(CONFIG_CRYPTO_DEV_TEGRA_SE)
        &tegra11_se_device,
 #endif
@@ -420,7 +601,11 @@ static struct platform_device *pluto_devices[] __initdata = {
        &spdif_dit_device,
        &bluetooth_dit_device,
        &baseband_dit_device,
+#if defined(CONFIG_TEGRA_WAKEUP_MONITOR)
+       &pluto_tegra_wakeup_monitor_device,
+#endif
        &pluto_audio_device,
+       &pluto_audio_aic326x_device,
        &tegra_hda_device,
 #if defined(CONFIG_CRYPTO_DEV_TEGRA_AES)
        &tegra_aes_device,
@@ -431,6 +616,55 @@ static struct platform_device *pluto_devices[] __initdata = {
 };
 
 #ifdef CONFIG_USB_SUPPORT
+
+static void pluto_usb_hsic_postsupend(void)
+{
+       pr_debug("%s\n", __func__);
+#ifdef CONFIG_TEGRA_BB_XMM_POWER
+       baseband_xmm_set_power_status(BBXMM_PS_L2);
+#endif
+}
+
+static void pluto_usb_hsic_preresume(void)
+{
+       pr_debug("%s\n", __func__);
+#ifdef CONFIG_TEGRA_BB_XMM_POWER
+       baseband_xmm_set_power_status(BBXMM_PS_L2TOL0);
+#endif
+}
+
+static void pluto_usb_hsic_post_resume(void)
+{
+       pr_debug("%s\n", __func__);
+#ifdef CONFIG_TEGRA_BB_XMM_POWER
+       baseband_xmm_set_power_status(BBXMM_PS_L0);
+#endif
+}
+
+static void pluto_usb_hsic_phy_power(void)
+{
+       pr_debug("%s\n", __func__);
+#ifdef CONFIG_TEGRA_BB_XMM_POWER
+       baseband_xmm_set_power_status(BBXMM_PS_L0);
+#endif
+}
+
+static void pluto_usb_hsic_post_phy_off(void)
+{
+       pr_debug("%s\n", __func__);
+#ifdef CONFIG_TEGRA_BB_XMM_POWER
+       baseband_xmm_set_power_status(BBXMM_PS_L2);
+#endif
+}
+
+static struct tegra_usb_phy_platform_ops oem2_plat_ops = {
+       .post_suspend = pluto_usb_hsic_postsupend,
+       .pre_resume = pluto_usb_hsic_preresume,
+       .port_power = pluto_usb_hsic_phy_power,
+       .post_resume = pluto_usb_hsic_post_resume,
+       .post_phy_off = pluto_usb_hsic_post_phy_off,
+};
+
 static struct tegra_usb_platform_data tegra_ehci3_hsic_smsc_hub_pdata = {
        .port_otg = false,
        .has_hostpc = true,
@@ -448,7 +682,8 @@ static struct tegra_usb_platform_data tegra_ehci3_hsic_smsc_hub_pdata = {
 static struct tegra_usb_platform_data tegra_udc_pdata = {
        .port_otg = true,
        .has_hostpc = true,
-       .builtin_host_disabled = true,
+       .id_det_type = TEGRA_USB_PMU_ID,
+       .unaligned_dma_buf_supported = false,
        .phy_intf = TEGRA_USB_PHY_INTF_UTMI,
        .op_mode = TEGRA_USB_OPMODE_DEVICE,
        .u_data.dev = {
@@ -463,8 +698,8 @@ static struct tegra_usb_platform_data tegra_udc_pdata = {
                .idle_wait_delay = 17,
                .term_range_adj = 6,
                .xcvr_setup = 8,
-               .xcvr_lsfslew = 2,
-               .xcvr_lsrslew = 2,
+               .xcvr_lsfslew = 0,
+               .xcvr_lsrslew = 3,
                .xcvr_setup_offset = 0,
                .xcvr_use_fuses = 1,
        },
@@ -473,7 +708,7 @@ static struct tegra_usb_platform_data tegra_udc_pdata = {
 static struct tegra_usb_platform_data tegra_ehci1_utmi_pdata = {
        .port_otg = true,
        .has_hostpc = true,
-       .builtin_host_disabled = true,
+       .id_det_type = TEGRA_USB_PMU_ID,
        .unaligned_dma_buf_supported = false,
        .phy_intf = TEGRA_USB_PHY_INTF_UTMI,
        .op_mode = TEGRA_USB_OPMODE_HOST,
@@ -489,16 +724,18 @@ static struct tegra_usb_platform_data tegra_ehci1_utmi_pdata = {
                .idle_wait_delay = 17,
                .term_range_adj = 6,
                .xcvr_setup = 15,
-               .xcvr_lsfslew = 2,
-               .xcvr_lsrslew = 2,
+               .xcvr_lsfslew = 0,
+               .xcvr_lsrslew = 3,
                .xcvr_setup_offset = 0,
                .xcvr_use_fuses = 1,
+               .vbus_oc_map = 0x7,
        },
 };
 
 static struct tegra_usb_otg_data tegra_otg_pdata = {
        .ehci_device = &tegra_ehci1_device,
        .ehci_pdata = &tegra_ehci1_utmi_pdata,
+       .id_extcon_dev_name = "MAX77665_MUIC_ID",
 };
 
 static struct regulator *baseband_reg;
@@ -508,17 +745,7 @@ static struct gpio modem_gpios[] = { /* i500 modem */
 
 static struct gpio modem2_gpios[] = {
        {MDM2_PWR_ON, GPIOF_OUT_INIT_LOW, "MODEM2 PWR ON"},
-       {MDM2_RST, GPIOF_DIR_OUT, "MODEM2 RESET"},
-       {MDM2_ACK2, GPIOF_OUT_INIT_HIGH, "MODEM2 ACK2"},
-       {MDM2_ACK1, GPIOF_OUT_INIT_LOW, "MODEM2 ACK1"},
-};
-
-static void baseband2_post_phy_on(void);
-static void baseband2_pre_phy_off(void);
-
-static struct tegra_usb_phy_platform_ops baseband2_plat_ops = {
-       .pre_phy_off = baseband2_pre_phy_off,
-       .post_phy_on = baseband2_post_phy_on,
+       {MDM2_RST, GPIOF_OUT_INIT_LOW, "MODEM2 RESET"},
 };
 
 static struct tegra_usb_platform_data tegra_ehci2_hsic_baseband_pdata = {
@@ -530,16 +757,12 @@ static struct tegra_usb_platform_data tegra_ehci2_hsic_baseband_pdata = {
        .u_data.host = {
                .vbus_gpio = -1,
                .hot_plug = false,
-               .remote_wakeup_supported = false,
-               .power_off_on_suspend = false,
+               .remote_wakeup_supported = true,
+               .power_off_on_suspend = true,
        },
 };
 
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
 static struct tegra_usb_platform_data tegra_ehci3_hsic_baseband2_pdata = {
-#else
-static struct tegra_usb_platform_data tegra_ehci2_hsic_baseband2_pdata = {
-#endif
        .port_otg = false,
        .has_hostpc = true,
        .unaligned_dma_buf_supported = false,
@@ -548,13 +771,11 @@ static struct tegra_usb_platform_data tegra_ehci2_hsic_baseband2_pdata = {
        .u_data.host = {
                .vbus_gpio = -1,
                .hot_plug = false,
-               .remote_wakeup_supported = false,
-               .power_off_on_suspend = false,
+               .remote_wakeup_supported = true,
+               .power_off_on_suspend = true,
        },
-       .ops = &baseband2_plat_ops,
 };
 
-#ifdef CONFIG_TEGRA_BB_OEM1
 static struct tegra_usb_platform_data tegra_hsic_pdata = {
        .port_otg = false,
        .has_hostpc = true,
@@ -643,7 +864,6 @@ static struct platform_device tegra_bb_oem1 = {
                .platform_data = &bb_pdata_oem1,
        },
 };
-#endif
 
 static int baseband_init(void)
 {
@@ -656,10 +876,16 @@ static int baseband_init(void)
        }
 
        baseband_reg = regulator_get(NULL, "vdd_core_bb");
-       if (IS_ERR_OR_NULL(baseband_reg))
+       if (IS_ERR(baseband_reg))
                pr_warn("%s: baseband regulator get failed\n", __func__);
-       else
-               regulator_enable(baseband_reg);
+       else {
+               if (regulator_enable(baseband_reg) != 0)
+                       pr_warn("baseband regulator enable failed\n");
+       }
+
+       /* enable pull-up for MDM1 UART RX */
+       tegra_pinmux_set_pullupdown(TEGRA_PINGROUP_GPIO_PU1,
+                                   TEGRA_PUPD_PULL_UP);
 
        /* enable pull-down for MDM1_COLD_BOOT */
        tegra_pinmux_set_pullupdown(TEGRA_PINGROUP_ULPI_DATA4,
@@ -675,6 +901,17 @@ static const struct tegra_modem_operations baseband_operations = {
        .init = baseband_init,
 };
 
+#define MODEM_BOOT_EDP_MAX 0
+/* FIXME: get accurate boot current value */
+static unsigned int modem_boot_edp_states[] = { 1900, 0 };
+static struct edp_client modem_boot_edp_client = {
+       .name = "modem_boot",
+       .states = modem_boot_edp_states,
+       .num_states = ARRAY_SIZE(modem_boot_edp_states),
+       .e0_index = MODEM_BOOT_EDP_MAX,
+       .priority = EDP_MAX_PRIO,
+};
+
 static struct tegra_usb_modem_power_platform_data baseband_pdata = {
        .ops = &baseband_operations,
        .wake_gpio = -1,
@@ -684,6 +921,12 @@ static struct tegra_usb_modem_power_platform_data baseband_pdata = {
        .short_autosuspend_delay = 50,
        .tegra_ehci_device = &tegra_ehci2_device,
        .tegra_ehci_pdata = &tegra_ehci2_hsic_baseband_pdata,
+       .modem_boot_edp_client = &modem_boot_edp_client,
+       .edp_manager_name = "battery",
+       .i_breach_ppm = 500000,
+       /* FIXME: get useful adjperiods */
+       .i_thresh_3g_adjperiod = 10000,
+       .i_thresh_lte_adjperiod = 10000,
 };
 
 static struct platform_device icera_baseband_device = {
@@ -694,51 +937,37 @@ static struct platform_device icera_baseband_device = {
        },
 };
 
-static void baseband2_post_phy_on(void)
-{
-       /* set MDM2_ACK2 low */
-       gpio_set_value(MDM2_ACK2, 0);
-}
-
-static void baseband2_pre_phy_off(void)
-{
-       /* set MDM2_ACK2 high */
-       gpio_set_value(MDM2_ACK2, 1);
-}
-
 static void baseband2_start(void)
 {
-       /*
-        *  Leave baseband powered OFF.
-        *  User-space daemons will take care of powering it up.
-        */
        pr_info("%s\n", __func__);
-       gpio_set_value(MDM2_PWR_ON, 0);
+       gpio_set_value(MDM2_PWR_ON, 1);
 }
 
 static void baseband2_reset(void)
 {
        /* Initiate power cycle on baseband sub system */
        pr_info("%s\n", __func__);
-       gpio_set_value(MDM2_PWR_ON, 0);
+       gpio_set_value(MDM2_RST, 0);
        mdelay(200);
-       gpio_set_value(MDM2_PWR_ON, 1);
+       gpio_set_value(MDM2_RST, 1);
 }
 
 static int baseband2_init(void)
 {
        int ret;
 
+       tegra_pinmux_set_tristate(TEGRA_PINGROUP_GPIO_X1_AUD, TEGRA_TRI_NORMAL);
+
        ret = gpio_request_array(modem2_gpios, ARRAY_SIZE(modem2_gpios));
        if (ret)
                return ret;
 
-       /* enable pull-up for MDM2_REQ2 */
-       tegra_pinmux_set_pullupdown(TEGRA_PINGROUP_GPIO_PV1,
-                                   TEGRA_PUPD_PULL_UP);
+       /* enable pull-down for MDM2_COLD_BOOT */
+       tegra_pinmux_set_pullupdown(TEGRA_PINGROUP_KB_ROW4,
+                                   TEGRA_PUPD_PULL_DOWN);
 
        /* export GPIO for user space access through sysfs */
-       gpio_export(MDM2_PWR_ON, false);
+       gpio_export(MDM2_RST, false);
 
        return 0;
 }
@@ -751,19 +980,13 @@ static const struct tegra_modem_operations baseband2_operations = {
 
 static struct tegra_usb_modem_power_platform_data baseband2_pdata = {
        .ops = &baseband2_operations,
-       .wake_gpio = MDM2_REQ2,
-       .wake_irq_flags = IRQF_TRIGGER_FALLING,
+       .wake_gpio = -1,
        .boot_gpio = MDM2_COLDBOOT,
        .boot_irq_flags = IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
        .autosuspend_delay = 2000,
        .short_autosuspend_delay = 50,
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
        .tegra_ehci_device = &tegra_ehci3_device,
        .tegra_ehci_pdata = &tegra_ehci3_hsic_baseband2_pdata,
-#else
-       .tegra_ehci_device = &tegra_ehci2_device,
-       .tegra_ehci_pdata = &tegra_ehci2_hsic_baseband2_pdata,
-#endif
 };
 
 static struct platform_device icera_baseband2_device = {
@@ -774,20 +997,46 @@ static struct platform_device icera_baseband2_device = {
        },
 };
 
+static struct baseband_power_platform_data tegra_baseband_xmm_power_data = {
+       .baseband_type = BASEBAND_XMM,
+       .modem = {
+               .xmm = {
+                       .bb_rst = XMM_GPIO_BB_RST,
+                       .bb_on = XMM_GPIO_BB_ON,
+                       .ipc_bb_wake = XMM_GPIO_IPC_BB_WAKE,
+                       .ipc_ap_wake = XMM_GPIO_IPC_AP_WAKE,
+                       .ipc_hsic_active = XMM_GPIO_IPC_HSIC_ACTIVE,
+                       .ipc_hsic_sus_req = XMM_GPIO_IPC_HSIC_SUS_REQ,
+               },
+       },
+};
+
+static struct platform_device tegra_baseband_xmm_power_device = {
+       .name = "baseband_xmm_power",
+       .id = -1,
+       .dev = {
+               .platform_data = &tegra_baseband_xmm_power_data,
+       },
+};
+
+static struct platform_device tegra_baseband_xmm_power2_device = {
+       .name = "baseband_xmm_power2",
+       .id = -1,
+       .dev = {
+               .platform_data = &tegra_baseband_xmm_power_data,
+       },
+};
+
 static void pluto_usb_init(void)
 {
-       int modem_id = tegra_get_modem_id();
+       int usb_port_owner_info = tegra_get_usb_port_owner_info();
 
-       tegra_otg_device.dev.platform_data = &tegra_otg_pdata;
-       platform_device_register(&tegra_otg_device);
+       if (!(usb_port_owner_info & UTMI1_PORT_OWNER_XUSB)) {
+               tegra_otg_device.dev.platform_data = &tegra_otg_pdata;
+               platform_device_register(&tegra_otg_device);
 
-       /* Setup the udc platform data */
-       tegra_udc_device.dev.platform_data = &tegra_udc_pdata;
-
-       if (!modem_id) {
-               tegra_ehci3_device.dev.platform_data =
-                       &tegra_ehci3_hsic_smsc_hub_pdata;
-               platform_device_register(&tegra_ehci3_device);
+               /* Setup the udc platform data */
+               tegra_udc_device.dev.platform_data = &tegra_udc_pdata;
        }
 }
 
@@ -795,35 +1044,113 @@ static void pluto_modem_init(void)
 {
        int modem_id = tegra_get_modem_id();
        struct board_info board_info;
+       int usb_port_owner_info = tegra_get_usb_port_owner_info();
 
        tegra_get_board_info(&board_info);
        pr_info("%s: modem_id = %d\n", __func__, modem_id);
 
        switch (modem_id) {
        case TEGRA_BB_I500: /* on board i500 HSIC */
-               platform_device_register(&icera_baseband_device);
+               if (!(usb_port_owner_info & HSIC1_PORT_OWNER_XUSB))
+                       platform_device_register(&icera_baseband_device);
                break;
        case TEGRA_BB_I500SWD: /* i500 SWD HSIC */
-               platform_device_register(&icera_baseband2_device);
+               if (!(usb_port_owner_info & HSIC2_PORT_OWNER_XUSB))
+                       platform_device_register(&icera_baseband2_device);
                break;
-#ifdef CONFIG_TEGRA_BB_OEM1
        case TEGRA_BB_OEM1:     /* OEM1 HSIC */
-               if (board_info.board_id == BOARD_E1575)
+               if ((board_info.board_id == BOARD_E1575) ||
+                       ((board_info.board_id == BOARD_E1580) &&
+                               (board_info.fab >= BOARD_FAB_A03))) {
+                       tegra_pinmux_set_tristate(TEGRA_PINGROUP_GPIO_X1_AUD,
+                                                       TEGRA_TRI_NORMAL);
                        bb_gpio_oem1.oem1.pwron = BB_OEM1_GPIO_ON_V;
-               tegra_hsic_pdata.ops = &oem1_hsic_pops;
-               tegra_ehci3_device.dev.platform_data
-                       = &tegra_hsic_pdata;
-               platform_device_register(&tegra_bb_oem1);
+               }
+               if (!(usb_port_owner_info & HSIC2_PORT_OWNER_XUSB)) {
+                       tegra_hsic_pdata.ops = &oem1_hsic_pops;
+                       tegra_ehci3_device.dev.platform_data
+                               = &tegra_hsic_pdata;
+                       platform_device_register(&tegra_bb_oem1);
+               }
+               break;
+       case TEGRA_BB_OEM2: /* XMM6260/XMM6360 HSIC */
+               /* fix wrong wiring in Pluto A02 */
+               if ((board_info.board_id == BOARD_E1580) &&
+                       (board_info.fab == BOARD_FAB_A02)) {
+                       pr_info(
+"%s: Pluto A02: replace MDM2_PWR_ON with MDM2_PWR_ON_FOR_PLUTO_A02\n",
+                               __func__);
+                       if (tegra_baseband_xmm_power_data.modem.xmm.bb_on
+                               != MDM2_PWR_ON)
+                               pr_err(
+"%s: expected MDM2_PWR_ON default gpio for XMM bb_on\n",
+                                       __func__);
+                       tegra_baseband_xmm_power_data.modem.xmm.bb_on
+                               = MDM2_PWR_ON_FOR_PLUTO_A02;
+               }
+               /* baseband-power.ko will register ehci3 device */
+               tegra_hsic_pdata.ops = &oem2_plat_ops;
+               tegra_hsic_pdata.u_data.host.remote_wakeup_supported = false;
+               tegra_hsic_pdata.u_data.host.power_off_on_suspend = false;
+               tegra_ehci3_device.dev.platform_data =
+                                       &tegra_hsic_pdata;
+               tegra_baseband_xmm_power_data.hsic_register =
+                                               &tegra_usb_hsic_host_register;
+               tegra_baseband_xmm_power_data.hsic_unregister =
+                                               &tegra_usb_hsic_host_unregister;
+               tegra_baseband_xmm_power_data.ehci_device =
+                                       &tegra_ehci3_device;
+               platform_device_register(&tegra_baseband_xmm_power_device);
+               platform_device_register(&tegra_baseband_xmm_power2_device);
+               /* override audio settings - use 8kHz */
+               pluto_audio_pdata.i2s_param[BASEBAND].audio_port_id
+                       = pluto_aic3262_pdata.i2s_param[BASEBAND].audio_port_id
+                       = 2;
+               pluto_audio_pdata.i2s_param[BASEBAND].is_i2s_master
+                       = pluto_aic3262_pdata.i2s_param[BASEBAND].is_i2s_master
+                       = 1;
+               pluto_audio_pdata.i2s_param[BASEBAND].i2s_mode
+                       = pluto_aic3262_pdata.i2s_param[BASEBAND].i2s_mode
+                       = TEGRA_DAIFMT_I2S;
+               pluto_audio_pdata.i2s_param[BASEBAND].sample_size
+                       = pluto_aic3262_pdata.i2s_param[BASEBAND].sample_size
+                       = 16;
+               pluto_audio_pdata.i2s_param[BASEBAND].rate
+                       = pluto_aic3262_pdata.i2s_param[BASEBAND].rate
+                       = 8000;
+               pluto_audio_pdata.i2s_param[BASEBAND].channels
+                       = pluto_aic3262_pdata.i2s_param[BASEBAND].channels
+                       = 2;
+               break;
+       case TEGRA_BB_HSIC_HUB: /* HSIC hub */
+               if (!(usb_port_owner_info & HSIC2_PORT_OWNER_XUSB)) {
+                       tegra_ehci3_device.dev.platform_data =
+                               &tegra_ehci3_hsic_smsc_hub_pdata;
+                       platform_device_register(&tegra_ehci3_device);
+               }
                break;
-#endif
        default:
                return;
        }
 }
 
+static struct tegra_xusb_board_data xusb_bdata = {
+       .portmap = TEGRA_XUSB_SS_P0 | TEGRA_XUSB_USB2_P0,
+       /* ss_portmap[0:3] = SS0 map, ss_portmap[4:7] = SS1 map */
+       .ss_portmap = (TEGRA_XUSB_SS_PORT_MAP_USB2_P0 << 0),
+};
+
+static void pluto_xusb_init(void)
+{
+       int usb_port_owner_info = tegra_get_usb_port_owner_info();
+
+       if (usb_port_owner_info & UTMI1_PORT_OWNER_XUSB)
+               tegra_xusb_init(&xusb_bdata);
+}
 #else
 static void pluto_usb_init(void) { }
 static void pluto_modem_init(void) { }
+static void pluto_xusb_init(void) { }
 #endif
 
 static void pluto_audio_init(void)
@@ -832,56 +1159,37 @@ static void pluto_audio_init(void)
 
        tegra_get_board_info(&board_info);
 
-       pluto_audio_pdata.codec_name = "cs42l73.0-004a";
-       pluto_audio_pdata.codec_dai_name = "cs42l73-vsp";
+       spi_register_board_info(aic326x_spi_board_info,
+                                       ARRAY_SIZE(aic326x_spi_board_info));
 }
 
+#ifndef CONFIG_USE_OF
 static struct platform_device *pluto_spi_devices[] __initdata = {
         &tegra11_spi_device4,
 };
 
-struct spi_clk_parent spi_parent_clk_pluto[] = {
-        [0] = {.name = "pll_p"},
-#ifndef CONFIG_TEGRA_PLLM_RESTRICTED
-        [1] = {.name = "pll_m"},
-        [2] = {.name = "clk_m"},
-#else
-        [1] = {.name = "clk_m"},
-#endif
-};
-
 static struct tegra_spi_platform_data pluto_spi_pdata = {
-       .is_dma_based           = false,
-       .max_dma_buffer         = 16 * 1024,
-        .is_clkon_always        = false,
-        .max_rate               = 25000000,
+       .dma_req_sel            = 0,
+       .spi_max_frequency      = 25000000,
+       .clock_always_on        = false,
 };
 
 static void __init pluto_spi_init(void)
 {
-        int i;
-        struct clk *c;
         struct board_info board_info, display_board_info;
 
         tegra_get_board_info(&board_info);
         tegra_get_display_board_info(&display_board_info);
 
-        for (i = 0; i < ARRAY_SIZE(spi_parent_clk_pluto); ++i) {
-                c = tegra_get_clock_by_name(spi_parent_clk_pluto[i].name);
-                if (IS_ERR_OR_NULL(c)) {
-                        pr_err("Not able to get the clock for %s\n",
-                                                spi_parent_clk_pluto[i].name);
-                        continue;
-                }
-                spi_parent_clk_pluto[i].parent_clk = c;
-                spi_parent_clk_pluto[i].fixed_clk_rate = clk_get_rate(c);
-        }
-        pluto_spi_pdata.parent_clk_list = spi_parent_clk_pluto;
-        pluto_spi_pdata.parent_clk_count = ARRAY_SIZE(spi_parent_clk_pluto);
        tegra11_spi_device4.dev.platform_data = &pluto_spi_pdata;
         platform_add_devices(pluto_spi_devices,
                                 ARRAY_SIZE(pluto_spi_devices));
 }
+#else
+static void __init pluto_spi_init(void)
+{
+}
+#endif
 
 static __initdata struct tegra_clk_init_table touch_clk_init_table[] = {
        /* name         parent          rate            enabled */
@@ -891,10 +1199,11 @@ static __initdata struct tegra_clk_init_table touch_clk_init_table[] = {
 };
 
 struct rm_spi_ts_platform_data rm31080ts_pluto_data = {
-       .gpio_reset = 0,
+       .gpio_reset = TOUCH_GPIO_RST_RAYDIUM_SPI,
        .config = 0,
        .platform_id = RM_PLATFORM_P005,
        .name_of_clock = "clk_out_2",
+       .name_of_clock_con = "extern2",
 };
 
 static struct tegra_spi_device_controller_data dev_cdata = {
@@ -914,31 +1223,125 @@ struct spi_board_info rm31080a_pluto_spi_board[1] = {
         },
 };
 
+static struct synaptics_gpio_data synaptics_gpio_pluto_data = {
+       .attn_gpio = SYNAPTICS_ATTN_GPIO,
+       .attn_polarity = RMI_ATTN_ACTIVE_LOW,
+       .reset_gpio = SYNAPTICS_RESET_GPIO,
+};
+
+static struct rmi_device_platform_data synaptics_pluto_platformdata = {
+       .sensor_name   = "TM9999",
+       .attn_gpio     = SYNAPTICS_ATTN_GPIO,
+       .attn_polarity = RMI_ATTN_ACTIVE_LOW,
+       .gpio_data     = &synaptics_gpio_pluto_data,
+       .gpio_config   = synaptics_touchpad_gpio_setup,
+       .spi_data = {
+               .block_delay_us = 100,
+               .read_delay_us = 100,
+               .write_delay_us = 20,
+       },
+       .power_management = {
+               .nosleep = RMI_F01_NOSLEEP_OFF,
+       },
+       .f19_button_map = &synaptics_button_map,
+       .f54_direct_touch_report_size = 944,
+};
+
+static struct spi_board_info synaptics_9999_spi_board_pluto[] = {
+       {
+               .modalias = "rmi_spi",
+               .bus_num = 3,
+               .chip_select = 2,
+               .max_speed_hz = 8*1000*1000,
+               .mode = SPI_MODE_3,
+               .platform_data = &synaptics_pluto_platformdata,
+       },
+};
+
 static int __init pluto_touch_init(void)
 {
        tegra_clk_init_from_table(touch_clk_init_table);
-       clk_enable(tegra_get_clock_by_name("clk_out_2"));
-       mdelay(20);
-       rm31080a_pluto_spi_board[0].irq = gpio_to_irq(TOUCH_GPIO_IRQ_RAYDIUM_SPI);
-       touch_init_raydium(TOUCH_GPIO_IRQ_RAYDIUM_SPI,
-                               TOUCH_GPIO_RST_RAYDIUM_SPI,
-                               &rm31080ts_pluto_data,
-                               &rm31080a_pluto_spi_board[0],
-                               ARRAY_SIZE(rm31080a_pluto_spi_board));
+       if (tegra_get_touch_vendor_id() == RAYDIUM_TOUCH) {
+               pr_info("%s: initializing raydium\n", __func__);
+               rm31080a_pluto_spi_board[0].irq =
+                       gpio_to_irq(TOUCH_GPIO_IRQ_RAYDIUM_SPI);
+               touch_init_raydium(TOUCH_GPIO_IRQ_RAYDIUM_SPI,
+                                       TOUCH_GPIO_RST_RAYDIUM_SPI,
+                                       &rm31080ts_pluto_data,
+                                       &rm31080a_pluto_spi_board[0],
+                                       ARRAY_SIZE(rm31080a_pluto_spi_board));
+       } else {
+               pr_info("%s: initializing synaptics\n", __func__);
+               touch_init_synaptics(synaptics_9999_spi_board_pluto,
+                               ARRAY_SIZE(synaptics_9999_spi_board_pluto));
+       }
        return 0;
 }
 
-static void __init tegra_pluto_init(void)
+#ifdef CONFIG_USE_OF
+struct of_dev_auxdata pluto_auxdata_lookup[] __initdata = {
+       OF_DEV_AUXDATA("nvidia,tegra114-apbdma", 0x6000a000, "tegra-dma", NULL),
+       OF_DEV_AUXDATA("nvidia,tegra114-sdhci", 0x78000600, "sdhci-tegra.3",
+                               NULL),
+       OF_DEV_AUXDATA("nvidia,tegra114-sdhci", 0x78000400, "sdhci-tegra.2",
+                               NULL),
+       OF_DEV_AUXDATA("nvidia,tegra114-sdhci", 0x78000000, "sdhci-tegra.0",
+                               &pluto_tegra_sdhci_platform_data0),
+       OF_DEV_AUXDATA("nvidia,tegra114-camera", 0x0, "tegra_camera",
+                               NULL),
+       OF_DEV_AUXDATA("nvidia,tegra114-host1x", TEGRA_HOST1X_BASE, "host1x",
+                               NULL),
+       OF_DEV_AUXDATA("nvidia,tegra114-gr3d", TEGRA_GR3D_BASE, "gr3d",
+                               NULL),
+       OF_DEV_AUXDATA("nvidia,tegra114-gr2d", TEGRA_GR2D_BASE, "gr2d",
+                               NULL),
+       OF_DEV_AUXDATA("nvidia,tegra114-msenc", TEGRA_MSENC_BASE, "msenc",
+                               NULL),
+       OF_DEV_AUXDATA("nvidia,tegra114-vi", TEGRA_VI_BASE, "vi",
+                               NULL),
+       OF_DEV_AUXDATA("nvidia,tegra114-isp", TEGRA_ISP_BASE, "isp",
+                               NULL),
+       OF_DEV_AUXDATA("nvidia,tegra114-tsec", TEGRA_TSEC_BASE, "tsec",
+                               NULL),
+       OF_DEV_AUXDATA("nvidia,tegra114-i2c", 0x7000c500, "tegra11-i2c.2",
+                               NULL),
+       OF_DEV_AUXDATA("nvidia,tegra114-spi", 0x7000d400, "spi-tegra114.0",
+                               NULL),
+       OF_DEV_AUXDATA("nvidia,tegra114-spi", 0x7000d600, "spi-tegra114.1",
+                               NULL),
+       OF_DEV_AUXDATA("nvidia,tegra114-spi", 0x7000d800, "spi-tegra114.2",
+                               NULL),
+       OF_DEV_AUXDATA("nvidia,tegra114-spi", 0x7000da00, "spi-tegra114.3",
+                               NULL),
+       OF_DEV_AUXDATA("nvidia,tegra114-spi", 0x7000dc00, "spi-tegra114.4",
+                               NULL),
+       OF_DEV_AUXDATA("nvidia,tegra114-spi", 0x7000de00, "spi-tegra114.5",
+                               NULL),
+       {}
+};
+#endif
+
+static void __init pluto_dtv_init(void)
+{
+       platform_device_register(&tegra_dtv_device);
+}
+
+static void __init tegra_pluto_early_init(void)
 {
-       tegra_battery_edp_init(3250);
+       pluto_sysedp_init();
        tegra_clk_init_from_table(pluto_clk_init_table);
+       tegra_clk_verify_parents();
        tegra_soc_device_init("tegra_pluto");
-       tegra_enable_pinmux();
+}
+
+static void __init tegra_pluto_late_init(void)
+{
+       platform_device_register(&tegra_pinmux_device);
        pluto_pinmux_init();
        pluto_i2c_init();
        pluto_spi_init();
        pluto_usb_init();
-       pluto_edp_init();
+       pluto_xusb_init();
        pluto_uart_init();
        pluto_audio_init();
        platform_add_devices(pluto_devices, ARRAY_SIZE(pluto_devices));
@@ -946,14 +1349,21 @@ static void __init tegra_pluto_init(void)
        tegra_io_dpd_init();
        pluto_sdhci_init();
        pluto_regulator_init();
+       pluto_dtv_init();
        pluto_suspend_init();
        pluto_touch_init();
        pluto_emc_init();
+       pluto_edp_init();
+       isomgr_init();
        pluto_panel_init();
        pluto_pmon_init();
        pluto_kbc_init();
+#ifdef CONFIG_BT_BLUESLEEP
        pluto_setup_bluesleep();
        pluto_setup_bt_rfkill();
+#elif defined CONFIG_BLUEDROID_PM
+       pluto_setup_bluedroid_pm();
+#endif
        tegra_release_bootloader_fb();
        pluto_modem_init();
 #ifdef CONFIG_TEGRA_WDT_RECOVERY
@@ -962,6 +1372,9 @@ static void __init tegra_pluto_init(void)
        pluto_sensors_init();
        tegra_serial_debug_init(TEGRA_UARTD_BASE, INT_WDT_CPU, NULL, -1, -1);
        pluto_soctherm_init();
+       tegra_register_fuse();
+       pluto_sysedp_core_init();
+       pluto_sysedp_psydepl_init();
 }
 
 static void __init pluto_ramconsole_reserve(unsigned long size)
@@ -971,10 +1384,13 @@ static void __init pluto_ramconsole_reserve(unsigned long size)
 
 static void __init tegra_pluto_dt_init(void)
 {
-       tegra_pluto_init();
+       tegra_pluto_early_init();
 
        of_platform_populate(NULL,
-               of_default_bus_match_table, NULL, NULL);
+               of_default_bus_match_table, pluto_auxdata_lookup,
+               &platform_bus);
+
+       tegra_pluto_late_init();
 }
 
 static void __init tegra_pluto_reserve(void)
@@ -998,14 +1414,9 @@ MACHINE_START(TEGRA_PLUTO, "tegra_pluto")
        .smp            = smp_ops(tegra_smp_ops),
        .map_io         = tegra_map_common_io,
        .reserve        = tegra_pluto_reserve,
-#ifdef CONFIG_ARCH_TEGRA_3x_SOC
-       .init_early     = tegra30_init_early,
-#else
        .init_early     = tegra11x_init_early,
-#endif
-       .init_irq       = tegra_init_irq,
-       .handle_irq     = gic_handle_irq,
-       .timer          = &tegra_timer,
+       .init_irq       = tegra_dt_init_irq,
+       .init_time      = tegra_init_timer,
        .init_machine   = tegra_pluto_dt_init,
        .restart        = tegra_assert_system_reset,
        .dt_compat      = pluto_dt_board_compat,