summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/tegra20-trimslice.dts
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-08-22 10:44:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-08-22 10:44:44 -0700
commit1f8b76656be831d1c6239bd36ef988d5b185b5ab (patch)
treeeaa065e07f76e58c2cb479724c3799f0ab3400ae /arch/arm/boot/dts/tegra20-trimslice.dts
parent8351fcfe4f496f5f10f8ac340ddd8914eb04be7e (diff)
parent30ca2226bea6f0db519dc53381b893cd66cb5b66 (diff)
downloadop-kernel-dev-1f8b76656be831d1c6239bd36ef988d5b185b5ab.zip
op-kernel-dev-1f8b76656be831d1c6239bd36ef988d5b185b5ab.tar.gz
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson: "A handful of fixes for 3.11 are still trickling in. These are: - A couple of fixes for older OMAP platforms - Another few fixes for at91 (lateish due to European summer vacations) - A late-found problem with USB on Tegra, fix is to keep VBUS regulator on at all times - One fix for Exynos 5440 dealing with CPU detection - One MAINTAINERS update" * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: tegra: always enable USB VBUS regulators ARM: davinci: nand: specify ecc strength ARM: OMAP: rx51: change musb mode to OTG ARM: OMAP2: fix musb usage for n8x0 MAINTAINERS: Update email address for Benoit Cousson ARM: at91/DT: fix at91sam9n12ek memory node ARM: at91: add missing uart clocks DT entries ARM: SAMSUNG: fix to support for missing cpu specific map_io ARM: at91/DT: at91sam9x5ek: fix USB host property to enable port C
Diffstat (limited to 'arch/arm/boot/dts/tegra20-trimslice.dts')
-rw-r--r--arch/arm/boot/dts/tegra20-trimslice.dts2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts
index ed4b901..37c93d3 100644
--- a/arch/arm/boot/dts/tegra20-trimslice.dts
+++ b/arch/arm/boot/dts/tegra20-trimslice.dts
@@ -412,6 +412,8 @@
regulator-max-microvolt = <5000000>;
enable-active-high;
gpio = <&gpio 170 0>; /* PV2 */
+ regulator-always-on;
+ regulator-boot-on;
};
};
OpenPOWER on IntegriCloud