summaryrefslogtreecommitdiff
path: root/arch/arm64
diff options
context:
space:
mode:
authorTimo Alho <talho@nvidia.com>2014-07-07 08:44:56 +0300
committerMandar Padmawar <mpadmawar@nvidia.com>2014-07-10 05:32:40 -0700
commit2f60e0c1b62133be4302128632839b0fb68e85ad (patch)
treebab25fa9820b46505bed1a520ede59406d99db4d /arch/arm64
parente452c87dcc23d91e1ad5c8ffeaa581f26496d54d (diff)
tegra: dtb: sysedp: enable sysedp only on P1761 with battery
Previously, sysedp was attempted to enabled on non-battery versions of P1761. This caused sysedp_batmon_calc to fail with -EFAULT during probing as battery power supply was not available. Bug 200018196 Change-Id: I0abb9cde8d597febed3e24d0bf3a29386e06db57 Signed-off-by: Timo Alho <talho@nvidia.com> Reviewed-on: http://git-master/r/434985 GVS: Gerrit_Virtual_Submit Reviewed-by: Steve Rogers <srogers@nvidia.com> Tested-by: Steve Rogers <srogers@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'arch/arm64')
-rw-r--r--arch/arm64/boot/dts/tegra132-tn8-p1761-1270-a03-battery.dts1
-rw-r--r--arch/arm64/boot/dts/tegra132-tn8-p1761-1270-a03.dts1
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/tegra132-tn8-p1761-1270-a03-battery.dts b/arch/arm64/boot/dts/tegra132-tn8-p1761-1270-a03-battery.dts
index 08203cea500b..fd0ca33eb697 100644
--- a/arch/arm64/boot/dts/tegra132-tn8-p1761-1270-a03-battery.dts
+++ b/arch/arm64/boot/dts/tegra132-tn8-p1761-1270-a03-battery.dts
@@ -1,4 +1,5 @@
#include "tegra132-tn8-p1761-1270-a03.dts"
+#include "tegra124-platforms/tegra124-tn8-sysedp-p1761-1270-a02.dtsi"
#include <dt-bindings/iio/meter/ina3221x.h>
/ {
diff --git a/arch/arm64/boot/dts/tegra132-tn8-p1761-1270-a03.dts b/arch/arm64/boot/dts/tegra132-tn8-p1761-1270-a03.dts
index f18980f3b6c4..67090a0c3ba5 100644
--- a/arch/arm64/boot/dts/tegra132-tn8-p1761-1270-a03.dts
+++ b/arch/arm64/boot/dts/tegra132-tn8-p1761-1270-a03.dts
@@ -8,7 +8,6 @@
#include "tegra124-platforms/tegra124-tn8-gpio-p1761-1470-a00.dtsi"
#include "tegra132-platforms/tegra132-tn8-keys-p1761-1270-a03.dtsi"
#include "tegra132-platforms/tegra132-tn8-emc-p1761-1270-a03.dtsi"
-#include "tegra124-platforms/tegra124-tn8-sysedp-p1761-1270-a02.dtsi"
#include "tegra124-platforms/tegra124-tn8-powermon-p1761-a02.dtsi"
#include "tegra132-tn8-dfll.dtsi"
#include "tegra124-platforms/tegra124-tn8-camera-p1761-1270-a03.dtsi"