diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-12-11 02:22:11 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-11 02:22:11 +0300 |
| commit | 9421a1459716634d76d5b53c5511a10f16eb6324 (patch) | |
| tree | 94c1b6fecdf620f4897a1106b8a59c1fdcf57cdf /arch/arm/boot | |
| parent | 789d73b384688898748da2d9a0e3683cb495b8a2 (diff) | |
| parent | 8423536fe453b3623f4ed7c2c3cca9b86af1ace5 (diff) | |
| download | linux-9421a1459716634d76d5b53c5511a10f16eb6324.tar.xz | |
Merge tag 'at91-4.4-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into fixes
Merge "Second fixes for 4.4" from Alexandre Belloni:
- fix of a hardware setup that prevents the sd/mmc interface to show up on
sama5d2.
- proper selection of pinctrl drivers. PIO4 is necessary for the sama5d2 to
boot.
* tag 'at91-4.4-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
ARM: at91: fix pinctrl driver selection
ARM: at91/dt: add always-on to 1.8V regulator
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/at91-sama5d2_xplained.dts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts index ad6de73ed5a5..e74df327cdd3 100644 --- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts +++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts @@ -184,6 +184,7 @@ regulator-name = "VDD_SDHC_1V8"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; + regulator-always-on; }; }; }; |