diff options
author | Tony Lindgren <tony@atomide.com> | 2017-02-28 08:46:30 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2017-02-28 08:46:30 -0800 |
commit | 1bd49882d78a9b976fe7380ec1bdeb454d68a358 (patch) | |
tree | c4a296bce07fe871c89d84ae66ac4bb53af29346 /arch/arm/boot/dts/am57xx-idk-common.dtsi | |
parent | 0341735226dcfa9d3727ff001e030f879ab91ca2 (diff) | |
parent | 48385896e9c53e1061f103e1271a6be9a7ea00c4 (diff) | |
download | blackbird-op-linux-1bd49882d78a9b976fe7380ec1bdeb454d68a358.tar.gz blackbird-op-linux-1bd49882d78a9b976fe7380ec1bdeb454d68a358.zip |
Merge branch 'gpio-key-wakeup-fix' into omap-for-v4.11/fixes
Diffstat (limited to 'arch/arm/boot/dts/am57xx-idk-common.dtsi')
-rw-r--r-- | arch/arm/boot/dts/am57xx-idk-common.dtsi | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/am57xx-idk-common.dtsi b/arch/arm/boot/dts/am57xx-idk-common.dtsi index d0a55b845690..e5ac1d81d15c 100644 --- a/arch/arm/boot/dts/am57xx-idk-common.dtsi +++ b/arch/arm/boot/dts/am57xx-idk-common.dtsi @@ -14,6 +14,10 @@ rtc1 = &rtc; }; + chosen { + stdout-path = &uart3; + }; + vmain: fixedregulator-vmain { compatible = "regulator-fixed"; regulator-name = "VMAIN"; |