Commit eeec7c8d authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] omap: convert omap RNG clocks to match by devid and conid 



Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent b1ad3796

arch/arm/mach-omap2/clock24xx.c

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static struct omap_clk omap24xx_clks[] = { 
	CLK(NULL,	"sdrc_ick",	&sdrc_ick,	CK_243X),

	CLK(NULL,	"des_ick",	&des_ick,	CK_243X | CK_242X),

	CLK(NULL,	"sha_ick",	&sha_ick,	CK_243X | CK_242X),

	CLK(NULL,	"rng_ick",	&rng_ick,	CK_243X | CK_242X),

	CLK("omap_rng",	"ick",		&rng_ick,	CK_243X | CK_242X),

	CLK(NULL,	"aes_ick",	&aes_ick,	CK_243X | CK_242X),

	CLK(NULL,	"pka_ick",	&pka_ick,	CK_243X | CK_242X),

	CLK(NULL,	"usb_fck",	&usb_fck,	CK_243X | CK_242X),

arch/arm/mach-omap2/clock34xx.c

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ static struct omap_clk omap34xx_clks[] = { 
	CLK(NULL,	"usb_l4_ick",	&usb_l4_ick,	CK_3430ES1),

	CLK(NULL,	"security_l4_ick2", &security_l4_ick2, CK_343X),

	CLK(NULL,	"aes1_ick",	&aes1_ick,	CK_343X),

	CLK(NULL,	"rng_ick",	&rng_ick,	CK_343X),

	CLK("omap_rng",	"ick",		&rng_ick,	CK_343X),

	CLK(NULL,	"sha11_ick",	&sha11_ick,	CK_343X),

	CLK(NULL,	"des1_ick",	&des1_ick,	CK_343X),

	CLK(NULL,	"dss1_alwon_fck", &dss1_alwon_fck, CK_343X),

drivers/char/hw_random/omap-rng.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static int __init omap_rng_probe(struct platform_device *pdev) 
		return -EBUSY;



	if (cpu_is_omap24xx()) {

		rng_ick = clk_get(&pdev->dev, "rng_ick");

		rng_ick = clk_get(&pdev->dev, "ick");

		if (IS_ERR(rng_ick)) {

			dev_err(&pdev->dev, "Could not get rng_ick\n");

			ret = PTR_ERR(rng_ick);