arm: tegra: cardhu: modify cardhu board files
Darbha Sriharsha [Wed, 3 Apr 2013 04:31:59 +0000 (09:31 +0530)]
This change is intended to add a few 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: I1df7b7f777014610e4d64695d89324808ea4f266
Signed-off-by: Darbha Sriharsha <dsriharsha@nvidia.com>
Reviewed-on: http://git-master/r/215983
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Matthew Pedro <mapedro@nvidia.com>
Reviewed-by: Ramalingam C <ramalingamc@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>

arch/arm/mach-tegra/board-cardhu-powermon.c
arch/arm/mach-tegra/board-cardhu-sensors.c

index 823cddb..bffd51b 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * arch/arm/mach-tegra/board-cardhu-powermon.c
  *
- * Copyright (c) 2011, NVIDIA, All Rights Reserved.
+ * Copyright (c) 2011-2013, NVIDIA, All Rights Reserved.
  *
  * 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
@@ -249,7 +249,7 @@ int __init cardhu_pmon_init(void)
                        &power_mon_info[VDD_CORE_IN];
        }
 
-       if (bi.board_id != BOARD_PM269) {
+       if (bi.board_id != BOARD_PM269 && bi.board_id != BOARD_PM315) {
                i2c_register_board_info(0, cardhu_i2c0_ina219_board_info,
                        ARRAY_SIZE(cardhu_i2c0_ina219_board_info));
        }
index 59e1fa3..d9c569b 100644 (file)
@@ -1153,10 +1153,10 @@ int __init cardhu_sensors_init(void)
        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));
+               i2c_register_board_info(2, cardhu_i2c_board_info_tps61050,
+                       ARRAY_SIZE(cardhu_i2c_board_info_tps61050));
+       }
 
 #ifdef CONFIG_VIDEO_OV14810
        /* This is disabled by default; To enable this change Kconfig;