Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bb787f4 authored by Russell King's avatar Russell King
Browse files

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



Acked-by: default avatarWim Van Sebroeck <wim@iguana.be>
Acked-by: default avatarVitaly Wool <vitalywool@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 0c452df9

arch/arm/mach-pnx4008/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/watchdog/pnx4008_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -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);