diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-01-22 05:12:04 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-02-08 12:50:21 -0500 |
| commit | cc51c9d444ae1532be6a600c65ac0d3d22472c53 (patch) | |
| tree | 2c5864302666273b66f663fb6411836111dcdc8f /drivers/w1 | |
| parent | 5fe23380405d3a65ce6f46d270c4d3a31027430b (diff) | |
[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')
| -rw-r--r-- | drivers/w1/masters/omap_hdq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c index c973889110c8..a7e3b706b9d3 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) | |||
| 590 | } | 590 | } |
| 591 | 591 | ||
| 592 | /* get interface & functional clock objects */ | 592 | /* get interface & functional clock objects */ |
| 593 | hdq_data->hdq_ick = clk_get(&pdev->dev, "hdq_ick"); | 593 | hdq_data->hdq_ick = clk_get(&pdev->dev, "ick"); |
| 594 | hdq_data->hdq_fck = clk_get(&pdev->dev, "hdq_fck"); | 594 | hdq_data->hdq_fck = clk_get(&pdev->dev, "fck"); |
| 595 | 595 | ||
| 596 | if (IS_ERR(hdq_data->hdq_ick) || IS_ERR(hdq_data->hdq_fck)) { | 596 | if (IS_ERR(hdq_data->hdq_ick) || IS_ERR(hdq_data->hdq_fck)) { |
| 597 | dev_dbg(&pdev->dev, "Can't get HDQ clock objects\n"); | 597 | dev_dbg(&pdev->dev, "Can't get HDQ clock objects\n"); |