diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-10-15 15:13:26 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-15 15:13:26 (GMT) |
| commit | a787f40a9a29674d1b9146b7a35e491e7a571152 (patch) | |
| tree | 2a2301cd90557ce8772a694ddff99397274897e1 /arch | |
| parent | 2e4e5da55afaf9315f2398e85424fd3824459220 (diff) | |
| parent | d8e1f5ed11a39a68da00f05000466c4f6db4456e (diff) | |
| download | linux-a787f40a9a29674d1b9146b7a35e491e7a571152.tar.xz | |
Merge tag 'omap-for-v4.3/fixes-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
Merge "Fixes for omap against v4.3-rc5" from Tony Lindgren:
- Regulator fix for beagle-x15 to fix HDMI without a SD card being
inserted
- GPMC fix for showing proper timings and to allow enabling debug
options that somehow was unselectable earlier
- Add minimal documentation for new MMC1 dependency on
REGULATOR_PBIAS as it may not be obvious for people with
targeted .config files
* tag 'omap-for-v4.3/fixes-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
Documentation: ARM: List new omap MMC requirements
memory: omap-gpmc: dump "before" state before first modification
memory: omap-gpmc: Fix unselectable debug option for GPMC
ARM: dts: am57xx-beagle-x15: set VDD_SD to always-on
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/am57xx-beagle-x15.dts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts index 568adf5..d55e3ea 100644 --- a/arch/arm/boot/dts/am57xx-beagle-x15.dts +++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts @@ -402,11 +402,12 @@ /* SMPS9 unused */ ldo1_reg: ldo1 { - /* VDD_SD */ + /* VDD_SD / VDDSHV8 */ regulator-name = "ldo1"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; regulator-boot-on; + regulator-always-on; }; ldo2_reg: ldo2 { |