diff options
-rw-r--r-- | arch/arm/mach-tegra/board-ardbeg.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/arch/arm/mach-tegra/board-ardbeg.c b/arch/arm/mach-tegra/board-ardbeg.c index 46c4d3f338e1..2bf5cc4f4965 100644 --- a/arch/arm/mach-tegra/board-ardbeg.c +++ b/arch/arm/mach-tegra/board-ardbeg.c @@ -1156,7 +1156,7 @@ static int __init ardbeg_touch_init(void) if (board_info.fab >= 0xa3) { rm31080ts_t132loki_data.name_of_clock = NULL; rm31080ts_t132loki_data.name_of_clock_con = NULL; - } else + } else { tegra_clk_init_from_table(touch_clk_init_table); rm31080a_ardbeg_spi_board[0].irq = gpio_to_irq(TOUCH_GPIO_IRQ_RAYDIUM_SPI); @@ -1165,6 +1165,7 @@ static int __init ardbeg_touch_init(void) &rm31080ts_t132loki_data, &rm31080a_ardbeg_spi_board[0], ARRAY_SIZE(rm31080a_ardbeg_spi_board)); + } } else if (board_info.board_id == BOARD_P1761) { rm31080a_tn8_spi_board[0].irq = gpio_to_irq(TOUCH_GPIO_IRQ_RAYDIUM_SPI); @@ -1470,10 +1471,10 @@ static void __init tegra_ardbeg_late_init(void) else ardbeg_panel_init(); - /* put PEX pads into DPD mode to save additional power */ - tegra_io_dpd_enable(&pexbias_io); - tegra_io_dpd_enable(&pexclk1_io); - tegra_io_dpd_enable(&pexclk2_io); + /* put PEX pads into DPD mode to save additional power */ + tegra_io_dpd_enable(&pexbias_io); + tegra_io_dpd_enable(&pexclk1_io); + tegra_io_dpd_enable(&pexclk2_io); if (board_info.board_id == BOARD_E2548 || board_info.board_id == BOARD_P2530) @@ -1493,12 +1494,12 @@ static void __init tegra_ardbeg_late_init(void) board_info.board_id == BOARD_PM363) { ardbeg_sensors_init(); norrin_soctherm_init(); - } else if (board_info.board_id == BOARD_E2548 || + } else if (board_info.board_id == BOARD_E2548 || board_info.board_id == BOARD_P2530) { loki_sensors_init(); loki_fan_init(); loki_soctherm_init(); - } else { + } else { ardbeg_sensors_init(); ardbeg_soctherm_init(); } @@ -1605,10 +1606,12 @@ static const char * const bowmore_dt_board_compat[] = { NULL }; +#ifdef CONFIG_ARCH_TEGRA_13x_SOC static const char * const loki_dt_board_compat[] = { "nvidia,t132loki", NULL }; +#endif static const char * const jetson_dt_board_compat[] = { "nvidia,jetson-tk1", |