diff options
author | Laxman Dewangan <ldewangan@nvidia.com> | 2011-09-14 12:22:34 +0530 |
---|---|---|
committer | Varun Colbert <vcolbert@nvidia.com> | 2011-09-14 17:11:55 -0700 |
commit | 828f6940cc2c3ed160b5528fdbe9763c9cde5fb7 (patch) | |
tree | 0bd5005c610ed38d9f7687a64b040fd5ecae5ad7 | |
parent | 61151365f2d905e25378334e71b9eda69a748ce2 (diff) |
arm: tegra: cardhu: Support for E1257
Adding support for E1257 platform.
bug 864294
Reviewed-on: http://git-master/r/50662
(cherry picked from commit 8217615021a6ffeb992327f6b010ea9deebc34e7)
Change-Id: If1420f39ba5a6f724dd09b46881ba145cc784a0a
Reviewed-on: http://git-master/r/52258
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
-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-pm299-power-rails.c | 3 | ||||
-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 | 3 | ||||
-rw-r--r-- | arch/arm/mach-tegra/board-cardhu.h | 1 |
10 files changed, 19 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu-kbc.c b/arch/arm/mach-tegra/board-cardhu-kbc.c index 7ed354b6fcd5..94d52f1a3f15 100644 --- a/arch/arm/mach-tegra/board-cardhu-kbc.c +++ b/arch/arm/mach-tegra/board-cardhu-kbc.c @@ -113,6 +113,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; @@ -237,6 +238,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))) @@ -260,6 +262,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 fe1d9e286387..4e23164e976c 100644 --- a/arch/arm/mach-tegra/board-cardhu-panel.c +++ b/arch/arm/mach-tegra/board-cardhu-panel.c @@ -303,6 +303,7 @@ static int cardhu_panel_enable(void) gpio_set_value(pm313_lvds_shutdown, 1); } else if ((display_board_info.board_id == BOARD_DISPLAY_E1247 && 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(e1247_pm269_lvds_shutdown, 1); @@ -330,6 +331,7 @@ static int cardhu_panel_disable(void) gpio_set_value(pm313_lvds_shutdown, 0); } else if ((display_board_info.board_id == BOARD_DISPLAY_E1247 && 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(e1247_pm269_lvds_shutdown, 0); @@ -1131,6 +1133,7 @@ int __init cardhu_panel_init(void) #endif } else if ((display_board_info.board_id == BOARD_DISPLAY_E1247 && 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(e1247_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 2e9d859ff352..d4bbf3a8829d 100644 --- a/arch/arm/mach-tegra/board-cardhu-pinmux.c +++ b/arch/arm/mach-tegra/board-cardhu-pinmux.c @@ -566,6 +566,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, @@ -685,6 +686,7 @@ int __init cardhu_pins_state_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)) { set_unused_pin_gpio(&vddio_gmi_pins_pm269[0], diff --git a/arch/arm/mach-tegra/board-cardhu-pm299-power-rails.c b/arch/arm/mach-tegra/board-cardhu-pm299-power-rails.c index 5c92c217b8ca..88bab763e447 100644 --- a/arch/arm/mach-tegra/board-cardhu-pm299-power-rails.c +++ b/arch/arm/mach-tegra/board-cardhu-pm299-power-rails.c @@ -680,6 +680,9 @@ int __init cardhu_pm299_gpio_switch_regulator_init(void) switch (board_info.board_id) { 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; diff --git a/arch/arm/mach-tegra/board-cardhu-power.c b/arch/arm/mach-tegra/board-cardhu-power.c index 1297353b0fcc..f780e31c2160 100644 --- a/arch/arm/mach-tegra/board-cardhu-power.c +++ b/arch/arm/mach-tegra/board-cardhu-power.c @@ -989,6 +989,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; if (display_board_info.board_id == BOARD_DISPLAY_PM313) { @@ -1082,6 +1083,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 949f29909280..db31fc29dd4d 100644 --- a/arch/arm/mach-tegra/board-cardhu-sdhci.c +++ b/arch/arm/mach-tegra/board-cardhu-sdhci.c @@ -342,6 +342,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 3e52e86cac84..2ab8d3483855 100644 --- a/arch/arm/mach-tegra/board-cardhu-sensors.c +++ b/arch/arm/mach-tegra/board-cardhu-sensors.c @@ -593,6 +593,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 ceeace19a026..51b75f634289 100644 --- a/arch/arm/mach-tegra/board-cardhu.c +++ b/arch/arm/mach-tegra/board-cardhu.c @@ -581,7 +581,8 @@ static void __init uart_debug_init(void) ((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)) debug_port_id = 1; } switch (debug_port_id) { diff --git a/arch/arm/mach-tegra/board-cardhu.h b/arch/arm/mach-tegra/board-cardhu.h index b41bd68619b3..89c87d1e2e34 100644 --- a/arch/arm/mach-tegra/board-cardhu.h +++ b/arch/arm/mach-tegra/board-cardhu.h @@ -31,6 +31,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 |