diff options
author | Doug Anderson <dianders@chromium.org> | 2013-06-07 10:28:29 -0700 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2013-06-27 12:39:06 -0400 |
commit | 870556a3dfb16d004f8e09dd59a1eddc727fcf0c (patch) | |
tree | 54c95bbaea975ad8cc85137fb6d72ec8b8f1f12b /Documentation | |
parent | 0ddf03c95bbb4f4ed57281fa7b781472950df749 (diff) | |
download | linux-stable-870556a3dfb16d004f8e09dd59a1eddc727fcf0c.tar.gz linux-stable-870556a3dfb16d004f8e09dd59a1eddc727fcf0c.tar.bz2 linux-stable-870556a3dfb16d004f8e09dd59a1eddc727fcf0c.zip |
mmc: dw_mmc: Handle late vmmc regulators with EPROBE_DEFER
It is possible to specify a regulator that should be turned on when
dw_mmc is probed. At the moment dw_mmc will fail to use the regulator
properly if the regulator probes after dw_mmc. Fix this problem by
honoring EPROBE_DEFER.
At the same time move the regulator code out of the slot init code.
We only specify one regulator for the whole device and other parts of
the code (like suspend/resume) assume that the regulator has only been
enabled once.
Signed-off-by: Doug Anderson <dianders@chromium.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/mmc/synopsis-dw-mshc.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/mmc/synopsis-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/synopsis-dw-mshc.txt index 726fd2122a13..d5cc94ecd60e 100644 --- a/Documentation/devicetree/bindings/mmc/synopsis-dw-mshc.txt +++ b/Documentation/devicetree/bindings/mmc/synopsis-dw-mshc.txt @@ -55,6 +55,9 @@ Optional properties: * broken-cd: as documented in mmc core bindings. +* vmmc-supply: The phandle to the regulator to use for vmmc. If this is + specified we'll defer probe until we can find this regulator. + Aliases: - All the MSHC controller nodes should be represented in the aliases node using @@ -79,6 +82,7 @@ board specific portions as listed below. broken-cd; fifo-depth = <0x80>; card-detect-delay = <200>; + vmmc-supply = <&buck8>; slot@0 { reg = <0>; |