| Message ID | 1400880597-7516-1-git-send-email-santosh.shilimkar@ti.com |
|---|---|
| State | New |
| Headers | show |
On Fri, May 23, 2014 at 05:29:57PM -0400, Santosh Shilimkar wrote: > Hi Arm-soc folks, > > Please pull below keystone reset driver for 3.16 . To avoid merge conflict > with earlier keystone-soc pull request[1], I have based the subject pull > request on top of it. It merges cleanly with arm-soc 'next/soc2' head. Please > apply it against 'next/soc2'. Thanks Hi, I notice this driver doesn't have an ack from Philipp Zabel (cc:d here). That would be appropriate. (Philipp, should there be a MAINTAINERS entry for you so that get_maintainer works as expected here?) I'd also prefer to see the driver and the other changes split up since we tend to merge them through different branches. I think it's OK to just split in those two for this merge. I could do it for you (i.e. merge the first patch into next/drivers and the rest into next/soc2 with the driver patch included on the bottom), but that still wouldn't cover the ack from Philipp. If he replies to this email and says he's ok with it going in I can still do it that way though. Philipp? -Olof
Hi Olof, Santosh, Am Montag, den 26.05.2014, 14:26 -0700 schrieb Olof Johansson: > On Fri, May 23, 2014 at 05:29:57PM -0400, Santosh Shilimkar wrote: > > Hi Arm-soc folks, > > > > Please pull below keystone reset driver for 3.16 . To avoid merge conflict > > with earlier keystone-soc pull request[1], I have based the subject pull > > request on top of it. It merges cleanly with arm-soc 'next/soc2' head. Please > > apply it against 'next/soc2'. Thanks > > Hi, > > I notice this driver doesn't have an ack from Philipp Zabel (cc:d here). That > would be appropriate. I don't think this driver needs my ack, see below, ... > (Philipp, should there be a MAINTAINERS entry for you so > that get_maintainer works as expected here?) ... but that is a good idea to keep me in the loop. I will send a patch. > I'd also prefer to see the driver and the other changes split up since we tend > to merge them through different branches. I think it's OK to just split in > those two for this merge. > > I could do it for you (i.e. merge the first patch into next/drivers and the > rest into next/soc2 with the driver patch included on the bottom), but that > still wouldn't cover the ack from Philipp. If he replies to this email and says > he's ok with it going in I can still do it that way though. Philipp? This keystone reset driver handles the CPU/SoC reset via soft reset bit. This does not directly concern the reset controller framework, as it is not used by this driver. The reset framework is intended mainly to control reset lines to peripheral devices that don't stop execution as soon as they are asserted. Of course rsctrl_restart() could be modeled as a reset controller using the framework instead, but I don't think it has to. There already is other (older) reset code similar to this in various places (such as arch/arm/mach-pxa/reset.c). Of course the overlap in terminology (complete system reset vs peripheral resets) is a bit unfortunate, but I'm not sure what we can do about this. regards Philipp
Olof, On Tuesday 27 May 2014 03:26 AM, Philipp Zabel wrote: > Hi Olof, Santosh, > > Am Montag, den 26.05.2014, 14:26 -0700 schrieb Olof Johansson: >> On Fri, May 23, 2014 at 05:29:57PM -0400, Santosh Shilimkar wrote: >>> Hi Arm-soc folks, >>> >>> Please pull below keystone reset driver for 3.16 . To avoid merge conflict >>> with earlier keystone-soc pull request[1], I have based the subject pull >>> request on top of it. It merges cleanly with arm-soc 'next/soc2' head. Please >>> apply it against 'next/soc2'. Thanks >> >> Hi, >> >> I notice this driver doesn't have an ack from Philipp Zabel (cc:d here). That >> would be appropriate. > We asked about ack, split series options from reset folks but didn't hear back. Since the series has been on the list for almost 3 merge windows now, I asked Arnd how to go about it and he suggested to send it via arm-soc. Should have clarified it in pull request. > I don't think this driver needs my ack, see below, ... > >> (Philipp, should there be a MAINTAINERS entry for you so >> that get_maintainer works as expected here?) > > ... but that is a good idea to keep me in the loop. I will send a patch. > >> I'd also prefer to see the driver and the other changes split up since we tend >> to merge them through different branches. I think it's OK to just split in >> those two for this merge. >> Agree. I have split the series and created another two tags as below. If you are ok, please pull them accordingly. If you want me to repost the pull requests in separate emails, I can do that as well. Do let me know. 1] Reset driver. Contains only driver and binding documentation. git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git tags/keystone-reset-driver 2]Keystone mach updates which needs to applied on top of earlier soc pull request. i.e on top of arm-soc 'next/soc2'. I have left 1 dts patch in the same instead of creating another pull request for dts change. git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git tags/keystone-soc-2 Regards, Snatosh
On Tuesday 27 May 2014 10:07:01 Santosh Shilimkar wrote: > > On Tuesday 27 May 2014 03:26 AM, Philipp Zabel wrote: > > Hi Olof, Santosh, > > > > Am Montag, den 26.05.2014, 14:26 -0700 schrieb Olof Johansson: > >> On Fri, May 23, 2014 at 05:29:57PM -0400, Santosh Shilimkar wrote: > >>> Hi Arm-soc folks, > >>> > >>> Please pull below keystone reset driver for 3.16 . To avoid merge conflict > >>> with earlier keystone-soc pull request[1], I have based the subject pull > >>> request on top of it. It merges cleanly with arm-soc 'next/soc2' head. Please > >>> apply it against 'next/soc2'. Thanks > >> > >> Hi, > >> > >> I notice this driver doesn't have an ack from Philipp Zabel (cc:d here). That > >> would be appropriate. > > > We asked about ack, split series options from reset folks but didn't hear back. > Since the series has been on the list for almost 3 merge windows now, I asked > Arnd how to go about it and he suggested to send it via arm-soc. Should have > clarified it in pull request. Olof, note that this is a driver for system reset, i.e. drivers/power/reset, not for resetting individual devices as drivers/reset does. Philipp maintains the latter, but AFAIK he's not involved in the drivers/power stuff. Arnd
On Tue, May 27, 2014 at 7:16 AM, Arnd Bergmann <arnd@arndb.de> wrote: > On Tuesday 27 May 2014 10:07:01 Santosh Shilimkar wrote: >> >> On Tuesday 27 May 2014 03:26 AM, Philipp Zabel wrote: >> > Hi Olof, Santosh, >> > >> > Am Montag, den 26.05.2014, 14:26 -0700 schrieb Olof Johansson: >> >> On Fri, May 23, 2014 at 05:29:57PM -0400, Santosh Shilimkar wrote: >> >>> Hi Arm-soc folks, >> >>> >> >>> Please pull below keystone reset driver for 3.16 . To avoid merge conflict >> >>> with earlier keystone-soc pull request[1], I have based the subject pull >> >>> request on top of it. It merges cleanly with arm-soc 'next/soc2' head. Please >> >>> apply it against 'next/soc2'. Thanks >> >> >> >> Hi, >> >> >> >> I notice this driver doesn't have an ack from Philipp Zabel (cc:d here). That >> >> would be appropriate. >> > >> We asked about ack, split series options from reset folks but didn't hear back. >> Since the series has been on the list for almost 3 merge windows now, I asked >> Arnd how to go about it and he suggested to send it via arm-soc. Should have >> clarified it in pull request. > > Olof, note that this is a driver for system reset, i.e. drivers/power/reset, not > for resetting individual devices as drivers/reset does. Philipp maintains the > latter, but AFAIK he's not involved in the drivers/power stuff. Ah, yes, of course. Anyway, Santosh split up the two branches which is what I wanted the most. I'll take a look through the driver myself when I merge as well (later today). -Olof
On Tue, May 27, 2014 at 10:07:01AM -0400, Santosh Shilimkar wrote: > Olof, > > On Tuesday 27 May 2014 03:26 AM, Philipp Zabel wrote: > > Hi Olof, Santosh, > > > > Am Montag, den 26.05.2014, 14:26 -0700 schrieb Olof Johansson: > >> On Fri, May 23, 2014 at 05:29:57PM -0400, Santosh Shilimkar wrote: > >>> Hi Arm-soc folks, > >>> > >>> Please pull below keystone reset driver for 3.16 . To avoid merge conflict > >>> with earlier keystone-soc pull request[1], I have based the subject pull > >>> request on top of it. It merges cleanly with arm-soc 'next/soc2' head. Please > >>> apply it against 'next/soc2'. Thanks > >> > >> Hi, > >> > >> I notice this driver doesn't have an ack from Philipp Zabel (cc:d here). That > >> would be appropriate. > > > We asked about ack, split series options from reset folks but didn't hear back. > Since the series has been on the list for almost 3 merge windows now, I asked > Arnd how to go about it and he suggested to send it via arm-soc. Should have > clarified it in pull request. > > > > I don't think this driver needs my ack, see below, ... > > > >> (Philipp, should there be a MAINTAINERS entry for you so > >> that get_maintainer works as expected here?) > > > > ... but that is a good idea to keep me in the loop. I will send a patch. > > > >> I'd also prefer to see the driver and the other changes split up since we tend > >> to merge them through different branches. I think it's OK to just split in > >> those two for this merge. > >> > Agree. I have split the series and created another two tags as below. If you > are ok, please pull them accordingly. If you want me to repost the pull requests > in separate emails, I can do that as well. Do let me know. > > 1] Reset driver. Contains only driver and binding documentation. > > git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git > tags/keystone-reset-driver > > 2]Keystone mach updates which needs to applied on top of earlier soc > pull request. i.e on top of arm-soc 'next/soc2'. I have left 1 dts > patch in the same instead of creating another pull request for dts > change. > > git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git > tags/keystone-soc-2 Merged. Since the branches were short I could easily review by hand, so full pull requests weren't as critical. Btw, for some reason our keystone soc branch was already named soc2, so I named this one soc3 in our own tree. No action needed from your side. -Olof
On Tuesday 27 May 2014 02:12 PM, Olof Johansson wrote: > On Tue, May 27, 2014 at 10:07:01AM -0400, Santosh Shilimkar wrote: >> Olof, >> >> On Tuesday 27 May 2014 03:26 AM, Philipp Zabel wrote: >>> Hi Olof, Santosh, >>> >>> Am Montag, den 26.05.2014, 14:26 -0700 schrieb Olof Johansson: >>>> On Fri, May 23, 2014 at 05:29:57PM -0400, Santosh Shilimkar wrote: >>>>> Hi Arm-soc folks, >>>>> >>>>> Please pull below keystone reset driver for 3.16 . To avoid merge conflict >>>>> with earlier keystone-soc pull request[1], I have based the subject pull >>>>> request on top of it. It merges cleanly with arm-soc 'next/soc2' head. Please >>>>> apply it against 'next/soc2'. Thanks >>>> >>>> Hi, >>>> >>>> I notice this driver doesn't have an ack from Philipp Zabel (cc:d here). That >>>> would be appropriate. >>> >> We asked about ack, split series options from reset folks but didn't hear back. >> Since the series has been on the list for almost 3 merge windows now, I asked >> Arnd how to go about it and he suggested to send it via arm-soc. Should have >> clarified it in pull request. >> >> >>> I don't think this driver needs my ack, see below, ... >>> >>>> (Philipp, should there be a MAINTAINERS entry for you so >>>> that get_maintainer works as expected here?) >>> >>> ... but that is a good idea to keep me in the loop. I will send a patch. >>> >>>> I'd also prefer to see the driver and the other changes split up since we tend >>>> to merge them through different branches. I think it's OK to just split in >>>> those two for this merge. >>>> >> Agree. I have split the series and created another two tags as below. If you >> are ok, please pull them accordingly. If you want me to repost the pull requests >> in separate emails, I can do that as well. Do let me know. >> >> 1] Reset driver. Contains only driver and binding documentation. >> >> git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git >> tags/keystone-reset-driver >> >> 2]Keystone mach updates which needs to applied on top of earlier soc >> pull request. i.e on top of arm-soc 'next/soc2'. I have left 1 dts >> patch in the same instead of creating another pull request for dts >> change. >> >> git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git >> tags/keystone-soc-2 > > Merged. Since the branches were short I could easily review by hand, so full > pull requests weren't as critical. > Thanks Olof !! Regards, Santosh
Hi Arm-soc folks, Please pull below keystone reset driver for 3.16 . To avoid merge conflict with earlier keystone-soc pull request[1], I have based the subject pull request on top of it. It merges cleanly with arm-soc 'next/soc2' head. Please apply it against 'next/soc2'. Thanks The following changes since commit 14f3791439b5a6cf12127fb80204265533d92664: ARM: keystone: Update the dma offset for non-dt platform devices (2014-05-08 15:43:33 -0400) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git tags/keystone-reset for you to fetch changes up to c124d557c820e6e4926ae1de1ddc109024a92f52: ARM: configs: keystone: enable reset driver support (2014-05-23 16:53:58 -0400) ---------------------------------------------------------------- Keystone Reset driver for 3.16 - Keystone Reser device driver - Removal of now un-necessary reset machine code - dts updates for keystone reset driver ---------------------------------------------------------------- Ivan Khoronzhuk (6): power: reset: keystone-reset: introduce keystone reset driver Documentation: dt: add bindings for keystone pll control controller Documentation: dt: add bindings for keystone reset driver ARM: keystone: remove redundant reset stuff ARM: dts: keystone: update reset node to work with reset driver ARM: configs: keystone: enable reset driver support .../bindings/clock/ti-keystone-pllctrl.txt | 20 +++ .../bindings/power/reset/keystone-reset.txt | 67 ++++++++ arch/arm/boot/dts/keystone.dtsi | 14 +- arch/arm/configs/keystone_defconfig | 3 + arch/arm/mach-keystone/keystone.c | 34 ---- drivers/power/reset/Kconfig | 8 + drivers/power/reset/Makefile | 1 + drivers/power/reset/keystone-reset.c | 166 ++++++++++++++++++++ 8 files changed, 278 insertions(+), 35 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/ti-keystone-pllctrl.txt create mode 100644 Documentation/devicetree/bindings/power/reset/keystone-reset.txt create mode 100644 drivers/power/reset/keystone-reset.c Regards, Santosh [1] http://www.spinics.net/lists/arm-kernel/msg330521.html