diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-05-07 18:28:04 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-07 18:28:04 +0200 |
commit | bd1a6e7b47246dd91c02d46f9a373822a1d972cc (patch) | |
tree | 6da19dae508316c716de97d9ca4638941316014c /arch/arm/boot/dts/ste-snowball.dts | |
parent | 1e5f9ed00d72c60f68d8cb75fd7d10abfb5947cd (diff) | |
parent | 11133db7a836b0cb411faa048f07a38e994d1382 (diff) | |
download | op-kernel-dev-bd1a6e7b47246dd91c02d46f9a373822a1d972cc.zip op-kernel-dev-bd1a6e7b47246dd91c02d46f9a373822a1d972cc.tar.gz |
Merge tag 'stericsson-fixes-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into fixes
Merge "Ux500 fixes" from Linus Walleij:
This fixes an MMC/SD configuration issue present for some time
in the Ux500 DT but triggered by proper error handling in v4.1-rc1.
* tag 'stericsson-fixes-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: ux500: Enable GPIO regulator for SD-card for snowball
ARM: ux500: Enable GPIO regulator for SD-card for HREF boards
ARM: ux500: Move GPIO regulator for SD-card into board DTSs
Diffstat (limited to 'arch/arm/boot/dts/ste-snowball.dts')
-rw-r--r-- | arch/arm/boot/dts/ste-snowball.dts | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts index 206826a..1bc84eb 100644 --- a/arch/arm/boot/dts/ste-snowball.dts +++ b/arch/arm/boot/dts/ste-snowball.dts @@ -146,8 +146,21 @@ }; vmmci: regulator-gpio { + compatible = "regulator-gpio"; + gpios = <&gpio7 4 0x4>; enable-gpio = <&gpio6 25 0x4>; + + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <2900000>; + regulator-name = "mmci-reg"; + regulator-type = "voltage"; + + startup-delay-us = <100>; + enable-active-high; + + states = <1800000 0x1 + 2900000 0x0>; }; // External Micro SD slot |