p2360: Add ina220 device

bug 200141952

Change-Id: I39d886c97d9cc378c994683a479658176baf996d
Signed-off-by: Vipin Kumar <vipink@nvidia.com>
Reviewed-on: http://git-master/r/818630
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

diff --git a/arch/arm/configs/tegra_p2360_gnu_linux_defconfig b/arch/arm/configs/tegra_p2360_gnu_linux_defconfig
index 75dc47a2e052daa24eaf30e68980345c09c8e7cc..15fbab5905bc7d1d44cfe8e4964a92b1dcb045c2 100644 (file)
--- a/arch/arm/configs/tegra_p2360_gnu_linux_defconfig
+++ b/arch/arm/configs/tegra_p2360_gnu_linux_defconfig
@@ -226,6 +226,7 @@ CONFIG_PINCTRL_MAX77620=y
 CONFIG_DEBUG_GPIO=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_MAX77620=y
+CONFIG_SENSORS_INA2XX=y
 CONFIG_SENSORS_TMON_TMP411=y
 # CONFIG_THERMAL_OF is not set
 CONFIG_THERMAL_GOV_PID=y

diff --git a/arch/arm/configs/tegra_p2360_gnu_linux_minimal_defconfig b/arch/arm/configs/tegra_p2360_gnu_linux_minimal_defconfig
index 25f6e2e585ddc0f8a58632090360f28038d9aeef..d965026ed8c8f13ca6b2731826b25c94a303a045 100644 (file)
--- a/arch/arm/configs/tegra_p2360_gnu_linux_minimal_defconfig
+++ b/arch/arm/configs/tegra_p2360_gnu_linux_minimal_defconfig
@@ -119,6 +119,7 @@ CONFIG_PINCTRL_MAX77620=y
 CONFIG_DEBUG_GPIO=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_MAX77620=y
+CONFIG_SENSORS_INA2XX=y
 CONFIG_SENSORS_TMON_TMP411=y
 # CONFIG_THERMAL_OF is not set
 CONFIG_THERMAL_GOV_PID=y

diff --git a/arch/arm/mach-tegra/board-p2360.c b/arch/arm/mach-tegra/board-p2360.c
index e0ac5cf25453f14775f2c3145c7d415bde8f3389..24e4ba3d5c987e8c7cf4c8fd04afa648fcf448e4 100644 (file)
--- a/arch/arm/mach-tegra/board-p2360.c
+++ b/arch/arm/mach-tegra/board-p2360.c
@@ -121,6 +121,13 @@ static void __init tegra_p2360_early_init(void)
        tegra_soc_device_init("p2360");
 }
 
+/* ina220 is @0x40 on i2c-1 */
+struct i2c_board_info __initdata p2360_ina220_info = {
+       .type = "ina220",
+       .addr = 0x40,
+       .platform_data = NULL,
+};
+
 static void __init tegra_p2360_late_init(void)
 {
        /* Create procfs entries for board_serial, skuinfo etc */
@@ -135,6 +142,7 @@ static void __init tegra_p2360_late_init(void)
 
        isomgr_init();
        p2360_panel_init();
+       i2c_register_board_info(1, &p2360_ina220_info, 1);
 }
 
 static void __init tegra_p2360_dt_init(void)