summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/dra7-evm.dts
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2017-08-10 18:05:53 +0200
committerTony Lindgren <tony@atomide.com>2017-08-10 18:05:53 +0200
commitc002c27874faaa170b535d03d7efee89ecdd9be4 (patch)
tree70d91eba77a9c374e4f0bf9eb8636acba57ca173 /arch/arm/boot/dts/dra7-evm.dts
parentARM: dts: dra7: Add "max-frequency" property to MMC dt nodes (diff)
parentLinux v4.13-rc1 (diff)
downloadlinux-c002c27874faaa170b535d03d7efee89ecdd9be4.tar.xz
linux-c002c27874faaa170b535d03d7efee89ecdd9be4.zip
Merge tag 'v4.13-rc1' into omap-for-v4.14/mmc-regulator
Linux v4.13-rc1
Diffstat (limited to 'arch/arm/boot/dts/dra7-evm.dts')
-rw-r--r--arch/arm/boot/dts/dra7-evm.dts2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index f9c28bf127a5..9491b29cf7e5 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -212,6 +212,8 @@
tps659038: tps659038@58 {
compatible = "ti,tps659038";
reg = <0x58>;
+ ti,palmas-override-powerhold;
+ ti,system-power-controller;
tps659038_pmic {
compatible = "ti,tps659038-pmic";