diff options
| author | Darbha Sriharsha <dsriharsha@nvidia.com> | 2013-01-24 13:04:32 +0530 |
|---|---|---|
| committer | Matthew Pedro <mapedro@nvidia.com> | 2013-03-14 07:48:23 -0700 |
| commit | f07c2859fab5ca4dc1f833b3879cbbae32ce13fb (patch) | |
| tree | 5ca42420a1f811a4420cc34d27248b90362ae5a0 /arch | |
| parent | 00d87897aab16dc387bfbb21f53e8db391e78a78 (diff) | |
arm: tegra: cardhu: additions to cardhu board file
This change is intended to add modifications to
cardhu board file (which is also used for beaver)
to get rid of NACK errors occuring due to the absence
of certain hardware components on beaver
Bug 1217572
Change-Id: I36dfcda1b133c983ce25d56729505bce8b99fdf1
Signed-off-by: Darbha Sriharsha <dsriharsha@nvidia.com>
Reviewed-on: http://git-master/r/193667
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Matthew Pedro <mapedro@nvidia.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu-sensors.c | 14 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu.c | 9 |
2 files changed, 16 insertions, 7 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu-sensors.c b/arch/arm/mach-tegra/board-cardhu-sensors.c index 83ec4fc2f9cb..59e1fa392801 100644 --- a/arch/arm/mach-tegra/board-cardhu-sensors.c +++ b/arch/arm/mach-tegra/board-cardhu-sensors.c @@ -1,7 +1,7 @@ /* * arch/arm/mach-tegra/board-cardhu-sensors.c * - * Copyright (c) 2010-2012, NVIDIA CORPORATION, All rights reserved. + * Copyright (c) 2010-2013, NVIDIA CORPORATION, All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -995,7 +995,8 @@ static const struct i2c_board_info cardhu_i2c2_board_info_tca6416[] = { static int __init pmu_tca6416_init(void) { if ((board_info.board_id == BOARD_E1198) || - (board_info.board_id == BOARD_E1291)) + (board_info.board_id == BOARD_E1291) || + (board_info.board_id == BOARD_PM315)) return 0; pr_info("Registering pmu pca6416\n"); @@ -1009,7 +1010,8 @@ static int __init cam_tca6416_init(void) /* Boards E1198 and E1291 are of Cardhu personality * and donot have TCA6416 exp for camera */ if ((board_info.board_id == BOARD_E1198) || - (board_info.board_id == BOARD_E1291)) + (board_info.board_id == BOARD_E1291) || + (board_info.board_id == BOARD_PM315)) return 0; pr_info("Registering cam pca6416\n"); @@ -1148,8 +1150,10 @@ int __init cardhu_sensors_init(void) cardhu_camera_init(); cam_tca6416_init(); - i2c_register_board_info(2, cardhu_i2c3_board_info, - ARRAY_SIZE(cardhu_i2c3_board_info)); + if (board_info.board_id != BOARD_PM315) { + i2c_register_board_info(2, cardhu_i2c3_board_info, + ARRAY_SIZE(cardhu_i2c3_board_info)); + } i2c_register_board_info(2, cardhu_i2c_board_info_tps61050, ARRAY_SIZE(cardhu_i2c_board_info_tps61050)); diff --git a/arch/arm/mach-tegra/board-cardhu.c b/arch/arm/mach-tegra/board-cardhu.c index 4b03ddc03b7b..b6799dc5bc91 100644 --- a/arch/arm/mach-tegra/board-cardhu.c +++ b/arch/arm/mach-tegra/board-cardhu.c @@ -1,8 +1,8 @@ /* * arch/arm/mach-tegra/board-cardhu.c * - * Copyright (c) 2011-2012, NVIDIA Corporation. All rights reserved. - * Copyright (c) 2011-2012, NVIDIA Corporation. + * Copyright (c) 2011-2013, NVIDIA Corporation. All rights reserved. + * Copyright (c) 2011-2013, NVIDIA Corporation. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1057,6 +1057,11 @@ static int __init cardhu_touch_init(void) struct board_info BoardInfo, DisplayBoardInfo; tegra_get_board_info(&BoardInfo); + + /* Beaver board does not have any touch hardware*/ + if (BoardInfo.board_id == BOARD_PM315) + return 0; + tegra_get_display_board_info(&DisplayBoardInfo); if (DisplayBoardInfo.board_id == BOARD_DISPLAY_PM313) { tegra_clk_init_from_table(spi_clk_init_table); |