diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2016-08-17 17:19:12 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2016-09-29 14:57:29 +0200 |
| commit | b5d6606fbe159f6c44878827911052960e8961a0 (patch) | |
| tree | e9f9fb58c7f61b7187e1718f39420616747129c8 | |
| parent | dfd109dca43faf395e40ba560b05c73a463ca34b (diff) | |
arm: tegra: ardbeg: fix gcc-6 compilation
arch/arm/mach-tegra/board-ardbeg.c: In function 'ardbeg_touch_init':
arch/arm/mach-tegra/board-ardbeg.c:1159:6: error: this 'else' clause
does not guard... [-Werror=misleading-indentation]
} else
^~~~
arch/arm/mach-tegra/board-ardbeg.c:1161:5: note: ...this statement, but
the latter is misleadingly indented as if it is guarded by the 'else'
rm31080a_ardbeg_spi_board[0].irq =
^~~~~~~~~~~~~~~~~~~~~~~~~
arch/arm/mach-tegra/board-ardbeg.c: In function 'tegra_ardbeg_late_init':
arch/arm/mach-tegra/board-ardbeg.c:1470:2: error: this 'else' clause
does not guard... [-Werror=misleading-indentation]
else
^~~~
arch/arm/mach-tegra/board-ardbeg.c:1474:3: note: ...this statement, but
the latter is misleadingly indented as if it is guarded by the 'else'
tegra_io_dpd_enable(&pexbias_io);
^~~~~~~~~~~~~~~~~~~
At top level:
arch/arm/mach-tegra/board-ardbeg.c:1608:27: error:
'loki_dt_board_compat' defined but not used
[-Werror=unused-const-variable=]
static const char * const loki_dt_board_compat[] = {
^~~~~~~~~~~~~~~~~~~~
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
| -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", |