| Message ID | 538B7B6C.3020601@elopez.com.ar |
|---|---|
| State | New |
| Headers | show |
Quoting Emilio López (2014-06-01 12:13:48) > Hi Mike, > > Here is the sunxi clocks pull for 3.16. As you probably saw during the > cycle, this mostly contains improved A31 support and a bit of > housekeeping. Please note that this pull does *not* contain the MMC > clock patches Hans sent, as you merged those yourself on clk-next Hi Emilio, -rc8 is pretty late for me to take this in under normal circumstances, and since the merge window opened early this time I will defer taking this pull request in until 3.16-rc1 is released. It'll be one of the first things applied to the new clk-next. Regards, Mike > > Cheers, > > Emilio > > --->8--- > > The following changes since commit c9eaa447e77efe77b7fa4c953bd62de8297fd6c5: > > Linux 3.15-rc1 (2014-04-13 14:18:35 -0700) > > are available in the git repository at: > > https://bitbucket.org/emiliolopez/linux.git tags/sunxi-clk-for-3.16 > > for you to fetch changes up to 4da7e86418af722793610e57cee9d3e73d16ed58: > > clk: sunxi: document PRCM clock compatible strings (2014-05-15 > 12:20:14 -0300) > > ---------------------------------------------------------------- > Allwinner sunXi SoCs clock changes > > This pull contains some new code to add support for A31 clocks by Maxime > and Boris. It also reworks the driver a bit to avoid having a huge > single file when we have a full folder for ourselves, and separating > different functional units makes sense. > > ---------------------------------------------------------------- > Boris BREZILLON (2): > clk: sunxi: add PRCM (Power/Reset/Clock Management) clks support > clk: sunxi: document PRCM clock compatible strings > > Emilio López (1): > clk: sunxi: document new A31 USB clock compatible > > Maxime Ripard (7): > clk: sunxi: Implement A31 USB clock > clk: sunxi: Remove calls to clk_put > clk: sunxi: Move the 24M oscillator to a file of its own > clk: sunxi: Move the GMAC clock to a file of its own > clk: sunxi: Rework clock protection code > clk: sun6i: Protect CPU clock > clk: sun6i: Protect SDRAM gating bit > > Documentation/devicetree/bindings/clock/sunxi.txt | 4 +++ > drivers/clk/sunxi/Makefile | 4 +++ > drivers/clk/sunxi/clk-a10-hosc.c | 73 > +++++++++++++++++++++++++++++++++++++++++ > drivers/clk/sunxi/clk-a20-gmac.c | 119 > ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > drivers/clk/sunxi/clk-sun6i-apb0-gates.c | 99 > +++++++++++++++++++++++++++++++++++++++++++++++++++++++ > drivers/clk/sunxi/clk-sun6i-apb0.c | 77 > +++++++++++++++++++++++++++++++++++++++++++ > drivers/clk/sunxi/clk-sun6i-ar100.c | 233 > ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > drivers/clk/sunxi/clk-sunxi.c | 239 > +++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------- > 8 files changed, 661 insertions(+), 187 deletions(-) > create mode 100644 drivers/clk/sunxi/clk-a10-hosc.c > create mode 100644 drivers/clk/sunxi/clk-a20-gmac.c > create mode 100644 drivers/clk/sunxi/clk-sun6i-apb0-gates.c > create mode 100644 drivers/clk/sunxi/clk-sun6i-apb0.c > create mode 100644 drivers/clk/sunxi/clk-sun6i-ar100.c
Hi Mike, On Tue, Jun 03, 2014 at 10:41:20AM -0700, Mike Turquette wrote: > Quoting Emilio López (2014-06-01 12:13:48) > > Hi Mike, > > > > Here is the sunxi clocks pull for 3.16. As you probably saw during the > > cycle, this mostly contains improved A31 support and a bit of > > housekeeping. Please note that this pull does *not* contain the MMC > > clock patches Hans sent, as you merged those yourself on clk-next > > Hi Emilio, > > -rc8 is pretty late for me to take this in under normal circumstances, > and since the merge window opened early this time I will defer taking > this pull request in until 3.16-rc1 is released. It'll be one of the > first things applied to the new clk-next. I know that Emilio has been pretty late at sending this, but at least the A31 USB clocks patches is quite important for us, since it would allow to add the A31 to Olof's boot test farm. Could you reconsider merging this? Just so that doesn't happen again, when do you expect the pull requests? Thanks, Maxime
Quoting Maxime Ripard (2014-06-04 00:19:22) > Hi Mike, > > On Tue, Jun 03, 2014 at 10:41:20AM -0700, Mike Turquette wrote: > > Quoting Emilio López (2014-06-01 12:13:48) > > > Hi Mike, > > > > > > Here is the sunxi clocks pull for 3.16. As you probably saw during the > > > cycle, this mostly contains improved A31 support and a bit of > > > housekeeping. Please note that this pull does *not* contain the MMC > > > clock patches Hans sent, as you merged those yourself on clk-next > > > > Hi Emilio, > > > > -rc8 is pretty late for me to take this in under normal circumstances, > > and since the merge window opened early this time I will defer taking > > this pull request in until 3.16-rc1 is released. It'll be one of the > > first things applied to the new clk-next. > > I know that Emilio has been pretty late at sending this, but at least > the A31 USB clocks patches is quite important for us, since it would > allow to add the A31 to Olof's boot test farm. I guess you will still reap the benefits of Olof's boot testing if this is merged after 3.16-rc1? > > Could you reconsider merging this? > > Just so that doesn't happen again, when do you expect the pull > requests? There isn't a hard rule for "must be in by -rcN". But I really don't like taking patches after the merge window opens. Something bothers me about the commitdate for patches in clk-next being later than the commitdate for the new Linux major release. I always take some trivial patches during this time, or fixes which are obvious and would have to be sent for the next round of -rc's anyways, but features or new hardware support is something I don't like to take after the merge window opens. I was bit a couple merge windows back by trying to be too aggressive about sneaking stuff in at the last minute and I learned my lesson ;-) Regards, Mike > > Thanks, > Maxime > > -- > Maxime Ripard, Free Electrons > Embedded Linux, Kernel and Android engineering > http://free-electrons.com
On Wed, Jun 04, 2014 at 08:12:16AM -0700, Mike Turquette wrote: > Quoting Maxime Ripard (2014-06-04 00:19:22) > > Hi Mike, > > > > On Tue, Jun 03, 2014 at 10:41:20AM -0700, Mike Turquette wrote: > > > Quoting Emilio López (2014-06-01 12:13:48) > > > > Hi Mike, > > > > > > > > Here is the sunxi clocks pull for 3.16. As you probably saw during the > > > > cycle, this mostly contains improved A31 support and a bit of > > > > housekeeping. Please note that this pull does *not* contain the MMC > > > > clock patches Hans sent, as you merged those yourself on clk-next > > > > > > Hi Emilio, > > > > > > -rc8 is pretty late for me to take this in under normal circumstances, > > > and since the merge window opened early this time I will defer taking > > > this pull request in until 3.16-rc1 is released. It'll be one of the > > > first things applied to the new clk-next. > > > > I know that Emilio has been pretty late at sending this, but at least > > the A31 USB clocks patches is quite important for us, since it would > > allow to add the A31 to Olof's boot test farm. > > I guess you will still reap the benefits of Olof's boot testing if this > is merged after 3.16-rc1? Well, yeah, but it would be delayed by a release, while the needed drivers are already there. > > Could you reconsider merging this? > > > > Just so that doesn't happen again, when do you expect the pull > > requests? > > There isn't a hard rule for "must be in by -rcN". But I really don't > like taking patches after the merge window opens. Something bothers me > about the commitdate for patches in clk-next being later than the > commitdate for the new Linux major release. Which won't happen in this case, since we're at -rc8 ;) > I always take some trivial patches during this time, or fixes which > are obvious and would have to be sent for the next round of -rc's > anyways, but features or new hardware support is something I don't > like to take after the merge window opens. > > I was bit a couple merge windows back by trying to be too aggressive > about sneaking stuff in at the last minute and I learned my lesson > ;-) If it makes it easier for you, I've been carrying these patches for quite some time in my working branch. But I definitely understand. Thanks, Maxime
Quoting Maxime Ripard (2014-06-04 08:50:49) > On Wed, Jun 04, 2014 at 08:12:16AM -0700, Mike Turquette wrote: > > Quoting Maxime Ripard (2014-06-04 00:19:22) > > > Hi Mike, > > > > > > On Tue, Jun 03, 2014 at 10:41:20AM -0700, Mike Turquette wrote: > > > > Quoting Emilio López (2014-06-01 12:13:48) > > > > > Hi Mike, > > > > > > > > > > Here is the sunxi clocks pull for 3.16. As you probably saw during the > > > > > cycle, this mostly contains improved A31 support and a bit of > > > > > housekeeping. Please note that this pull does *not* contain the MMC > > > > > clock patches Hans sent, as you merged those yourself on clk-next > > > > > > > > Hi Emilio, > > > > > > > > -rc8 is pretty late for me to take this in under normal circumstances, > > > > and since the merge window opened early this time I will defer taking > > > > this pull request in until 3.16-rc1 is released. It'll be one of the > > > > first things applied to the new clk-next. > > > > > > I know that Emilio has been pretty late at sending this, but at least > > > the A31 USB clocks patches is quite important for us, since it would > > > allow to add the A31 to Olof's boot test farm. > > > > I guess you will still reap the benefits of Olof's boot testing if this > > is merged after 3.16-rc1? > > Well, yeah, but it would be delayed by a release, while the needed > drivers are already there. > > > > Could you reconsider merging this? > > > > > > Just so that doesn't happen again, when do you expect the pull > > > requests? > > > > There isn't a hard rule for "must be in by -rcN". But I really don't > > like taking patches after the merge window opens. Something bothers me > > about the commitdate for patches in clk-next being later than the > > commitdate for the new Linux major release. > > Which won't happen in this case, since we're at -rc8 ;) Technically that is correct, but this time around we have the weird "lets do -rc8 and open the merge window at the same time" thing. So my commitdate example isn't perfect, but the point is that the merge window has opened and I plan to send my pull request on Friday, so I'm not taking anything else for 3.16. Sorry for the inconvenience. Regards, Mike > > > I always take some trivial patches during this time, or fixes which > > are obvious and would have to be sent for the next round of -rc's > > anyways, but features or new hardware support is something I don't > > like to take after the merge window opens. > > > > I was bit a couple merge windows back by trying to be too aggressive > > about sneaking stuff in at the last minute and I learned my lesson > > ;-) > > If it makes it easier for you, I've been carrying these patches for > quite some time in my working branch. > > But I definitely understand. > > Thanks, > Maxime > > -- > Maxime Ripard, Free Electrons > Embedded Linux, Kernel and Android engineering > http://free-electrons.com
Hi Mike, Here is the sunxi clocks pull for 3.16. As you probably saw during the cycle, this mostly contains improved A31 support and a bit of housekeeping. Please note that this pull does *not* contain the MMC clock patches Hans sent, as you merged those yourself on clk-next Cheers, Emilio --->8--- The following changes since commit c9eaa447e77efe77b7fa4c953bd62de8297fd6c5: Linux 3.15-rc1 (2014-04-13 14:18:35 -0700) are available in the git repository at: https://bitbucket.org/emiliolopez/linux.git tags/sunxi-clk-for-3.16 for you to fetch changes up to 4da7e86418af722793610e57cee9d3e73d16ed58: clk: sunxi: document PRCM clock compatible strings (2014-05-15 12:20:14 -0300) ---------------------------------------------------------------- Allwinner sunXi SoCs clock changes This pull contains some new code to add support for A31 clocks by Maxime and Boris. It also reworks the driver a bit to avoid having a huge single file when we have a full folder for ourselves, and separating different functional units makes sense. ---------------------------------------------------------------- Boris BREZILLON (2): clk: sunxi: add PRCM (Power/Reset/Clock Management) clks support clk: sunxi: document PRCM clock compatible strings Emilio López (1): clk: sunxi: document new A31 USB clock compatible Maxime Ripard (7): clk: sunxi: Implement A31 USB clock clk: sunxi: Remove calls to clk_put clk: sunxi: Move the 24M oscillator to a file of its own clk: sunxi: Move the GMAC clock to a file of its own clk: sunxi: Rework clock protection code clk: sun6i: Protect CPU clock clk: sun6i: Protect SDRAM gating bit Documentation/devicetree/bindings/clock/sunxi.txt | 4 +++ drivers/clk/sunxi/Makefile | 4 +++ drivers/clk/sunxi/clk-a10-hosc.c | 73 +++++++++++++++++++++++++++++++++++++++++ drivers/clk/sunxi/clk-a20-gmac.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/clk/sunxi/clk-sun6i-apb0-gates.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/clk/sunxi/clk-sun6i-apb0.c | 77 +++++++++++++++++++++++++++++++++++++++++++ drivers/clk/sunxi/clk-sun6i-ar100.c | 233 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/clk/sunxi/clk-sunxi.c | 239 +++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------- 8 files changed, 661 insertions(+), 187 deletions(-) create mode 100644 drivers/clk/sunxi/clk-a10-hosc.c create mode 100644 drivers/clk/sunxi/clk-a20-gmac.c create mode 100644 drivers/clk/sunxi/clk-sun6i-apb0-gates.c create mode 100644 drivers/clk/sunxi/clk-sun6i-apb0.c create mode 100644 drivers/clk/sunxi/clk-sun6i-ar100.c