diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2011-07-11 18:22:39 +0530 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-07-12 19:01:04 -0700 |
| commit | b3ee516161a4918a1f687821ae4439c7d539bbb4 (patch) | |
| tree | ea4d0bc6a14d7bba98eaacc3dc2ae73694d381b8 /arch | |
| parent | 07cd137fd23f3571586f18edf2f9ae49d11b7e85 (diff) | |
arm: tegra: cardhu: Add support for the E1256
Adding support for the E1256. The configuration is
same as the E1186 board.
bug 849990
Change-Id: Idd89e282627b2f0924fc313a5ba28f9e9a6032be
Reviewed-on: http://git-master/r/40367
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu-power.c | 7 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu-sensors.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu.h | 1 |
4 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu-power.c b/arch/arm/mach-tegra/board-cardhu-power.c index b1fab60524a2..e9328616646f 100644 --- a/arch/arm/mach-tegra/board-cardhu-power.c +++ b/arch/arm/mach-tegra/board-cardhu-power.c @@ -693,7 +693,7 @@ GREG_INIT(17, en_vddio_vid_oc_pm269, en_vddio_vid_oc, "master_5v_switch", 0, 0, TEGRA_GPIO_PP2, false, 0, TEGRA_PINGROUP_DAP3_DOUT, enable_load_switch_rail, disable_load_switch_rail); -/* Specific to E1187/E1186 */ +/* Specific to E1187/E1186/E1256 */ GREG_INIT(14, dis_5v_switch_e118x, dis_5v_switch, "vdd_5v0_sys", 0, 0, TEGRA_GPIO_PX2, true, 0, 0, 0, 0); GREG_INIT(15, en_usb1_vbus_oc_e118x, en_usb1_vbus_oc, "master_5v_switch", @@ -813,9 +813,7 @@ GREG_INIT(22, en_vbrtr, en_vbrtr, "vdd_3v3_devices", 0, 0, PMU_TCA641 ADD_GPIO_REG(en_vdd_bl1_a03), \ ADD_GPIO_REG(en_vdd_bl2_a03), -/* Gpio switch regulator platform data for E1186/E1187*/ - -/* Gpio switch regulator platform data for E1186/E1187*/ +/* Gpio switch regulator platform data for E1186/E1187/E1256*/ static struct gpio_switch_regulator_subdev_data *gswitch_subdevs_e118x[] = { COMMON_GPIO_REG E118x_GPIO_REG @@ -946,6 +944,7 @@ int __init cardhu_suspend_init(void) break; case BOARD_E1187: case BOARD_E1186: + case BOARD_E1256: cardhu_suspend_data.cpu_timer = 5000; cardhu_suspend_data.cpu_off_timer = 5000; break; diff --git a/arch/arm/mach-tegra/board-cardhu-sensors.c b/arch/arm/mach-tegra/board-cardhu-sensors.c index 1167541d21ae..8e29cd48027d 100644 --- a/arch/arm/mach-tegra/board-cardhu-sensors.c +++ b/arch/arm/mach-tegra/board-cardhu-sensors.c @@ -567,7 +567,8 @@ static int cardhu_nct1008_init(void) (board_info.board_id == BOARD_E1291)) { nct1008_port = TEGRA_GPIO_PCC2; } else if ((board_info.board_id == BOARD_E1186) || - (board_info.board_id == BOARD_E1187)) { + (board_info.board_id == BOARD_E1187) || + (board_info.board_id == BOARD_E1256)) { /* FIXME: seems to be conflicting with usb3 vbus on E1186 */ /* nct1008_port = TEGRA_GPIO_PH7; */ } diff --git a/arch/arm/mach-tegra/board-cardhu.c b/arch/arm/mach-tegra/board-cardhu.c index a8dde44960d9..490cc6981085 100644 --- a/arch/arm/mach-tegra/board-cardhu.c +++ b/arch/arm/mach-tegra/board-cardhu.c @@ -471,6 +471,7 @@ static void __init uart_debug_init(void) if (board_info.sku & SKU_SLT_ULPI_SUPPORT) { if ((board_info.board_id == BOARD_E1186) || (board_info.board_id == BOARD_E1187) || + (board_info.board_id == BOARD_E1256) || (board_info.board_id == BOARD_PM269)) { /* UARTB is the debug port. */ pr_info("Selecting UARTB as the debug console\n"); @@ -701,7 +702,7 @@ static void cardhu_usb_init(void) PM267_SMSC4640_HSIC_HUB_RESET_GPIO; tegra_ehci2_device.dev.platform_data = &tegra_ehci_uhsic_pdata; } else if ((bi.board_id == BOARD_PM269) || - (bi.board_id == BOARD_E1186)) { + (bi.board_id == BOARD_E1186) || (bi.board_id == BOARD_E1256)) { tegra_ehci2_device.dev.platform_data = &tegra_ehci_uhsic_pdata; } else { tegra_ehci2_device.dev.platform_data = &tegra_ehci_pdata[1]; diff --git a/arch/arm/mach-tegra/board-cardhu.h b/arch/arm/mach-tegra/board-cardhu.h index 26e1abe7f774..4e0e33105293 100644 --- a/arch/arm/mach-tegra/board-cardhu.h +++ b/arch/arm/mach-tegra/board-cardhu.h @@ -29,6 +29,7 @@ #define BOARD_E1187 0x0B57 #define BOARD_E1186 0x0B56 #define BOARD_E1198 0x0B62 +#define BOARD_E1256 0x0C38 #define BOARD_E1291 0x0C5B #define BOARD_PM267 0x0243 #define BOARD_PM269 0x0245 |