ARM: tegra: set shunt resister value for the E2530-A01 correctly

E2530-A01 has the shunt resister value as {10, 10, 10} but
E2530-A03 has the shunt resister value as {5, 10, 10}.

Correcting this by:
- Creating top level dts file for E2530-A01.
- rename the powermon for e2530-a03 to e2530-a01.
- Override the properties value for eP2530-A03.

bug 1414772

Change-Id: I0637fa16379070eb71125a03c50b5bb1b5cf57f3
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 9b0f84fe07e2aeac96e5b1e3af0d0166c42dda22..ffaa9a03fe720142244482350c0c41c60e559f21 100644 (file)
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -221,6 +221,7 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
        tegra124-loki-02-cell-battery.dtb \
        tegra124-loki-03-cell-battery.dtb \
        tegra124-loki-e2548-a00.dtb \
+       tegra124-loki-e2530-a01.dtb \
        tegra124-loki-e2530-a03.dtb \
        tegra124-loki-mods.dtb \
        tegra124-foster.dtb \

diff --git a/arch/arm/boot/dts/tegra124-loki-e2530-a01.dts b/arch/arm/boot/dts/tegra124-loki-e2530-a01.dts
new file mode 100644 (file)
index 0000000..1145589
--- /dev/null
+++ b/arch/arm/boot/dts/tegra124-loki-e2530-a01.dts
@@ -0,0 +1,2 @@
+#include "tegra124-loki.dts"
+#include "tegra124-platforms/tegra124-loki-powermon-e2530-a01.dtsi"

diff --git a/arch/arm/boot/dts/tegra124-loki-e2530-a03.dts b/arch/arm/boot/dts/tegra124-loki-e2530-a03.dts
index ca2c2a36389e3d06802e442e9e95a55e56548b11..86db2c7fd5e6dc58dedd04bde43e621dbf9b1313 100644 (file)
--- a/arch/arm/boot/dts/tegra124-loki-e2530-a03.dts
+++ b/arch/arm/boot/dts/tegra124-loki-e2530-a03.dts
@@ -1,2 +1,12 @@
 #include "tegra124-loki.dts"
-#include "tegra124-platforms/tegra124-loki-powermon-e2530-a03.dtsi"
+#include "tegra124-platforms/tegra124-loki-powermon-e2530-a01.dtsi"
+
+/ {
+       i2c@7000c400 {
+               ina3221x@40 {
+                       channel@0 {
+                               ti,shunt-resistor-mohm = <5>;
+                       };
+               };
+       };
+};

diff --git a/arch/arm/boot/dts/tegra124-platforms/tegra124-loki-powermon-e2530-a03.dtsi b/arch/arm/boot/dts/tegra124-platforms/tegra124-loki-powermon-e2530-a01.dtsi
similarity index 93%
rename from arch/arm/boot/dts/tegra124-platforms/tegra124-loki-powermon-e2530-a03.dtsi
rename to arch/arm/boot/dts/tegra124-platforms/tegra124-loki-powermon-e2530-a01.dtsi
index 84daf5a592fc29224ecdfb95f901787ca494f265..91e8b0a59ed5fbb62f33d1f81d715036ce3cf746 100644 (file)
--- a/arch/arm/boot/dts/tegra124-platforms/tegra124-loki-powermon-e2530-a03.dtsi
+++ b/arch/arm/boot/dts/tegra124-platforms/tegra124-loki-powermon-e2530-a01.dtsi
@@ -11,7 +11,7 @@
                        channel@0 {
                                reg = <0x0>;
                                ti,rail-name = "VDD_BATT";
-                               ti,shunt-resistor-mohm = <5>;
+                               ti,shunt-resistor-mohm = <10>;
                                ti,current-critical-limit-ma = <6800>;
                        };