Re: [PATCH v2] h8300: Replace <linux/clk-provider.h> by <linux/of_clk.h>

[Masahiro Yamada]

On Mon, Aug 24, 2020 at 12:46 PM Yoshinori Sato
<ysato@xxxxxxxxxxxxxxxxxxxx> wrote:
>
> On Wed, 19 Aug 2020 21:29:25 +0900,
> Geert Uytterhoeven wrote:
> >
> > The H8/300 platform code is not a clock provider, and just needs to call
> > of_clk_init().
> >
> > Hence it can include <linux/of_clk.h> instead of <linux/clk-provider.h>.
> >
> > Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
> > Reviewed-by: Stephen Boyd <sboyd@xxxxxxxxxx>
> > ---
> > v2:
> >   - Add Reviewed-by.
> > ---
> >  arch/h8300/kernel/setup.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/arch/h8300/kernel/setup.c b/arch/h8300/kernel/setup.c
> > index 28ac88358a89a4f9..0ecaac7dd7e93d9f 100644
> > --- a/arch/h8300/kernel/setup.c
> > +++ b/arch/h8300/kernel/setup.c
> > @@ -24,7 +24,7 @@
> >  #include <linux/of.h>
> >  #include <linux/of_fdt.h>
> >  #include <linux/of_address.h>
> > -#include <linux/clk-provider.h>
> > +#include <linux/of_clk.h>
> >  #include <linux/memblock.h>
> >  #include <linux/screen_info.h>
> >  #include <linux/clocksource.h>
> > --
> > 2.17.1
> >
>
> Applied h8300-next.
> Thanks.
>
> --
> Yosinori Sato


Sato-san,


The following two commits should be dropped
from your branch.

(The first one reverts the upstream commit,
then the second one re-adds it.)




commit de98871736825349b367275b0790e42ea4157350
Author:     Yoshinori Sato <ysato@xxxxxxxxxxxxxxxxxxxx>
AuthorDate: Thu Apr 16 13:43:01 2020 +0900
Commit:     Yoshinori Sato <ysato@xxxxxxxxxxxxxxxxxxxx>
CommitDate: Thu Apr 16 13:43:01 2020 +0900

    h8300: move definition of __kernel_size_t etc. to posix_types.h

    These types should be defined in posix_types.h, not in bitsperlong.h .

    With these defines moved, h8300-specific bitsperlong.h is no longer
    needed since Kbuild will automatically create a wrapper of
    include/uapi/asm-generic/bitsperlong.h

    Signed-off-by: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx>
    Signed-off-by: Yoshinori Sato <ysato@xxxxxxxxxxxxxxxxxxxx>

commit ece7be2c964c2aa5015e74628ca33c03a5ff4e47
Author:     Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx>
AuthorDate: Tue Jul 23 19:21:06 2019 +0900
Commit:     Yoshinori Sato <ysato@xxxxxxxxxxxxxxxxxxxx>
CommitDate: Thu Apr 16 13:40:31 2020 +0900

    h8300: move definition of __kernel_size_t etc. to posix_types.h

    These types should be defined in posix_types.h, not in bitsperlong.h .

    With these defines moved, h8300-specific bitsperlong.h is no longer
    needed since Kbuild will automatically create a wrapper of
    include/uapi/asm-generic/bitsperlong.h

    Signed-off-by: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx>
    Signed-off-by: Yoshinori Sato <ysato@xxxxxxxxxxxxxxxxxxxx>




-- 
Best Regards
Masahiro Yamada