hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Russell King 2009-11-20 13:07:28 +00:00
parent 0c452df9f0
commit 9bb787f435
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-pnx4008/clock.c
View File

@ -806,7 +806,7 @@ static struct clk_lookup onchip_clkreg[] = {
{ .clk = &uart4_ck, .con_id = "uart4_ck" }, { .clk = &uart4_ck, .con_id = "uart4_ck" },
{ .clk = &uart5_ck, .con_id = "uart5_ck" }, { .clk = &uart5_ck, .con_id = "uart5_ck" },
{ .clk = &uart6_ck, .con_id = "uart6_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) static void local_clk_disable(struct clk *clk)

2
drivers/watchdog/pnx4008_wdt.c
View File

@ -273,7 +273,7 @@ static int __devinit pnx4008_wdt_probe(struct platform_device *pdev)
} }
wdt_base = (void __iomem *)IO_ADDRESS(res->start); 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)) { if (IS_ERR(wdt_clk)) {
ret = PTR_ERR(wdt_clk); ret = PTR_ERR(wdt_clk);
release_resource(wdt_mem); release_resource(wdt_mem);