diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-01-28 05:22:50 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-02-08 12:50:23 -0500 |
commit | 6f7607ccd175518a3ee7dccc1620f3a086689668 (patch) | |
tree | 362d4f7e78b9c11ef789bc91abf1cebc55415a0b /drivers/mmc/host/omap_hsmmc.c | |
parent | 6c5dbb40f4795f3fdbf3e5aab7eda4e2f838d08b (diff) |
[ARM] omap: hsmmc: new short connection id names
... rather than the clock names themselves.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/mmc/host/omap_hsmmc.c')
-rw-r--r-- | drivers/mmc/host/omap_hsmmc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index db37490f67ec..65e0743dbdd9 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c | |||
@@ -920,13 +920,13 @@ static int __init omap_mmc_probe(struct platform_device *pdev) | |||
920 | 920 | ||
921 | sema_init(&host->sem, 1); | 921 | sema_init(&host->sem, 1); |
922 | 922 | ||
923 | host->iclk = clk_get(&pdev->dev, "mmchs_ick"); | 923 | host->iclk = clk_get(&pdev->dev, "ick"); |
924 | if (IS_ERR(host->iclk)) { | 924 | if (IS_ERR(host->iclk)) { |
925 | ret = PTR_ERR(host->iclk); | 925 | ret = PTR_ERR(host->iclk); |
926 | host->iclk = NULL; | 926 | host->iclk = NULL; |
927 | goto err1; | 927 | goto err1; |
928 | } | 928 | } |
929 | host->fclk = clk_get(&pdev->dev, "mmchs_fck"); | 929 | host->fclk = clk_get(&pdev->dev, "fck"); |
930 | if (IS_ERR(host->fclk)) { | 930 | if (IS_ERR(host->fclk)) { |
931 | ret = PTR_ERR(host->fclk); | 931 | ret = PTR_ERR(host->fclk); |
932 | host->fclk = NULL; | 932 | host->fclk = NULL; |