]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
ARM: tegra: move powermon to DT for Dalmore
authorLaxman Dewangan <ldewangan@nvidia.com>
Sun, 23 Feb 2014 06:46:48 +0000 (12:16 +0530)
committerLaxman Dewangan <ldewangan@nvidia.com>
Wed, 26 Feb 2014 12:32:12 +0000 (04:32 -0800)
Move all power monitor device registration for Dalmore to
DT. Following are change:
- Add dtsi file for Dalmore power mon.
- Add the dtsi file from the dalmore top level dtsi file.
- Delete the board powermon dts file.

bug 1369958

Change-Id: I47453b2fca491aeda6a0fd872986d90846927f6b
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/374017

arch/arm/boot/dts/tegra114-dalmore-e1611-1000-a00-00.dts
arch/arm/boot/dts/tegra114-dalmore-e1611-1001-a00-00.dts
arch/arm/boot/dts/tegra114-platforms/tegra114-dalmore-powermon.dtsi [new file with mode: 0644]
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/board-dalmore-powermon.c [deleted file]
arch/arm/mach-tegra/board-dalmore.c
arch/arm/mach-tegra/board-dalmore.h

index ae157a49a47938af92dd6abe47d00adaa6f02b33..21a8eee749e893be47a8d5c1b4e8b65edd2a0793 100644 (file)
@@ -3,6 +3,7 @@
 #include <tegra114-platforms/tegra114-dalmore-io-e1611.dtsi>
 #include <tegra114-platforms/tegra114-dalmore-e1611-gpio-default.dtsi>
 #include <tegra114-platforms/tegra114-dalmore-e1611-pinmux.dtsi>
+#include <tegra114-platforms/tegra114-dalmore-powermon.dtsi>
 
 / {
        model = "NVIDIA Tegra114 dalmore evaluation board";
index 120312326840b60ab0e6587cf090dc0037c35ef9..5ad53940935634ba60e40d52079605a489a3d3aa 100644 (file)
@@ -3,6 +3,7 @@
 #include <tegra114-platforms/tegra114-dalmore-io-e1611.dtsi>
 #include <tegra114-platforms/tegra114-dalmore-e1611-gpio-default.dtsi>
 #include <tegra114-platforms/tegra114-dalmore-e1611-pinmux.dtsi>
+#include <tegra114-platforms/tegra114-dalmore-powermon.dtsi>
 
 / {
        model = "NVIDIA Tegra114 dalmore evaluation board";
diff --git a/arch/arm/boot/dts/tegra114-platforms/tegra114-dalmore-powermon.dtsi b/arch/arm/boot/dts/tegra114-platforms/tegra114-dalmore-powermon.dtsi
new file mode 100644 (file)
index 0000000..3a2855e
--- /dev/null
@@ -0,0 +1,211 @@
+/ {
+       i2c@7000c400 {
+               ina219@40{
+                       compatible = "ina219x";
+                       reg = <0x40>;
+                       ti,rail-name = "VDD_12V_DCIN_RS";
+                       ti,continuous-config = <0x3FFF>;
+                       ti,trigger-config = <0x01DB>;
+                       ti,calibration-data = <0xAEC0>;
+                       ti,power-lsb = <1831>;
+                       ti,divisor = <20>;
+                       ti,shunt-resistor-mohm = <10>;
+                       ti,precision-multiplier = <1000>;
+               };
+
+               ina219@41{
+                       compatible = "ina219x";
+                       reg = <0x41>;
+                       ti,rail-name = "VDD_AC_BAT_VIN1";
+                       ti,continuous-config = <0x3FFF>;
+                       ti,trigger-config = <0x01DB>;
+                       ti,calibration-data = <0xFFFE>;
+                       ti,power-lsb = <1250>;
+                       ti,divisor = <20>;
+                       ti,shunt-resistor-mohm = <10>;
+                       ti,precision-multiplier = <1000>;
+               };
+
+               ina219@42{
+                       compatible = "ina219x";
+                       reg = <0x42>;
+                       ti,rail-name = "VDD_5V0_SYS";
+                       ti,continuous-config = <0x3FFF>;
+                       ti,trigger-config = <0x01DB>;
+                       ti,calibration-data = <0xFFFE>;
+                       ti,power-lsb = <2500>;
+                       ti,divisor = <20>;
+                       ti,shunt-resistor-mohm = <5>;
+                       ti,precision-multiplier = <1000>;
+               };
+
+               ina219@43{
+                       compatible = "ina219x";
+                       reg = <0x43>;
+                       ti,rail-name = "VDD_3V3_SYS";
+                       ti,continuous-config = <0x3FFF>;
+                       ti,trigger-config = <0x01DB>;
+                       ti,calibration-data = <0xFFFE>;
+                       ti,power-lsb = <2500>;
+                       ti,divisor = <20>;
+                       ti,shunt-resistor-mohm = <5>;
+                       ti,precision-multiplier = <1000>;
+               };
+
+               ina219@44{
+                       compatible = "ina219x";
+                       reg = <0x44>;
+                       ti,rail-name = "VDD_3V3_SYS_VIN4_5_7";
+                       ti,continuous-config = <0x3FFF>;
+                       ti,trigger-config = <0x01DB>;
+                       ti,calibration-data = <0xFFFE>;
+                       ti,power-lsb = <1250>;
+                       ti,divisor = <20>;
+                       ti,shunt-resistor-mohm = <10>;
+                       ti,precision-multiplier = <1000>;
+               };
+
+               ina219@45{
+                       compatible = "ina219x";
+                       reg = <0x45>;
+                       ti,rail-name = "AVDD_USB_HDMI";
+                       ti,continuous-config = <0x3FFF>;
+                       ti,trigger-config = <0x01DB>;
+                       ti,calibration-data = <0xFFFE>;
+                       ti,power-lsb = <1250>;
+                       ti,divisor = <20>;
+                       ti,shunt-resistor-mohm = <10>;
+                       ti,precision-multiplier = <1000>;
+               };
+
+               ina219@46{
+                       compatible = "ina219x";
+                       reg = <0x46>;
+                       ti,rail-name = "VDD_AC_BAT_D1";
+                       ti,continuous-config = <0x3FFF>;
+                       ti,trigger-config = <0x01DB>;
+                       ti,calibration-data = <0x7CD2>;
+                       ti,power-lsb = <2563>;
+                       ti,divisor = <20>;
+                       ti,shunt-resistor-mohm = <10>;
+                       ti,precision-multiplier = <1000>;
+               };
+
+               ina219@47{
+                       compatible = "ina219x";
+                       reg = <0x47>;
+                       ti,rail-name = "VDD_AO_SMPS12_IN";
+                       ti,continuous-config = <0x3FFF>;
+                       ti,trigger-config = <0x01DB>;
+                       ti,calibration-data = <0xAEC0>;
+                       ti,power-lsb = <1831>;
+                       ti,divisor = <20>;
+                       ti,shunt-resistor-mohm = <10>;
+                       ti,precision-multiplier = <1000>;
+               };
+
+               ina219@48{
+                       compatible = "ina219x";
+                       reg = <0x48>;
+                       ti,rail-name = "VDD_3V3_SYS_SMPS45_IN";
+                       ti,continuous-config = <0x3FFF>;
+                       ti,trigger-config = <0x01DB>;
+                       ti,calibration-data = <0xFFFE>;
+                       ti,power-lsb = <1250>;
+                       ti,divisor = <20>;
+                       ti,shunt-resistor-mohm = <10>;
+                       ti,precision-multiplier = <1000>;
+               };
+
+               ina219@49{
+                       compatible = "ina219x";
+                       reg = <0x49>;
+                       ti,rail-name = "VDD_AO_SMPS2_IN";
+                       ti,continuous-config = <0x3FFF>;
+                       ti,trigger-config = <0x01DB>;
+                       ti,calibration-data = <0xFFFE>;
+                       ti,power-lsb = <1250>;
+                       ti,divisor = <20>;
+                       ti,shunt-resistor-mohm = <10>;
+                       ti,precision-multiplier = <1000>;
+               };
+
+               ina219@4a{
+                       compatible = "ina219x";
+                       reg = <0x4a>;
+                       ti,rail-name = "VDDIO_HV_AP";
+                       ti,continuous-config = <0x3FFF>;
+                       ti,trigger-config = <0x01DB>;
+                       ti,calibration-data = <0xFFFE>;
+                       ti,power-lsb = <1250>;
+                       ti,divisor = <20>;
+                       ti,shunt-resistor-mohm = <10>;
+                       ti,precision-multiplier = <1000>;
+               };
+
+               ina219@4b{
+                       compatible = "ina219x";
+                       reg = <0x4b>;
+                       ti,rail-name = "VDD_1V8_LDO3_IN";
+                       ti,continuous-config = <0x3FFF>;
+                       ti,trigger-config = <0x01DB>;
+                       ti,calibration-data = <0xFFFE>;
+                       ti,power-lsb = <1250>;
+                       ti,divisor = <20>;
+                       ti,shunt-resistor-mohm = <10>;
+                       ti,precision-multiplier = <1000>;
+               };
+
+               ina219@4c{
+                       compatible = "ina219x";
+                       reg = <0x4c>;
+                       ti,rail-name = "VDD_3V3_SYS_LDO4_IN";
+                       ti,continuous-config = <0x3FFF>;
+                       ti,trigger-config = <0x01DB>;
+                       ti,calibration-data = <0xFFFE>;
+                       ti,power-lsb = <1250>;
+                       ti,divisor = <20>;
+                       ti,shunt-resistor-mohm = <10>;
+                       ti,precision-multiplier = <1000>;
+               };
+
+               ina219@4d{
+                       compatible = "ina219x";
+                       reg = <0x4d>;
+                       ti,rail-name = "VDD_AO_LDO8_IN";
+                       ti,continuous-config = <0x3FFF>;
+                       ti,trigger-config = <0x01DB>;
+                       ti,calibration-data = <0xFFFE>;
+                       ti,power-lsb = <1250>;
+                       ti,divisor = <20>;
+                       ti,shunt-resistor-mohm = <10>;
+                       ti,precision-multiplier = <1000>;
+               };
+
+               ina219@4e{
+                       compatible = "ina219x";
+                       reg = <0x4e>;
+                       ti,rail-name = "VDD_1V8_AP";
+                       ti,continuous-config = <0x3FFF>;
+                       ti,trigger-config = <0x01DB>;
+                       ti,calibration-data = <0xFFFE>;
+                       ti,power-lsb = <1250>;
+                       ti,divisor = <20>;
+                       ti,shunt-resistor-mohm = <10>;
+                       ti,precision-multiplier = <1000>;
+               };
+
+               ina219@4f{
+                       compatible = "ina219x";
+                       reg = <0x4f>;
+                       ti,rail-name = "VDD_1V8_DSM";
+                       ti,continuous-config = <0x3FFF>;
+                       ti,trigger-config = <0x01DB>;
+                       ti,calibration-data = <0xFFFE>;
+                       ti,power-lsb = <1250>;
+                       ti,divisor = <20>;
+                       ti,shunt-resistor-mohm = <10>;
+                       ti,precision-multiplier = <1000>;
+               };
+       };
+};
index d48c8a0429106141ce33b560f0620dd77ba4f8cb..2ce115497e389328c94e2c0710f57168f94b230d 100644 (file)
@@ -188,7 +188,6 @@ obj-y                                   += panel-s-wqxga-10-1.o
 obj-${CONFIG_MACH_DALMORE}              += board-dalmore.o
 obj-${CONFIG_MACH_DALMORE}              += board-dalmore-memory.o
 obj-${CONFIG_MACH_DALMORE}              += board-dalmore-power.o
-obj-${CONFIG_MACH_DALMORE}              += board-dalmore-powermon.o
 obj-${CONFIG_MACH_DALMORE}              += board-dalmore-sdhci.o
 obj-${CONFIG_MACH_DALMORE}              += board-dalmore-panel.o
 obj-${CONFIG_MACH_DALMORE}              += board-roth-panel.o
diff --git a/arch/arm/mach-tegra/board-dalmore-powermon.c b/arch/arm/mach-tegra/board-dalmore-powermon.c
deleted file mode 100644 (file)
index bb1d8e7..0000000
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
- * arch/arm/mach-tegra/board-dalmore-powermon.c
- *
- * Copyright (c) 2011-2013, NVIDIA CORPORATION. All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <linux/i2c.h>
-#include <linux/ina219.h>
-
-#include "board.h"
-#include "board-dalmore.h"
-
-#define PRECISION_MULTIPLIER_DALMORE 1000
-
-enum {
-       VDD_12V_DCIN_RS,
-       VDD_AC_BAT_VIN1,
-       VDD_5V0_SYS,
-       VDD_3V3_SYS,
-       VDD_3V3_SYS_VIN4_5_7,
-       AVDD_USB_HDMI,
-       VDD_AC_BAT_D1,
-       VDD_AO_SMPS12_IN,
-       VDD_3V3_SYS_SMPS45_IN,
-       VDD_AO_SMPS2_IN,
-       VDDIO_HV_AP,
-       VDD_1V8_LDO3_IN,
-       VDD_3V3_SYS_LDO4_IN,
-       VDD_AO_LDO8_IN,
-       VDD_1V8_AP,
-       VDD_1V8_DSM,
-};
-
-static struct ina219_platform_data power_mon_info[] = {
-       [VDD_12V_DCIN_RS] = {
-               .calibration_data  = 0xaec0,
-               .power_lsb = 1.8311874106 * PRECISION_MULTIPLIER_DALMORE,
-               .rail_name = "VDD_12V_DCIN_RS",
-               .divisor = 20,
-               .precision_multiplier = PRECISION_MULTIPLIER_DALMORE,
-               .cont_conf = 0x3FFF,
-               .trig_conf = 0x1DB,
-               .shunt_resistor = 10,
-       },
-
-       [VDD_AC_BAT_VIN1] = {
-               .calibration_data  = 0xfffe,
-               .power_lsb = 1.2500381481 * PRECISION_MULTIPLIER_DALMORE,
-               .rail_name = "VDD_AC_BAT_VIN1",
-               .divisor = 20,
-               .precision_multiplier = PRECISION_MULTIPLIER_DALMORE,
-               .cont_conf = 0x3FFF,
-               .trig_conf = 0x1DB,
-               .shunt_resistor = 10,
-       },
-
-       [VDD_5V0_SYS] = {
-               .calibration_data  = 0xfffe,
-               .power_lsb = 2.5000762963 * PRECISION_MULTIPLIER_DALMORE,
-               .rail_name = "VDD_5V0_SYS",
-               .divisor = 20,
-               .precision_multiplier = PRECISION_MULTIPLIER_DALMORE,
-               .cont_conf = 0x3FFF,
-               .trig_conf = 0x1DB,
-               .shunt_resistor = 5,
-       },
-
-       [VDD_3V3_SYS] = {
-               .calibration_data  = 0xfffe,
-               .power_lsb = 2.5000762963 * PRECISION_MULTIPLIER_DALMORE,
-               .rail_name = "VDD_3V3_SYS",
-               .divisor = 20,
-               .precision_multiplier = PRECISION_MULTIPLIER_DALMORE,
-               .cont_conf = 0x3FFF,
-               .trig_conf = 0x1DB,
-               .shunt_resistor = 5,
-       },
-
-       [VDD_3V3_SYS_VIN4_5_7] = {
-               .calibration_data  = 0xfffe,
-               .power_lsb = 1.2500381481 * PRECISION_MULTIPLIER_DALMORE,
-               .rail_name = "VDD_3V3_SYS_VIN4_5_7",
-               .divisor = 20,
-               .precision_multiplier = PRECISION_MULTIPLIER_DALMORE,
-               .cont_conf = 0x3FFF,
-               .trig_conf = 0x1DB,
-               .shunt_resistor = 10,
-       },
-
-       [AVDD_USB_HDMI] = {
-               .calibration_data  = 0xfffe,
-               .power_lsb = 1.2500381481 * PRECISION_MULTIPLIER_DALMORE,
-               .rail_name = "AVDD_USB_HDMI",
-               .divisor = 20,
-               .precision_multiplier = PRECISION_MULTIPLIER_DALMORE,
-               .cont_conf = 0x3FFF,
-               .trig_conf = 0x1DB,
-               .shunt_resistor = 10,
-       },
-
-       [VDD_AC_BAT_D1] = {
-               .calibration_data  = 0x7CD2,
-               .power_lsb = 2.563685298 * PRECISION_MULTIPLIER_DALMORE,
-               .rail_name = "VDD_AC_BAT_D1",
-               .divisor = 20,
-               .precision_multiplier = PRECISION_MULTIPLIER_DALMORE,
-               .cont_conf = 0x3FFF,
-               .trig_conf = 0x1DB,
-               .shunt_resistor = 10,
-       },
-
-       [VDD_AO_SMPS12_IN] = {
-               .calibration_data  = 0xaec0,
-               .power_lsb = 1.8311874106 * PRECISION_MULTIPLIER_DALMORE,
-               .rail_name = "VDD_AO_SMPS12_IN",
-               .divisor = 20,
-               .precision_multiplier = PRECISION_MULTIPLIER_DALMORE,
-               .cont_conf = 0x3FFF,
-               .trig_conf = 0x1DB,
-               .shunt_resistor = 10,
-       },
-
-       [VDD_3V3_SYS_SMPS45_IN] = {
-               .calibration_data  = 0xfffe,
-               .power_lsb = 1.2500381481 * PRECISION_MULTIPLIER_DALMORE,
-               .rail_name = "VDD_3V3_SYS_SMPS45_IN",
-               .divisor = 20,
-               .precision_multiplier = PRECISION_MULTIPLIER_DALMORE,
-               .cont_conf = 0x3FFF,
-               .trig_conf = 0x1DB,
-               .shunt_resistor = 10,
-       },
-
-       [VDD_AO_SMPS2_IN] = {
-               .calibration_data  = 0xfffe,
-               .power_lsb = 1.2500381481 * PRECISION_MULTIPLIER_DALMORE,
-               .rail_name = "VDD_AO_SMPS2_IN",
-               .divisor = 20,
-               .precision_multiplier = PRECISION_MULTIPLIER_DALMORE,
-               .cont_conf = 0x3FFF,
-               .trig_conf = 0x1DB,
-               .shunt_resistor = 10,
-       },
-
-       [VDDIO_HV_AP] = {
-               .calibration_data  = 0xfffe,
-               .power_lsb = 1.2500381481 * PRECISION_MULTIPLIER_DALMORE,
-               .rail_name = "VDDIO_HV_AP",
-               .divisor = 20,
-               .precision_multiplier = PRECISION_MULTIPLIER_DALMORE,
-               .cont_conf = 0x3FFF,
-               .trig_conf = 0x1DB,
-               .shunt_resistor = 10,
-       },
-
-       [VDD_1V8_LDO3_IN] = {
-               .calibration_data  = 0xfffe,
-               .power_lsb = 1.2500381481 * PRECISION_MULTIPLIER_DALMORE,
-               .rail_name = "VDD_1V8_LDO3_IN",
-               .divisor = 20,
-               .precision_multiplier = PRECISION_MULTIPLIER_DALMORE,
-               .cont_conf = 0x3FFF,
-               .trig_conf = 0x1DB,
-               .shunt_resistor = 10,
-       },
-
-       [VDD_3V3_SYS_LDO4_IN] = {
-               .calibration_data  = 0xfffe,
-               .power_lsb = 1.2500381481 * PRECISION_MULTIPLIER_DALMORE,
-               .rail_name = "VDD_3V3_SYS_LDO4_IN",
-               .divisor = 20,
-               .precision_multiplier = PRECISION_MULTIPLIER_DALMORE,
-               .cont_conf = 0x3FFF,
-               .trig_conf = 0x1DB,
-               .shunt_resistor = 10,
-       },
-
-       [VDD_AO_LDO8_IN] = {
-               .calibration_data  = 0xfffe,
-               .power_lsb = 1.2500381481 * PRECISION_MULTIPLIER_DALMORE,
-               .rail_name = "VDD_AO_LDO8_IN",
-               .divisor = 20,
-               .precision_multiplier = PRECISION_MULTIPLIER_DALMORE,
-               .cont_conf = 0x3FFF,
-               .trig_conf = 0x1DB,
-               .shunt_resistor = 10,
-       },
-
-       [VDD_1V8_AP] = {
-               .calibration_data  = 0xfffe,
-               .power_lsb = 1.2500381481 * PRECISION_MULTIPLIER_DALMORE,
-               .rail_name = "VDD_1V8_AP",
-               .divisor = 20,
-               .precision_multiplier = PRECISION_MULTIPLIER_DALMORE,
-               .cont_conf = 0x3FFF,
-               .trig_conf = 0x1DB,
-               .shunt_resistor = 10,
-       },
-
-       [VDD_1V8_DSM] = {
-               .calibration_data  = 0xfffe,
-               .power_lsb = 1.2500381481 * PRECISION_MULTIPLIER_DALMORE,
-               .rail_name = "VDD_1V8_DSM",
-               .divisor = 20,
-               .precision_multiplier = PRECISION_MULTIPLIER_DALMORE,
-               .cont_conf = 0x3FFF,
-               .trig_conf = 0x1DB,
-               .shunt_resistor = 10,
-       },
-};
-
-enum {
-       INA_I2C_ADDR_40,
-       INA_I2C_ADDR_41,
-       INA_I2C_ADDR_42,
-       INA_I2C_ADDR_43,
-       INA_I2C_ADDR_44,
-       INA_I2C_ADDR_45,
-       INA_I2C_ADDR_46,
-       INA_I2C_ADDR_47,
-       INA_I2C_ADDR_48,
-       INA_I2C_ADDR_49,
-       INA_I2C_ADDR_4A,
-       INA_I2C_ADDR_4B,
-       INA_I2C_ADDR_4C,
-       INA_I2C_ADDR_4D,
-       INA_I2C_ADDR_4E,
-       INA_I2C_ADDR_4F,
-};
-
-static struct i2c_board_info dalmore_i2c0_ina219_board_info[] = {
-       [INA_I2C_ADDR_40] = {
-               I2C_BOARD_INFO("ina219", 0x40),
-               .platform_data = &power_mon_info[VDD_12V_DCIN_RS],
-               .irq = -1,
-       },
-
-       [INA_I2C_ADDR_41] = {
-               I2C_BOARD_INFO("ina219", 0x41),
-               .platform_data = &power_mon_info[VDD_AC_BAT_VIN1],
-               .irq = -1,
-       },
-
-       [INA_I2C_ADDR_42] = {
-               I2C_BOARD_INFO("ina219", 0x42),
-               .platform_data = &power_mon_info[VDD_5V0_SYS],
-               .irq = -1,
-       },
-
-       [INA_I2C_ADDR_43] = {
-               I2C_BOARD_INFO("ina219", 0x43),
-               .platform_data = &power_mon_info[VDD_3V3_SYS],
-               .irq = -1,
-       },
-
-       [INA_I2C_ADDR_44] = {
-               I2C_BOARD_INFO("ina219", 0x44),
-               .platform_data = &power_mon_info[VDD_3V3_SYS_VIN4_5_7],
-               .irq = -1,
-       },
-
-       [INA_I2C_ADDR_45] = {
-               I2C_BOARD_INFO("ina219", 0x45),
-               .platform_data = &power_mon_info[AVDD_USB_HDMI],
-               .irq = -1,
-       },
-
-       [INA_I2C_ADDR_46] = {
-               I2C_BOARD_INFO("ina219", 0x46),
-               .platform_data = &power_mon_info[VDD_AC_BAT_D1],
-               .irq = -1,
-       },
-
-       [INA_I2C_ADDR_47] = {
-               I2C_BOARD_INFO("ina219", 0x47),
-               .platform_data = &power_mon_info[VDD_AO_SMPS12_IN],
-               .irq = -1,
-       },
-
-       [INA_I2C_ADDR_48] = {
-               I2C_BOARD_INFO("ina219", 0x48),
-               .platform_data = &power_mon_info[VDD_3V3_SYS_SMPS45_IN],
-               .irq = -1,
-       },
-
-       [INA_I2C_ADDR_49] = {
-               I2C_BOARD_INFO("ina219", 0x49),
-               .platform_data = &power_mon_info[VDD_AO_SMPS2_IN],
-               .irq = -1,
-       },
-
-       [INA_I2C_ADDR_4A] = {
-               I2C_BOARD_INFO("ina219", 0x4A),
-               .platform_data = &power_mon_info[VDDIO_HV_AP],
-               .irq = -1,
-       },
-
-       [INA_I2C_ADDR_4B] = {
-               I2C_BOARD_INFO("ina219", 0x4B),
-               .platform_data = &power_mon_info[VDD_1V8_LDO3_IN],
-               .irq = -1,
-       },
-
-       [INA_I2C_ADDR_4C] = {
-               I2C_BOARD_INFO("ina219", 0x4C),
-               .platform_data = &power_mon_info[VDD_3V3_SYS_LDO4_IN],
-               .irq = -1,
-       },
-
-       [INA_I2C_ADDR_4D] = {
-               I2C_BOARD_INFO("ina219", 0x4D),
-               .platform_data = &power_mon_info[VDD_AO_LDO8_IN],
-               .irq = -1,
-       },
-
-       [INA_I2C_ADDR_4E] = {
-               I2C_BOARD_INFO("ina219", 0x4E),
-               .platform_data = &power_mon_info[VDD_1V8_AP],
-               .irq = -1,
-       },
-
-       [INA_I2C_ADDR_4F] = {
-               I2C_BOARD_INFO("ina219", 0x4F),
-               .platform_data = &power_mon_info[VDD_1V8_DSM],
-               .irq = -1,
-       },
-};
-
-int __init dalmore_pmon_init(void)
-{
-       i2c_register_board_info(1, dalmore_i2c0_ina219_board_info,
-               ARRAY_SIZE(dalmore_i2c0_ina219_board_info));
-
-       return 0;
-}
-
index 218a4b91fcf9ba7e15c6d54fc048092cbc6810ed..85386be7d7e884f9eec557c92300b02bab3c4433 100644 (file)
@@ -689,7 +689,6 @@ static void __init tegra_dalmore_late_init(void)
        else
                dalmore_panel_init();
        dalmore_kbc_init();
-       dalmore_pmon_init();
 #if defined(CONFIG_BT_BLUESLEEP) || defined(CONFIG_BT_BLUESLEEP_MODULE)
        dalmore_setup_bluesleep();
        dalmore_setup_bt_rfkill();
index 040619579f5dc018ca53406a1480720ec333f2e9..b0b54649c251e516bccf42ef3941495f7afa6383 100644 (file)
@@ -115,7 +115,6 @@ int dalmore_edp_init(void);
 int dalmore_panel_init(void);
 int roth_panel_init(int board_id);
 int dalmore_kbc_init(void);
-int dalmore_pmon_init(void);
 int dalmore_soctherm_init(void);
 
 extern struct tegra_sdhci_platform_data dalmore_tegra_sdhci_platform_data0;