summaryrefslogtreecommitdiffstats
path: root/drivers/w1/masters
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-01-22 10:12:04 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-02-08 17:50:21 +0000
commitcc51c9d444ae1532be6a600c65ac0d3d22472c53 (patch)
tree2c5864302666273b66f663fb6411836111dcdc8f /drivers/w1/masters
parent5fe23380405d3a65ce6f46d270c4d3a31027430b (diff)
downloadop-kernel-dev-cc51c9d444ae1532be6a600c65ac0d3d22472c53.zip
op-kernel-dev-cc51c9d444ae1532be6a600c65ac0d3d22472c53.tar.gz
[ARM] omap: w1: convert omap HDQ clocks to match by devid and conid
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/w1/masters')
-rw-r--r--drivers/w1/masters/omap_hdq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c
index c973889..a7e3b70 100644
--- a/drivers/w1/masters/omap_hdq.c
+++ b/drivers/w1/masters/omap_hdq.c
@@ -590,8 +590,8 @@ static int __init omap_hdq_probe(struct platform_device *pdev)
}
/* get interface & functional clock objects */
- hdq_data->hdq_ick = clk_get(&pdev->dev, "hdq_ick");
- hdq_data->hdq_fck = clk_get(&pdev->dev, "hdq_fck");
+ hdq_data->hdq_ick = clk_get(&pdev->dev, "ick");
+ hdq_data->hdq_fck = clk_get(&pdev->dev, "fck");
if (IS_ERR(hdq_data->hdq_ick) || IS_ERR(hdq_data->hdq_fck)) {
dev_dbg(&pdev->dev, "Can't get HDQ clock objects\n");
OpenPOWER on IntegriCloud