ARM: tegra: use power tree from DT for all Loki fab

Use the power tree from all Loki Fab instead of the power tree
from DT.

bug 1440861

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

diff --git a/arch/arm/boot/dts/tegra124-foster.dts b/arch/arm/boot/dts/tegra124-foster.dts
index 2e193f9127fd21ac469d1be19562a1a1c59fb4a1..da264c1a21708431ef82cfa44e70a52481b93cf8 100644 (file)
--- a/arch/arm/boot/dts/tegra124-foster.dts
+++ b/arch/arm/boot/dts/tegra124-foster.dts
@@ -17,6 +17,8 @@
 #include <dt-bindings/gpio/tegra-gpio.h>
 #include <tegra124-platforms/tegra124-loki-gpio-default.dtsi>
 #include <tegra124-platforms/tegra124-loki-pinmux.dtsi>
+#include "tegra124-platforms/tegra124-loki-pmic-e2530-0000-a01.dtsi"
+#include "tegra124-platforms/tegra124-loki-fixed-e2530-0000-a00.dtsi"
 
 / {
        model = "NVIDIA Tegra124 Foster";
@@ -63,6 +65,25 @@
 
        i2c@7000d000 {
                nvidia,bit-banging-xfer-after-shutdown;
+
+               tps65913 {
+                       gpadc {
+                               ti,auto-conversion-period-ms = <1000>;
+                               iio_map {
+                                       ch1 {
+                                               ti,adc-channel-number = <1>;
+                                               ti,adc-consumer-device = "generic-adc-thermal.0";
+                                               ti,adc-consumer-channel ="thermistor";
+                                       };
+
+                                       ch3 {
+                                               ti,adc-channel-number = <3>;
+                                               ti,adc-consumer-device = "generic-adc-thermal.1";
+                                               ti,adc-consumer-channel ="tdiode";
+                                       };
+                               };
+                       };
+               };
        };
 
        spi@7000d400 {

diff --git a/arch/arm/boot/dts/tegra124-loki-e2530-a01.dts b/arch/arm/boot/dts/tegra124-loki-e2530-a01.dts
index 1145589148e41da6a25cff08455f95f3dd8d6c94..2fb937a858e6109508fe7c8c057b27a24e113ff5 100644 (file)
--- a/arch/arm/boot/dts/tegra124-loki-e2530-a01.dts
+++ b/arch/arm/boot/dts/tegra124-loki-e2530-a01.dts
@@ -1,2 +1,39 @@
 #include "tegra124-loki.dts"
 #include "tegra124-platforms/tegra124-loki-powermon-e2530-a01.dtsi"
+#include "tegra124-platforms/tegra124-loki-pmic-e2530-0000-a01.dtsi"
+#include "tegra124-platforms/tegra124-loki-fixed-e2530-0000-a00.dtsi"
+
+/ {
+       i2c@7000d000 {
+               tps65913 {
+                       gpadc {
+                               ti,auto-conversion-period-ms = <1000>;
+                               auto_conv1 {
+                                       ti,adc-channel-number = <4>;
+                                       ti,adc-low-threshold = <748>;
+                                       ti,enable-shutdown;
+                               };
+
+                               iio_map {
+                                       ch1 {
+                                               ti,adc-channel-number = <1>;
+                                               ti,adc-consumer-device = "generic-adc-thermal.0";
+                                               ti,adc-consumer-channel ="thermistor";
+                                       };
+
+                                       ch3 {
+                                               ti,adc-channel-number = <3>;
+                                               ti,adc-consumer-device = "generic-adc-thermal.1";
+                                               ti,adc-consumer-channel ="tdiode";
+                                       };
+
+                                       ch4 {
+                                               ti,adc-channel-number = <4>;
+                                               ti,adc-consumer-device = "generic-adc-thermal.2";
+                                               ti,adc-consumer-channel ="tbat";
+                                       };
+                               };
+                       };
+               };
+       };
+};

diff --git a/arch/arm/boot/dts/tegra124-loki-e2530-a03.dts b/arch/arm/boot/dts/tegra124-loki-e2530-a03.dts
index 86db2c7fd5e6dc58dedd04bde43e621dbf9b1313..0ea8da28ba2eb89438a9f2187608ac4586245e92 100644 (file)
--- a/arch/arm/boot/dts/tegra124-loki-e2530-a03.dts
+++ b/arch/arm/boot/dts/tegra124-loki-e2530-a03.dts
@@ -1,5 +1,7 @@
 #include "tegra124-loki.dts"
 #include "tegra124-platforms/tegra124-loki-powermon-e2530-a01.dtsi"
+#include "tegra124-platforms/tegra124-loki-pmic-e2530-0000-a01.dtsi"
+#include "tegra124-platforms/tegra124-loki-fixed-e2530-0000-a00.dtsi"
 
 / {
        i2c@7000c400 {
@@ -9,4 +11,37 @@
                        };
                };
        };
+
+       i2c@7000d000 {
+               tps65913 {
+                       gpadc {
+                               ti,auto-conversion-period-ms = <1000>;
+                               auto_conv1 {
+                                       ti,adc-channel-number = <4>;
+                                       ti,adc-low-threshold = <748>;
+                                       ti,enable-shutdown;
+                               };
+
+                               iio_map {
+                                       ch1 {
+                                               ti,adc-channel-number = <1>;
+                                               ti,adc-consumer-device = "generic-adc-thermal.0";
+                                               ti,adc-consumer-channel ="thermistor";
+                                       };
+
+                                       ch3 {
+                                               ti,adc-channel-number = <3>;
+                                               ti,adc-consumer-device = "generic-adc-thermal.1";
+                                               ti,adc-consumer-channel ="tdiode";
+                                       };
+
+                                       ch4 {
+                                               ti,adc-channel-number = <4>;
+                                               ti,adc-consumer-device = "generic-adc-thermal.2";
+                                               ti,adc-consumer-channel ="tbat";
+                                       };
+                               };
+                       };
+               };
+       };
 };

diff --git a/arch/arm/boot/dts/tegra124-loki-e2548-a00.dts b/arch/arm/boot/dts/tegra124-loki-e2548-a00.dts
index 51567bd767d6af8c39648e2c39b071745556541a..6245071d4999447356c6a8c756c1045d14d7a5a2 100644 (file)
--- a/arch/arm/boot/dts/tegra124-loki-e2548-a00.dts
+++ b/arch/arm/boot/dts/tegra124-loki-e2548-a00.dts
@@ -1,2 +1,4 @@
 #include "tegra124-loki.dts"
 #include "tegra124-platforms/tegra124-loki-powermon-e2548.dtsi"
+#include "tegra124-platforms/tegra124-loki-pmic-e2545-0000-a00.dtsi"
+#include "tegra124-platforms/tegra124-loki-fixed-e2545-0000-a00.dtsi"

diff --git a/arch/arm/boot/dts/tegra124-loki-thor195-e2549-a00.dts b/arch/arm/boot/dts/tegra124-loki-thor195-e2549-a00.dts
index 808f038697a36f541fda49a6fdd43a68a802faf5..cea58d62c74b54b5995dde48d655d81d3fbd22e0 100644 (file)
--- a/arch/arm/boot/dts/tegra124-loki-thor195-e2549-a00.dts
+++ b/arch/arm/boot/dts/tegra124-loki-thor195-e2549-a00.dts
@@ -1,2 +1,4 @@
 #include "tegra124-thor195.dts"
 #include "tegra124-platforms/tegra124-thor195-powermon-e2549.dtsi"
+#include "tegra124-platforms/tegra124-loki-pmic-e2545-0000-a00.dtsi"
+#include "tegra124-platforms/tegra124-loki-fixed-e2545-0000-a00.dtsi"