diff options
-rw-r--r-- | arch/arm/mach-tegra/board-cardhu-kbc.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-tegra/board-cardhu-memory.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-tegra/board-cardhu-panel.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-tegra/board-cardhu-pinmux.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-tegra/board-cardhu-power.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-tegra/board-cardhu-sdhci.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-tegra/board-cardhu-sensors.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-tegra/board-cardhu.c | 5 | ||||
-rw-r--r-- | arch/arm/mach-tegra/board-cardhu.h | 1 |
9 files changed, 17 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu-kbc.c b/arch/arm/mach-tegra/board-cardhu-kbc.c index 1408e5952222..bbdc013a3dc5 100644 --- a/arch/arm/mach-tegra/board-cardhu-kbc.c +++ b/arch/arm/mach-tegra/board-cardhu-kbc.c @@ -114,6 +114,7 @@ int __init cardhu_kbc_init(void) return 0; if ((board_info.board_id == BOARD_PM269) || + (board_info.board_id == BOARD_E1257) || (board_info.board_id == BOARD_PM305) || (board_info.board_id == BOARD_PM311)) { cardhu_kbc_platform_data.plain_keycode = plain_kbd_keycode_pm269; @@ -244,6 +245,7 @@ int __init cardhu_keys_init(void) tegra_get_board_info(&board_info); if (!((board_info.board_id == BOARD_E1198) || (board_info.board_id == BOARD_E1291) || + (board_info.board_id == BOARD_E1257) || (board_info.board_id == BOARD_PM305) || (board_info.board_id == BOARD_PM311) || (board_info.board_id == BOARD_PM269))) @@ -267,6 +269,7 @@ int __init cardhu_keys_init(void) /* Register on-key through pmu interrupt */ if ((board_info.board_id == BOARD_E1291) || + (board_info.board_id == BOARD_E1257) || (board_info.board_id == BOARD_PM305) || (board_info.board_id == BOARD_PM311) || (board_info.board_id == BOARD_PM269)) diff --git a/arch/arm/mach-tegra/board-cardhu-memory.c b/arch/arm/mach-tegra/board-cardhu-memory.c index 905c6f0ee72a..bf73e0b35846 100644 --- a/arch/arm/mach-tegra/board-cardhu-memory.c +++ b/arch/arm/mach-tegra/board-cardhu-memory.c @@ -2534,6 +2534,7 @@ int cardhu_emc_init(void) switch (board.board_id) { case BOARD_PM269: + case BOARD_E1257: if (MEMORY_TYPE(board.sku) == SKU_MEMORY_ELPIDA) tegra_init_emc(cardhu_emc_tables_edb8132b2ma, ARRAY_SIZE(cardhu_emc_tables_edb8132b2ma)); diff --git a/arch/arm/mach-tegra/board-cardhu-panel.c b/arch/arm/mach-tegra/board-cardhu-panel.c index 7597962066a5..57076cbb7bae 100644 --- a/arch/arm/mach-tegra/board-cardhu-panel.c +++ b/arch/arm/mach-tegra/board-cardhu-panel.c @@ -266,6 +266,7 @@ static int cardhu_panel_enable(void) regulator_enable(cardhu_lvds_vdd_panel); } if ((board_info.board_id == BOARD_PM269) || + (board_info.board_id == BOARD_E1257) || (board_info.board_id == BOARD_PM305) || (board_info.board_id == BOARD_PM311)) gpio_set_value(pm269_lvds_shutdown, 1); @@ -289,6 +290,7 @@ static int cardhu_panel_disable(void) regulator_put(cardhu_lvds_vdd_panel); cardhu_lvds_vdd_panel= NULL; if ((board_info.board_id == BOARD_PM269) || + (board_info.board_id == BOARD_E1257) || (board_info.board_id == BOARD_PM305) || (board_info.board_id == BOARD_PM311)) gpio_set_value(pm269_lvds_shutdown, 0); @@ -978,6 +980,7 @@ int __init cardhu_panel_init(void) } if ((board_info.board_id == BOARD_PM269) || + (board_info.board_id == BOARD_E1257) || (board_info.board_id == BOARD_PM305) || (board_info.board_id == BOARD_PM311)) { gpio_request(pm269_lvds_shutdown, "lvds_shutdown"); diff --git a/arch/arm/mach-tegra/board-cardhu-pinmux.c b/arch/arm/mach-tegra/board-cardhu-pinmux.c index 59e2e9715572..9e39f2a11218 100644 --- a/arch/arm/mach-tegra/board-cardhu-pinmux.c +++ b/arch/arm/mach-tegra/board-cardhu-pinmux.c @@ -553,6 +553,7 @@ int __init cardhu_pinmux_init(void) case BOARD_PM269: case BOARD_PM305: case BOARD_PM311: + case BOARD_E1257: tegra_pinmux_config_table(cardhu_pinmux_e118x, ARRAY_SIZE(cardhu_pinmux_e118x)); tegra_pinmux_config_table(unused_pins_lowpower, @@ -659,6 +660,7 @@ int __init cardhu_pins_state_init(void) ARRAY_SIZE(pin_lpm_cardhu_common)); if ((board_info.board_id == BOARD_PM269) || + (board_info.board_id == BOARD_E1257) || (board_info.board_id == BOARD_PM305) || (board_info.board_id == BOARD_PM311)) set_unused_pin_gpio(&vddio_gmi_pins_pm269[0], diff --git a/arch/arm/mach-tegra/board-cardhu-power.c b/arch/arm/mach-tegra/board-cardhu-power.c index aaab6188fd2f..75180a3f34d0 100644 --- a/arch/arm/mach-tegra/board-cardhu-power.c +++ b/arch/arm/mach-tegra/board-cardhu-power.c @@ -934,6 +934,7 @@ int __init cardhu_gpio_switch_regulator_init(void) case BOARD_PM269: case BOARD_PM305: case BOARD_PM311: + case BOARD_E1257: gswitch_pdata.num_subdevs = ARRAY_SIZE(gswitch_subdevs_pm269); gswitch_pdata.subdevs = gswitch_subdevs_pm269; break; @@ -1008,6 +1009,7 @@ int __init cardhu_suspend_init(void) case BOARD_E1187: case BOARD_E1186: case BOARD_E1256: + case BOARD_E1257: cardhu_suspend_data.cpu_timer = 5000; cardhu_suspend_data.cpu_off_timer = 5000; break; diff --git a/arch/arm/mach-tegra/board-cardhu-sdhci.c b/arch/arm/mach-tegra/board-cardhu-sdhci.c index 5ed56d90febe..10441c95d341 100644 --- a/arch/arm/mach-tegra/board-cardhu-sdhci.c +++ b/arch/arm/mach-tegra/board-cardhu-sdhci.c @@ -218,6 +218,7 @@ int __init cardhu_sdhci_init(void) struct board_info board_info; tegra_get_board_info(&board_info); if ((board_info.board_id == BOARD_PM269) || + (board_info.board_id == BOARD_E1257) || (board_info.board_id == BOARD_PM305) || (board_info.board_id == BOARD_PM311)) { tegra_sdhci_platform_data2.max_clk = 12000000; diff --git a/arch/arm/mach-tegra/board-cardhu-sensors.c b/arch/arm/mach-tegra/board-cardhu-sensors.c index 9a87e67c6bd8..128ff4684acd 100644 --- a/arch/arm/mach-tegra/board-cardhu-sensors.c +++ b/arch/arm/mach-tegra/board-cardhu-sensors.c @@ -587,6 +587,7 @@ static int cardhu_nct1008_init(void) if ((board_info.board_id == BOARD_E1198) || (board_info.board_id == BOARD_E1291) || + (board_info.board_id == BOARD_E1257) || (board_info.board_id == BOARD_PM269) || (board_info.board_id == BOARD_PM305) || (board_info.board_id == BOARD_PM311)) { diff --git a/arch/arm/mach-tegra/board-cardhu.c b/arch/arm/mach-tegra/board-cardhu.c index a6fb9e0bb722..5c95b8adf625 100644 --- a/arch/arm/mach-tegra/board-cardhu.c +++ b/arch/arm/mach-tegra/board-cardhu.c @@ -311,13 +311,14 @@ static void __init uart_debug_init(void) tegra_get_board_info(&board_info); /* UARTB is debug port * for SLT - E1186/E1187/PM269 - * for E1256 + * for E1256/E1257 */ if (((board_info.sku & SKU_SLT_ULPI_SUPPORT) && ((board_info.board_id == BOARD_E1186) || (board_info.board_id == BOARD_E1187) || (board_info.board_id == BOARD_PM269))) || - (board_info.board_id == BOARD_E1256)) { + (board_info.board_id == BOARD_E1256) || + (board_info.board_id == BOARD_E1257)) { /* UARTB is the debug port. */ pr_info("Selecting UARTB as the debug console\n"); cardhu_uart_devices[1] = &debug_uartb_device; diff --git a/arch/arm/mach-tegra/board-cardhu.h b/arch/arm/mach-tegra/board-cardhu.h index c414f9dfca97..e4b4d29132ab 100644 --- a/arch/arm/mach-tegra/board-cardhu.h +++ b/arch/arm/mach-tegra/board-cardhu.h @@ -30,6 +30,7 @@ #define BOARD_E1186 0x0B56 #define BOARD_E1198 0x0B62 #define BOARD_E1256 0x0C38 +#define BOARD_E1257 0x0C39 #define BOARD_E1291 0x0C5B #define BOARD_PM267 0x0243 #define BOARD_PM269 0x0245 |