ARM: tegra: Check regulator_enable return values
[linux-3.10.git] / arch / arm / mach-tegra / board-pluto.c
index 918046b..54ccf4b 100644 (file)
@@ -53,8 +53,6 @@
 #include <linux/mfd/tlv320aic3xxx-core.h>
 #include <linux/usb/tegra_usb_phy.h>
 
-#include <asm/hardware/gic.h>
-
 #include <mach/clk.h>
 #include <mach/irqs.h>
 #include <mach/pinmux.h>
@@ -878,10 +876,12 @@ 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,
@@ -1261,7 +1261,7 @@ static struct spi_board_info synaptics_9999_spi_board_pluto[] = {
 static int __init pluto_touch_init(void)
 {
        tegra_clk_init_from_table(touch_clk_init_table);
-       if (tegra_get_touch_id() == RAYDIUM_TOUCH) {
+       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);
@@ -1416,8 +1416,7 @@ MACHINE_START(TEGRA_PLUTO, "tegra_pluto")
        .reserve        = tegra_pluto_reserve,
        .init_early     = tegra11x_init_early,
        .init_irq       = tegra_dt_init_irq,
-       .handle_irq     = gic_handle_irq,
-       .timer          = &tegra_sys_timer,
+       .init_time      = tegra_init_timer,
        .init_machine   = tegra_pluto_dt_init,
        .restart        = tegra_assert_system_reset,
        .dt_compat      = pluto_dt_board_compat,