[v2,1/3] omap2: Change clk dev id for rng to omap3-rom-rng

Commit Message

Pali Rohár Sept. 20, 2013, 6:24 p.m. UTC

On Friday 20 September 2013 19:46:41 Tony Lindgren wrote:
> * Pali Rohár <[e-mail]> [130920 09:49]:
> > On Friday 20 September 2013 18:23:43 Tony Lindgren wrote:
> > > * Pali Rohár <[e-mail]> [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 <[e-mail]>
> > > > ---
> > > > 
> > > >  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

Ok, then there is new patch which only adding omap3-rom-rng and not removing omap_rng.
It is OK to have same CLK data but with different names?

Comments

Tony Lindgren Sept. 20, 2013, 6:31 p.m. UTC | #1

* Pali Rohár <[e-mail]> [130920 11:32]:
> On Friday 20 September 2013 19:46:41 Tony Lindgren wrote:
> 
> Ok, then there is new patch which only adding omap3-rom-rng and not removing omap_rng.
> It is OK to have same CLK data but with different names?

Yes in this case it's always either omap_rng or omap3-rom-rng
so the patch below looks OK to me.

Regards,

Tony
 
> diff --git a/arch/arm/mach-omap2/cclock3xxx_data.c b/arch/arm/mach-omap2/cclock3xxx_data.c
> index 334b767..03a2829 100644
> --- a/arch/arm/mach-omap2/cclock3xxx_data.c
> +++ b/arch/arm/mach-omap2/cclock3xxx_data.c
> @@ -3275,6 +3275,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),
> 
> 
> -- 
> Pali Rohár
> [e-mail]


--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/arm/mach-omap2/cclock3xxx_data.c b/arch/arm/mach-omap2/cclock3xxx_data.c
index 334b767..03a2829 100644
--- a/arch/arm/mach-omap2/cclock3xxx_data.c
+++ b/arch/arm/mach-omap2/cclock3xxx_data.c
@@ -3275,6 +3275,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),