| Message ID | 1379683507-30793-2-git-send-email-pali.rohar@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Pali Rohár <pali.rohar@gmail.com> [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@gmail.com> > --- > 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Friday 20 September 2013 18:23:43 Tony Lindgren wrote: > * Pali Rohár <pali.rohar@gmail.com> [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@gmail.com> > > --- > > > > 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 I really do not know, but driver char/hw_random/omap-rng.c support only omap2 and omap4 platforms. So "omap_rng" dev id for omap3 is not used. In email [1] you suggested to use clk_get instead clk_get_sys. If I understand correctly clk_get calling clk_get_sys with driver name. So dev in in CLK macro must be same as driver name. And because in cclock3xxx_data.c is dev id "omap_rng" and there is already driver with name "omap_rng", I need to rename dev in cclock3xxx_data.c to get new omap3-rom-rng driver working. Or if you know better way how to do it, let me know. [1] - https://lkml.org/lkml/2013/4/1/278
* Pali Rohár <pali.rohar@gmail.com> [130920 09:49]: > On Friday 20 September 2013 18:23:43 Tony Lindgren wrote: > > * Pali Rohár <pali.rohar@gmail.com> [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@gmail.com> > > > --- > > > > > > 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 > > I really do not know, but driver char/hw_random/omap-rng.c > support only omap2 and omap4 platforms. So "omap_rng" dev id for > omap3 is not used. > > In email [1] you suggested to use clk_get instead clk_get_sys. If > I understand correctly clk_get calling clk_get_sys with driver > name. So dev in in CLK macro must be same as driver name. And > because in cclock3xxx_data.c is dev id "omap_rng" and there is > already driver with name "omap_rng", I need to rename dev in > cclock3xxx_data.c to get new omap3-rom-rng driver working. > > Or if you know better way how to do it, let me know. I think it's safest to keep the existing alias also, and add a comment saying that it may not be available on omap3 processors. Regards, Tony > [1] - https://lkml.org/lkml/2013/4/1/278 > > -- > Pali Rohár > pali.rohar@gmail.com -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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),
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@gmail.com> --- arch/arm/mach-omap2/cclock3xxx_data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)