ARM: PNX4008: convert watchdog clocks to match by device only

Acked-by: Wim Van Sebroeck <wim@iguana.be>
Acked-by: Vitaly Wool <vitalywool@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mach-pnx4008/clock.c b/arch/arm/mach-pnx4008/clock.c
index 3ad694e15968ca4561ed7b46e5aa282a6643ba5a..e5140237fb15d6491f145e23ad7a246899d0daa3 100644 (file)
--- a/arch/arm/mach-pnx4008/clock.c
+++ b/arch/arm/mach-pnx4008/clock.c
@@ -806,7 +806,7 @@ static struct clk_lookup onchip_clkreg[] = {
        { .clk = &uart4_ck,     .con_id = "uart4_ck"    },
        { .clk = &uart5_ck,     .con_id = "uart5_ck"    },
        { .clk = &uart6_ck,     .con_id = "uart6_ck"    },
-       { .clk = &wdt_ck,       .con_id = "wdt_ck"      },
+       { .clk = &wdt_ck,       .dev_id = "pnx4008-watchdog" },
 };
 
 static void local_clk_disable(struct clk *clk)

diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
index 430a5848a9a5d40a6bb1aeb770c76e26df357be2..8c5367fc4e50c8e52d6f3e98e338c33f3090cb1d 100644 (file)
--- 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)
        }
        wdt_base = (void __iomem *)IO_ADDRESS(res->start);
 
-       wdt_clk = clk_get(&pdev->dev, "wdt_ck");
+       wdt_clk = clk_get(&pdev->dev, NULL);
        if (IS_ERR(wdt_clk)) {
                ret = PTR_ERR(wdt_clk);
                release_resource(wdt_mem);