diff options
-rw-r--r-- | arch/arm/mach-pnx4008/clock.c | 2 | ||||
-rw-r--r-- | drivers/watchdog/pnx4008_wdt.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pnx4008/clock.c b/arch/arm/mach-pnx4008/clock.c index 3ad694e1596..e5140237fb1 100644 --- a/arch/arm/mach-pnx4008/clock.c +++ b/arch/arm/mach-pnx4008/clock.c | |||
@@ -806,7 +806,7 @@ static struct clk_lookup onchip_clkreg[] = { | |||
806 | { .clk = &uart4_ck, .con_id = "uart4_ck" }, | 806 | { .clk = &uart4_ck, .con_id = "uart4_ck" }, |
807 | { .clk = &uart5_ck, .con_id = "uart5_ck" }, | 807 | { .clk = &uart5_ck, .con_id = "uart5_ck" }, |
808 | { .clk = &uart6_ck, .con_id = "uart6_ck" }, | 808 | { .clk = &uart6_ck, .con_id = "uart6_ck" }, |
809 | { .clk = &wdt_ck, .con_id = "wdt_ck" }, | 809 | { .clk = &wdt_ck, .dev_id = "pnx4008-watchdog" }, |
810 | }; | 810 | }; |
811 | 811 | ||
812 | static void local_clk_disable(struct clk *clk) | 812 | static void local_clk_disable(struct clk *clk) |
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c index 430a5848a9a..8c5367fc4e5 100644 --- a/drivers/watchdog/pnx4008_wdt.c +++ b/drivers/watchdog/pnx4008_wdt.c | |||
@@ -273,7 +273,7 @@ static int __devinit pnx4008_wdt_probe(struct platform_device *pdev) | |||
273 | } | 273 | } |
274 | wdt_base = (void __iomem *)IO_ADDRESS(res->start); | 274 | wdt_base = (void __iomem *)IO_ADDRESS(res->start); |
275 | 275 | ||
276 | wdt_clk = clk_get(&pdev->dev, "wdt_ck"); | 276 | wdt_clk = clk_get(&pdev->dev, NULL); |
277 | if (IS_ERR(wdt_clk)) { | 277 | if (IS_ERR(wdt_clk)) { |
278 | ret = PTR_ERR(wdt_clk); | 278 | ret = PTR_ERR(wdt_clk); |
279 | release_resource(wdt_mem); | 279 | release_resource(wdt_mem); |