| Message ID | cover.1392277789.git.horms+renesas@verge.net.au |
|---|---|
| State | New |
| Headers | show |
On Thu, Feb 13, 2014 at 05:04:56PM +0900, Simon Horman wrote: > Hi Olof, Hi Kevin, Hi Arnd, > > please consider this second round of Renesas ARM Based SoC updates for v3.15. > > This pull-request is based on the first round of such changes, > tagged as renesas-soc-for-v3.15, which I have previously sent a > pull-request for. > > > The following changes since commit 012a7069b5a10a0851584d71a1facdc40a972319: > > ARM: shmobile: r8a7790: Add PCI USB host clock support (2014-02-04 10:25:03 +0900) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc2-for-v3.15 Hi, I'm stopping my merges for the night here, so I haven't merged this but I'll likely do it tomorrow. I did have comments on one of the patches though (that adds a new include/mach file that's not really needed). Fixing that can be done incrementally though, especially if you have downstream users of this branch. -Olof
On Thu, Feb 20, 2014 at 01:43:24AM -0800, Olof Johansson wrote: > On Thu, Feb 13, 2014 at 05:04:56PM +0900, Simon Horman wrote: > > Hi Olof, Hi Kevin, Hi Arnd, > > > > please consider this second round of Renesas ARM Based SoC updates for v3.15. > > > > This pull-request is based on the first round of such changes, > > tagged as renesas-soc-for-v3.15, which I have previously sent a > > pull-request for. > > > > > > The following changes since commit 012a7069b5a10a0851584d71a1facdc40a972319: > > > > ARM: shmobile: r8a7790: Add PCI USB host clock support (2014-02-04 10:25:03 +0900) > > > > are available in the git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc2-for-v3.15 > > Hi, > > I'm stopping my merges for the night here, so I haven't merged this but I'll > likely do it tomorrow. I did have comments on one of the patches though (that > adds a new include/mach file that's not really needed). Fixing that can be done > incrementally though, especially if you have downstream users of this branch. Thanks. I have another round of SoC updates ready to go. So I plan to send them and then address your feedback in a subsequent pull-request (once a patch is ready:).
On Thu, Feb 20, 2014 at 01:43:24AM -0800, Olof Johansson wrote: > On Thu, Feb 13, 2014 at 05:04:56PM +0900, Simon Horman wrote: > > Hi Olof, Hi Kevin, Hi Arnd, > > > > please consider this second round of Renesas ARM Based SoC updates for v3.15. > > > > This pull-request is based on the first round of such changes, > > tagged as renesas-soc-for-v3.15, which I have previously sent a > > pull-request for. > > > > > > The following changes since commit 012a7069b5a10a0851584d71a1facdc40a972319: > > > > ARM: shmobile: r8a7790: Add PCI USB host clock support (2014-02-04 10:25:03 +0900) > > > > are available in the git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc2-for-v3.15 > > Hi, > > I'm stopping my merges for the night here, so I haven't merged this but I'll > likely do it tomorrow. I did have comments on one of the patches though (that > adds a new include/mach file that's not really needed). Fixing that can be done > incrementally though, especially if you have downstream users of this branch. Simon, I think it'd fit our workflow better if you kept all the clock changes in a topic branch this release, instead of mingling them with the SoC code. There is enough of them that it's not just a silly short branch, and there's little overlap with the rest of the soc code changes you have (i.e. it makes more sense for us to merge in with a drivers branch instead of keeping it all with soc). Would you mind respinning and sorting that out to a separate topic? Since I've already merged the first soc branch (but treated it like a clock branch), feel free to keep that as a base for the new clock branch (but not for the new soc branch, ideally). -Olof
On Fri, Feb 21, 2014 at 02:25:44PM -0800, Olof Johansson wrote: > On Thu, Feb 20, 2014 at 01:43:24AM -0800, Olof Johansson wrote: > > On Thu, Feb 13, 2014 at 05:04:56PM +0900, Simon Horman wrote: > > > Hi Olof, Hi Kevin, Hi Arnd, > > > > > > please consider this second round of Renesas ARM Based SoC updates for v3.15. > > > > > > This pull-request is based on the first round of such changes, > > > tagged as renesas-soc-for-v3.15, which I have previously sent a > > > pull-request for. > > > > > > > > > The following changes since commit 012a7069b5a10a0851584d71a1facdc40a972319: > > > > > > ARM: shmobile: r8a7790: Add PCI USB host clock support (2014-02-04 10:25:03 +0900) > > > > > > are available in the git repository at: > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc2-for-v3.15 > > > > Hi, > > > > I'm stopping my merges for the night here, so I haven't merged this but I'll > > likely do it tomorrow. I did have comments on one of the patches though (that > > adds a new include/mach file that's not really needed). Fixing that can be done > > incrementally though, especially if you have downstream users of this branch. > > Simon, > > I think it'd fit our workflow better if you kept all the clock changes in > a topic branch this release, instead of mingling them with the SoC code. > There is enough of them that it's not just a silly short branch, and there's > little overlap with the rest of the soc code changes you have (i.e. it makes > more sense for us to merge in with a drivers branch instead of keeping it all > with soc). > > Would you mind respinning and sorting that out to a separate topic? Since > I've already merged the first soc branch (but treated it like a clock > branch), feel free to keep that as a base for the new clock branch > (but not for the new soc branch, ideally). Sure, I will see about doing that. In the mean time, please disregard "Third Round of Renesas ARM Based SoC Updates", which I sent before I saw this email. I think that all the other pull-request that I sent yesterday should be unaffected by this change.
Hi Olof, Hi Kevin, Hi Arnd, please consider this second round of Renesas ARM Based SoC updates for v3.15. This pull-request is based on the first round of such changes, tagged as renesas-soc-for-v3.15, which I have previously sent a pull-request for. The following changes since commit 012a7069b5a10a0851584d71a1facdc40a972319: ARM: shmobile: r8a7790: Add PCI USB host clock support (2014-02-04 10:25:03 +0900) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc2-for-v3.15 for you to fetch changes up to 74b9ba5f35fbd071f313781498a9e244bcc6f03e: ARM: shmobile: r8a7790: Correct SYS DMAC clock defines (2014-02-07 09:24:07 +0900) ---------------------------------------------------------------- Second Round of Renesas ARM Based SoC Updates for v3.15 * r7s72100 SoC (RZ/A1H) - Add clock for SH Ethernet - Add RSPI clocks * r8a7791 (R-Car M2) - Add QSPI clocks - Use 64-bit dma_addr_t * r8a7790 (R-Car H2) - Correct SYS DMAC clock defines - Add audio clock - Add CA15-SCU, CA7-SCU - Add SYSC setup code - Use 64-bit dma_addr_t ---------------------------------------------------------------- Gaku Inami (1): ARM: shmobile: r8a7790 CA7-SCU enablement Geert Uytterhoeven (3): ARM: shmobile: r7s72100 clock: Add RSPI clocks ARM: shmobile: r7s72100 clock: Add RSPI clocks for DT ARM: shmobile: r8a7791 clock: add QSPI clocks Hisashi Nakamura (1): ARM: shmobile: r8a7790 SYSC setup code Keita Kobayashi (1): ARM: shmobile: r8a7790 CA15-SCU enablement Kuninori Morimoto (2): ARM: shmobile: r8a7778: add audio clock in new style ARM: shmobile: r8a7790: add audio clock Magnus Damm (2): ARM: shmobile: Use 64-bit dma_addr_t on r8a7790/r8a7791 ARM: shmobile: Break out R-Car SYSC PM code Simon Horman (2): ARM: shmobile: r7s72100: Add clock for r7s72100-ether ARM: shmobile: r8a7790: Correct SYS DMAC clock defines arch/arm/boot/dts/r8a7790.dtsi | 23 +++++ arch/arm/mach-shmobile/Kconfig | 3 + arch/arm/mach-shmobile/Makefile | 3 +- arch/arm/mach-shmobile/clock-r7s72100.c | 30 +++++- arch/arm/mach-shmobile/clock-r8a7778.c | 4 + arch/arm/mach-shmobile/clock-r8a7790.c | 20 ++++ arch/arm/mach-shmobile/clock-r8a7791.c | 11 ++ arch/arm/mach-shmobile/include/mach/pm-rcar.h | 15 +++ arch/arm/mach-shmobile/include/mach/r8a7779.h | 13 +-- arch/arm/mach-shmobile/include/mach/r8a7790.h | 1 + arch/arm/mach-shmobile/pm-r8a7779.c | 131 ++---------------------- arch/arm/mach-shmobile/pm-r8a7790.c | 45 ++++++++ arch/arm/mach-shmobile/pm-rcar.c | 142 ++++++++++++++++++++++++++ arch/arm/mach-shmobile/smp-r8a7779.c | 17 +-- arch/arm/mach-shmobile/smp-r8a7790.c | 17 +++ include/dt-bindings/clock/r8a7790-clock.h | 4 +- 16 files changed, 331 insertions(+), 148 deletions(-) create mode 100644 arch/arm/mach-shmobile/include/mach/pm-rcar.h create mode 100644 arch/arm/mach-shmobile/pm-r8a7790.c create mode 100644 arch/arm/mach-shmobile/pm-rcar.c