| Message ID | 1403555350-14895-1-git-send-email-anarsoul@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Am Montag, 23. Juni 2014, 23:29:09 schrieb Vasily Khoruzhick: > There's a several typos in a driver: 2410 instead of S3C2410 > and wrong argument to ARRAY_SIZE(). They prevent s3c2410 > from properly booting. > > Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Thanks for catching these. Reviewed-by: Heiko Stuebner <heiko@sntech.de> > --- > drivers/clk/samsung/clk-s3c2410.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/clk/samsung/clk-s3c2410.c > b/drivers/clk/samsung/clk-s3c2410.c index ba07168..bd9a873 100644 > --- a/drivers/clk/samsung/clk-s3c2410.c > +++ b/drivers/clk/samsung/clk-s3c2410.c > @@ -378,7 +378,7 @@ void __init s3c2410_common_clk_init(struct device_node > *np, unsigned long xti_f, if (!np) > s3c2410_common_clk_register_fixed_ext(ctx, xti_f); > > - if (current_soc == 2410) { > + if (current_soc == S3C2410) { > if (_get_rate("xti") == 12 * MHZ) { > s3c2410_plls[mpll].rate_table = pll_s3c2410_12mhz_tbl; > s3c2410_plls[upll].rate_table = pll_s3c2410_12mhz_tbl; > @@ -432,7 +432,7 @@ void __init s3c2410_common_clk_init(struct device_node > *np, unsigned long xti_f, samsung_clk_register_fixed_factor(ctx, > s3c2410_ffactor, > ARRAY_SIZE(s3c2410_ffactor)); > samsung_clk_register_alias(ctx, s3c2410_aliases, > - ARRAY_SIZE(s3c2410_common_aliases)); > + ARRAY_SIZE(s3c2410_aliases)); > break; > case S3C2440: > samsung_clk_register_mux(ctx, s3c2440_muxes,
Hi Vasily, On 23.06.2014 22:29, Vasily Khoruzhick wrote: > There's a several typos in a driver: 2410 instead of S3C2410 > and wrong argument to ARRAY_SIZE(). They prevent s3c2410 > from properly booting. Thanks for fixing this. I will apply and send to Mike with other fixes. Same for patch 2/2. Best regards, Tomasz
On 23.06.2014 22:29, Vasily Khoruzhick wrote: > There's a several typos in a driver: 2410 instead of S3C2410 > and wrong argument to ARRAY_SIZE(). They prevent s3c2410 > from properly booting. > > Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> > --- > drivers/clk/samsung/clk-s3c2410.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Applied as a fix for 3.16. Best regards, Tomasz
On 30 June 2014 15:49:58 Tomasz Figa wrote: > On 23.06.2014 22:29, Vasily Khoruzhick wrote: > > There's a several typos in a driver: 2410 instead of S3C2410 > > and wrong argument to ARRAY_SIZE(). They prevent s3c2410 > > from properly booting. > > > > Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> > > --- > > > > drivers/clk/samsung/clk-s3c2410.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > Applied as a fix for 3.16. Hi Tomasz, I also have clk fixes for s3c24xx touchscreen, framebuffer, adc, usb and nand drivers (to replace clk_enable with clk_prepare_enable and clk_disable with clk_disable_unprepare), Should they be merged through different trees or it's possible to merge them through a single tree? > > Best regards, > Tomasz Regards Vasily
Hi Vasily, On 30.06.2014 16:02, Vasily Khoruzhick wrote: > On 30 June 2014 15:49:58 Tomasz Figa wrote: >> On 23.06.2014 22:29, Vasily Khoruzhick wrote: >>> There's a several typos in a driver: 2410 instead of S3C2410 >>> and wrong argument to ARRAY_SIZE(). They prevent s3c2410 >>> from properly booting. >>> >>> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> >>> --- >>> >>> drivers/clk/samsung/clk-s3c2410.c | 4 ++-- >>> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> Applied as a fix for 3.16. > > Hi Tomasz, > > I also have clk fixes for s3c24xx touchscreen, framebuffer, adc, usb and nand > drivers (to replace clk_enable with clk_prepare_enable and clk_disable with > clk_disable_unprepare), > > Should they be merged through different trees or it's possible to merge them > through a single tree? I'd say they should all go through respective subsystem trees, unless they directly depend on patches I already applied, which is not the case as far as I can see. Best regards, Tomasz
On 30 June 2014 16:07:24 Tomasz Figa wrote: > Hi Vasily, > > On 30.06.2014 16:02, Vasily Khoruzhick wrote: > > On 30 June 2014 15:49:58 Tomasz Figa wrote: > >> On 23.06.2014 22:29, Vasily Khoruzhick wrote: > >>> There's a several typos in a driver: 2410 instead of S3C2410 > >>> and wrong argument to ARRAY_SIZE(). They prevent s3c2410 > >>> from properly booting. > >>> > >>> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> > >>> --- > >>> > >>> drivers/clk/samsung/clk-s3c2410.c | 4 ++-- > >>> 1 file changed, 2 insertions(+), 2 deletions(-) > >> > >> Applied as a fix for 3.16. > > > > Hi Tomasz, > > > > I also have clk fixes for s3c24xx touchscreen, framebuffer, adc, usb and > > nand drivers (to replace clk_enable with clk_prepare_enable and > > clk_disable with clk_disable_unprepare), > > > > Should they be merged through different trees or it's possible to merge > > them through a single tree? > > I'd say they should all go through respective subsystem trees, unless > they directly depend on patches I already applied, which is not the case > as far as I can see. Hm, they aren't necessary for compiling the kernel, but system fails to boot without these patches due to merge of common clk changes for s3c24xx. > Best regards, > Tomasz P.S. Sorry for 2nd mail, Tomasz, I've occassionally omited MLs.
diff --git a/drivers/clk/samsung/clk-s3c2410.c b/drivers/clk/samsung/clk-s3c2410.c index ba07168..bd9a873 100644 --- a/drivers/clk/samsung/clk-s3c2410.c +++ b/drivers/clk/samsung/clk-s3c2410.c @@ -378,7 +378,7 @@ void __init s3c2410_common_clk_init(struct device_node *np, unsigned long xti_f, if (!np) s3c2410_common_clk_register_fixed_ext(ctx, xti_f); - if (current_soc == 2410) { + if (current_soc == S3C2410) { if (_get_rate("xti") == 12 * MHZ) { s3c2410_plls[mpll].rate_table = pll_s3c2410_12mhz_tbl; s3c2410_plls[upll].rate_table = pll_s3c2410_12mhz_tbl; @@ -432,7 +432,7 @@ void __init s3c2410_common_clk_init(struct device_node *np, unsigned long xti_f, samsung_clk_register_fixed_factor(ctx, s3c2410_ffactor, ARRAY_SIZE(s3c2410_ffactor)); samsung_clk_register_alias(ctx, s3c2410_aliases, - ARRAY_SIZE(s3c2410_common_aliases)); + ARRAY_SIZE(s3c2410_aliases)); break; case S3C2440: samsung_clk_register_mux(ctx, s3c2440_muxes,
There's a several typos in a driver: 2410 instead of S3C2410 and wrong argument to ARRAY_SIZE(). They prevent s3c2410 from properly booting. Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> --- drivers/clk/samsung/clk-s3c2410.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)