Message ID | 1398765822-2314-2-git-send-email-wsa@the-dreams.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Tue, Apr 29, 2014 at 12:03:32PM +0200, Wolfram Sang wrote: > From: Wolfram Sang <wsa+renesas@sang-engineering.com> > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > --- > Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt > index 02a25d99ca61..6c3c0847e4fd 100644 > --- a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt > +++ b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt > @@ -10,6 +10,7 @@ index in the group, from 0 to 31. > Required Properties: > > - compatible: Must be one of the following > + - "renesas,r7s72100-mstp-clocks" for R7S72100 (RZ) MSTP gate clocks > - "renesas,r8a7790-mstp-clocks" for R8A7790 (R-Car H2) MSTP gate clocks > - "renesas,r8a7791-mstp-clocks" for R8A7791 (R-Car M2) MSTP gate clocks > - "renesas,cpg-mstp-clock" for generic MSTP gate clocks > -- > 1.9.2 I believe that Mike Turquette (CCed) should take this. I also believe that as it is relates to bindings it needs to be reviewed by the devicetree people (CCed). (Please correct me if I am wrong.)
On Wed, Apr 30, 2014 at 3:41 AM, Simon Horman <horms@verge.net.au> wrote: > On Tue, Apr 29, 2014 at 12:03:32PM +0200, Wolfram Sang wrote: >> From: Wolfram Sang <wsa+renesas@sang-engineering.com> >> >> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> >> --- >> Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt >> index 02a25d99ca61..6c3c0847e4fd 100644 >> --- a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt >> +++ b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt >> @@ -10,6 +10,7 @@ index in the group, from 0 to 31. >> Required Properties: >> >> - compatible: Must be one of the following >> + - "renesas,r7s72100-mstp-clocks" for R7S72100 (RZ) MSTP gate clocks >> - "renesas,r8a7790-mstp-clocks" for R8A7790 (R-Car H2) MSTP gate clocks >> - "renesas,r8a7791-mstp-clocks" for R8A7791 (R-Car M2) MSTP gate clocks >> - "renesas,cpg-mstp-clock" for generic MSTP gate clocks >> -- >> 1.9.2 > > I believe that Mike Turquette (CCed) should take this. > > I also believe that as it is relates to bindings it > needs to be reviewed by the devicetree people (CCed). > (Please correct me if I am wrong.) You're correct, but this change is fairly trivial. Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Quoting Wolfram Sang (2014-04-29 03:03:32) > From: Wolfram Sang <wsa+renesas@sang-engineering.com> > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Acked-by: Mike Turquette <mturquette@linaro.org> No need to take this through the clk tree. Feel free to send it with the rest through arm-soc. Regards, Mike > --- > Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt > index 02a25d99ca61..6c3c0847e4fd 100644 > --- a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt > +++ b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt > @@ -10,6 +10,7 @@ index in the group, from 0 to 31. > Required Properties: > > - compatible: Must be one of the following > + - "renesas,r7s72100-mstp-clocks" for R7S72100 (RZ) MSTP gate clocks > - "renesas,r8a7790-mstp-clocks" for R8A7790 (R-Car H2) MSTP gate clocks > - "renesas,r8a7791-mstp-clocks" for R8A7791 (R-Car M2) MSTP gate clocks > - "renesas,cpg-mstp-clock" for generic MSTP gate clocks > -- > 1.9.2 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
On Mon, May 12, 2014 at 05:05:13PM -0700, Mike Turquette wrote: > Quoting Wolfram Sang (2014-04-29 03:03:32) > > From: Wolfram Sang <wsa+renesas@sang-engineering.com> > > > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > > Acked-by: Mike Turquette <mturquette@linaro.org> > > No need to take this through the clk tree. Feel free to send it with the > rest through arm-soc. Thanks Mike. Wolfram, Its a getting a little to close to rc6 for me to take this series for v3.16, especially considering some bits seem to need tweaking (I am thinking of sci). Could you either: * Re-post it without the sci changes and I'll look at queuing it up for v3.17 or; * Re-post it with the sci changes once the sci driver changes have filtered through. > Regards, > Mike > > > --- > > Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt > > index 02a25d99ca61..6c3c0847e4fd 100644 > > --- a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt > > +++ b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt > > @@ -10,6 +10,7 @@ index in the group, from 0 to 31. > > Required Properties: > > > > - compatible: Must be one of the following > > + - "renesas,r7s72100-mstp-clocks" for R7S72100 (RZ) MSTP gate clocks > > - "renesas,r8a7790-mstp-clocks" for R8A7790 (R-Car H2) MSTP gate clocks > > - "renesas,r8a7791-mstp-clocks" for R8A7791 (R-Car M2) MSTP gate clocks > > - "renesas,cpg-mstp-clock" for generic MSTP gate clocks > > -- > > 1.9.2 > > > > > > _______________________________________________ > > linux-arm-kernel mailing list > > linux-arm-kernel@lists.infradead.org > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > -- > To unsubscribe from this list: send the line "unsubscribe linux-sh" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >
Simon, > Its a getting a little to close to rc6 for me to take this series for v3.16, > especially considering some bits seem to need tweaking (I am thinking of sci). > > Could you either: > > * Re-post it without the sci changes and > I'll look at queuing it up for v3.17 or; If it is possible and does not cause too much burden for you, I'd prefer to include it soonish and handle the fixups incrementally. Since it touches a few files which change a lot, rebasing and retesting is extra work (done twice for this series IIRC) and thus I'd prefer to do the clenaups as seperate patches. So, if no one objects, I'll resend tomorrow with Geerts fixup folded into my series and retested against latest renesas/devel.
On Tue, May 13, 2014 at 11:59:29PM +0200, Wolfram Sang wrote: > Simon, > > > Its a getting a little to close to rc6 for me to take this series for v3.16, > > especially considering some bits seem to need tweaking (I am thinking of sci). > > > > Could you either: > > > > * Re-post it without the sci changes and > > I'll look at queuing it up for v3.17 or; > > If it is possible and does not cause too much burden for you, I'd prefer > to include it soonish and handle the fixups incrementally. Since it > touches a few files which change a lot, rebasing and retesting is extra > work (done twice for this series IIRC) and thus I'd prefer to do the > clenaups as seperate patches. > > So, if no one objects, I'll resend tomorrow with Geerts fixup folded > into my series and retested against latest renesas/devel. I will do my best. But I need to have pull-requests sent off to the arm-soc maintainers before rc6 appears. And ideally patches should have been present in next for a day before I send such a request. So by my calculations I need to push things to my next tree very soon (i.e. today) in order to reach the above mentioned criteria.
> I will do my best. But I need to have pull-requests sent off > to the arm-soc maintainers before rc6 appears. And ideally patches > should have been present in next for a day before I send such a request. > So by my calculations I need to push things to my next tree very > soon (i.e. today) in order to reach the above mentioned criteria. Thank you very much! Luckily(?) I can't sleep today, so I'll send the patches tested against renesas/devel in a few minutes.
On Wed, May 14, 2014 at 02:11:36AM +0200, Wolfram Sang wrote: > > I will do my best. But I need to have pull-requests sent off > > to the arm-soc maintainers before rc6 appears. And ideally patches > > should have been present in next for a day before I send such a request. > > So by my calculations I need to push things to my next tree very > > soon (i.e. today) in order to reach the above mentioned criteria. > > Thank you very much! Luckily(?) I can't sleep today, so I'll send the > patches tested against renesas/devel in a few minutes. Luckily ! :^) I see the new series and am queuing it up. So far, so good :)
Hi Mike, Stephen, On Tue, May 13, 2014 at 2:05 AM, Mike Turquette <mturquette@linaro.org> wrote: > Quoting Wolfram Sang (2014-04-29 03:03:32) >> From: Wolfram Sang <wsa+renesas@sang-engineering.com> >> >> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > > Acked-by: Mike Turquette <mturquette@linaro.org> > > No need to take this through the clk tree. Feel free to send it with the > rest through arm-soc. (merging in clk/clk-next) Note that this will cause a conflict for you, as Mike applied commit 5483bf698f42a6f0467463b064084eb888298232 ("clk: shmobile: r8a7779: Add MSTP clock support"), which adds a line at the exact same spot. Resolution: both lines should be kept. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Hi Geert, On Wed, 14 May 2014 12:26:38 +0200 Geert Uytterhoeven <geert@linux-m68k.org> wrote: > > On Tue, May 13, 2014 at 2:05 AM, Mike Turquette <mturquette@linaro.org> wrote: > > Quoting Wolfram Sang (2014-04-29 03:03:32) > >> From: Wolfram Sang <wsa+renesas@sang-engineering.com> > >> > >> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > > > > Acked-by: Mike Turquette <mturquette@linaro.org> > > > > No need to take this through the clk tree. Feel free to send it with the > > rest through arm-soc. > > (merging in clk/clk-next) > > Note that this will cause a conflict for you, as Mike applied commit > 5483bf698f42a6f0467463b064084eb888298232 ("clk: shmobile: r8a7779: > Add MSTP clock support"), which adds a line at the exact same spot. > > Resolution: both lines should be kept. Thanks.
diff --git a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt index 02a25d99ca61..6c3c0847e4fd 100644 --- a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt +++ b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt @@ -10,6 +10,7 @@ index in the group, from 0 to 31. Required Properties: - compatible: Must be one of the following + - "renesas,r7s72100-mstp-clocks" for R7S72100 (RZ) MSTP gate clocks - "renesas,r8a7790-mstp-clocks" for R8A7790 (R-Car H2) MSTP gate clocks - "renesas,r8a7791-mstp-clocks" for R8A7791 (R-Car M2) MSTP gate clocks - "renesas,cpg-mstp-clock" for generic MSTP gate clocks