* Pali Rohár <pali.rohar@xxxxxxxxx> [130920 06:33]: > Name omap_rng is already used by omap_rng driver which is for omap2 and omap4. > For omap3 HS devices there is new driver omap3-rom-rng which needs that clk. > And because there cannot be two drivers with same name, rename omap3 clk dev id. > > Signed-off-by: Pali Rohár <pali.rohar@xxxxxxxxx> > --- > arch/arm/mach-omap2/cclock3xxx_data.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/mach-omap2/cclock3xxx_data.c b/arch/arm/mach-omap2/cclock3xxx_data.c > index 334b767..5059338 100644 > --- a/arch/arm/mach-omap2/cclock3xxx_data.c > +++ b/arch/arm/mach-omap2/cclock3xxx_data.c > @@ -3274,7 +3274,7 @@ static struct omap_clk omap36xx_clks[] = { > */ > static struct omap_clk omap34xx_omap36xx_clks[] = { > CLK(NULL, "aes1_ick", &aes1_ick), > - CLK("omap_rng", "ick", &rng_ick), > + CLK("omap3-rom-rng", "ick", &rng_ick), > CLK(NULL, "sha11_ick", &sha11_ick), > CLK(NULL, "des1_ick", &des1_ick), > CLK(NULL, "cam_mclk", &cam_mclk), Hmm are you sure the omap_rng is not available on any of the omap3 GP versions? If so, the omap_rng alias should be kept as well. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html