summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2014-03-31 16:19:21 +0400
committerUlf Hansson <ulf.hansson@linaro.org>2014-05-12 14:52:38 +0400
commit1a7e99c1fe080cc75ab34e1cbf788ed09b2f58b5 (patch)
tree2dd9ec484e26323cf03919d72ccc3b12c374aa53
parentae94cafe293343c2680c638c7af8499d708e4d71 (diff)
downloadlinux-1a7e99c1fe080cc75ab34e1cbf788ed09b2f58b5.tar.xz
mmc: mmci: Add DT bindings for feedback clock pin
The ST Micro variant supports the option of using a feedback clock signal in favor of the clockout pin when latching incoming signals on the data bus. Since this is matter of how pins are being routed we need to provide a new DT binding to be able to configure this through DT. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--Documentation/devicetree/bindings/mmc/mmci.txt2
-rw-r--r--drivers/mmc/host/mmci.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/mmc/mmci.txt b/Documentation/devicetree/bindings/mmc/mmci.txt
index 9bd2ffa704a7..2c8756fb7755 100644
--- a/Documentation/devicetree/bindings/mmc/mmci.txt
+++ b/Documentation/devicetree/bindings/mmc/mmci.txt
@@ -24,6 +24,7 @@ Optional properties:
- st,sig-dir-dat31 : bus signal direction pin used for DAT[3] and DAT[1].
- st,sig-dir-dat74 : bus signal direction pin used for DAT[4] to DAT[7].
- st,sig-dir-cmd : cmd signal direction pin used for CMD.
+- st,sig-pin-fbclk : feedback clock signal pin used.
Example:
@@ -47,6 +48,7 @@ sdi0_per1@80126000 {
st,sig-dir-dat0;
st,sig-dir-dat2;
st,sig-dir-cmd;
+ st,sig-pin-fbclk;
vmmc-supply = <&ab8500_ldo_aux3_reg>;
vqmmc-supply = <&vmmci>;
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index aa26e810b7ad..2ce9111c4627 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -1402,6 +1402,8 @@ static void mmci_dt_populate_generic_pdata(struct device_node *np,
pdata->sigdir |= MCI_ST_DATA74DIREN;
if (of_get_property(np, "st,sig-dir-cmd", NULL))
pdata->sigdir |= MCI_ST_CMDDIREN;
+ if (of_get_property(np, "st,sig-pin-fbclk", NULL))
+ pdata->sigdir |= MCI_ST_FBCLKEN;
pdata->gpio_wp = of_get_named_gpio(np, "wp-gpios", 0);
pdata->gpio_cd = of_get_named_gpio(np, "cd-gpios", 0);