Message ID | cover.1381293239.git.horms+renesas@verge.net.au |
---|---|
State | New |
Headers | show |
Simon Horman <horms+renesas@verge.net.au> writes: > Hi Olof, Kevin and Arnd, > > please consider this second round of Renesas ARM based SoC updates for v3.13. > > This pull-request is based on a merge of the following, each of which > you have already pulled. The reason for the merge is to eliminate conflicts. > * renesas-soc-for-v3.13 > * renesas-smp-for-v3.13 > * renesas-fixes4-for-v3.13 > > The following changes since commit 243b6db0588b1425cb020e764475e8e1c4eb40d9: > > Merge tag 'renesas-fixes4-for-v3.12' into soc2-base (2013-10-08 09:44:08 +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.13 > > for you to fetch changes up to 687c27b07050c21a62c4c975777c89e698649a6b: > > ARM: shmobile: r8a7791 SMP support (2013-10-08 09:53:02 +0900) > > ---------------------------------------------------------------- > Second Round of Renesas ARM based SoC updates for v3.13 > > * SMP support for r8a7791 SoC > * r8a7779_init_irq_extpin() for DT for r8a7779 and r8a7778 SoCs > * Add HPB-DMAC to r8a7779 and r8a7778 SoCs > * Add r7s72100 SoC > * Make use of ARCH timer workaround on r8a7791 SoC > * Add IRQC platform device support to r8a7791 SoC > * Add I2C clocks and aliases for the DT mode for r8a7790 SoC > * Add MAC platform device to r8a73a4 SoC Pulled into next/soc, Thanks, Kevin
Hello. On 10/09/2013 10:49 AM, Simon Horman wrote: > From: Max Filippov <max.filippov@cogentembedded.com> > Add HPB-DMAC platform device on R8A7779 SoC along with its slave and channel > configurations (only for SDHI0 so far). > Signed-off-by: Max Filippov <max.filippov@cogentembedded.com> > [Sergei: moved *enum* declaring HPB-DMAC slave IDs from now removed <mach/dma.h> > to <mach/r8a7779.h>, removed #include <mach/dma.h> from setup-r8a7779.c, removed > SSI-related *enum* values and SSI-related data from hpb_dmae_slaves[] and > hpb_dmae_channels[], added ASYNCMDR.ASBTMD{20|24|43} and ASYNCMDR.ASMD{20|24|43} > fields/values, fixed comments to ASYNCMDR.ASBTMD2[123] and ASYNCMDR.ASMD2[123] > fields/values, renamed all the bit/field/value #define's to include 'HBP_DMAE_' > prefix to match the driver, moved comments after the element initializers of > hpb_dmae_channels[].] > Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > --- > arch/arm/mach-shmobile/include/mach/r8a7779.h | 7 ++ > arch/arm/mach-shmobile/setup-r8a7779.c | 154 ++++++++++++++++++++++++++ > 2 files changed, 161 insertions(+) Hm, Simon, do you know how this patch and the next one ended up being merged twice into Linus' tree? https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=1eb6b5a0e55bfcfb0852b7d0f9442841ff807345 https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=338c4991ed350abd7c5b3cb807fe022cb712a8ba WBR, Sergei
On 11/12/2013 12:43 AM, Sergei Shtylyov wrote: >> From: Max Filippov <max.filippov@cogentembedded.com> >> Add HPB-DMAC platform device on R8A7779 SoC along with its slave and channel >> configurations (only for SDHI0 so far). >> Signed-off-by: Max Filippov <max.filippov@cogentembedded.com> >> [Sergei: moved *enum* declaring HPB-DMAC slave IDs from now removed >> <mach/dma.h> >> to <mach/r8a7779.h>, removed #include <mach/dma.h> from setup-r8a7779.c, >> removed >> SSI-related *enum* values and SSI-related data from hpb_dmae_slaves[] and >> hpb_dmae_channels[], added ASYNCMDR.ASBTMD{20|24|43} and >> ASYNCMDR.ASMD{20|24|43} >> fields/values, fixed comments to ASYNCMDR.ASBTMD2[123] and ASYNCMDR.ASMD2[123] >> fields/values, renamed all the bit/field/value #define's to include 'HBP_DMAE_' >> prefix to match the driver, moved comments after the element initializers of >> hpb_dmae_channels[].] >> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> >> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> >> --- >> arch/arm/mach-shmobile/include/mach/r8a7779.h | 7 ++ >> arch/arm/mach-shmobile/setup-r8a7779.c | 154 >> ++++++++++++++++++++++++++ >> 2 files changed, 161 insertions(+) > Hm, Simon, do you know how this patch and the next one ended up being > merged twice into Linus' tree? Sorry, I followed up to the wrong patch. So, the question was about this patch and the previous one. > https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=1eb6b5a0e55bfcfb0852b7d0f9442841ff807345 > https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=338c4991ed350abd7c5b3cb807fe022cb712a8ba https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=a43e5bd76a4a3df58167d85e8020a1c9e566ad75 https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=441f750236f3d3d435a1e89ad885ec896832b9c6 WBR, Sergei
On Tue, Nov 12, 2013 at 12:46:02AM +0300, Sergei Shtylyov wrote: > On 11/12/2013 12:43 AM, Sergei Shtylyov wrote: > > >>From: Max Filippov <max.filippov@cogentembedded.com> > > >>Add HPB-DMAC platform device on R8A7779 SoC along with its slave and channel > >>configurations (only for SDHI0 so far). > > >>Signed-off-by: Max Filippov <max.filippov@cogentembedded.com> > >>[Sergei: moved *enum* declaring HPB-DMAC slave IDs from now removed > >><mach/dma.h> > >>to <mach/r8a7779.h>, removed #include <mach/dma.h> from setup-r8a7779.c, > >>removed > >>SSI-related *enum* values and SSI-related data from hpb_dmae_slaves[] and > >>hpb_dmae_channels[], added ASYNCMDR.ASBTMD{20|24|43} and > >>ASYNCMDR.ASMD{20|24|43} > >>fields/values, fixed comments to ASYNCMDR.ASBTMD2[123] and ASYNCMDR.ASMD2[123] > >>fields/values, renamed all the bit/field/value #define's to include 'HBP_DMAE_' > >>prefix to match the driver, moved comments after the element initializers of > >>hpb_dmae_channels[].] > >>Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> > >>Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > >>--- > >> arch/arm/mach-shmobile/include/mach/r8a7779.h | 7 ++ > >> arch/arm/mach-shmobile/setup-r8a7779.c | 154 > >>++++++++++++++++++++++++++ > >> 2 files changed, 161 insertions(+) > > > Hm, Simon, do you know how this patch and the next one ended up being > >merged twice into Linus' tree? > > Sorry, I followed up to the wrong patch. So, the question was > about this patch and the previous one. > > >https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=1eb6b5a0e55bfcfb0852b7d0f9442841ff807345 > >https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=338c4991ed350abd7c5b3cb807fe022cb712a8ba > > https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=a43e5bd76a4a3df58167d85e8020a1c9e566ad75 > https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=441f750236f3d3d435a1e89ad885ec896832b9c6 I assume that the reference to above git IDs implies that the answer to your question is yes.
Hello. On 12-11-2013 5:58, Simon Horman wrote: >>>> From: Max Filippov <max.filippov@cogentembedded.com> >>>> Add HPB-DMAC platform device on R8A7779 SoC along with its slave and channel >>>> configurations (only for SDHI0 so far). >>>> Signed-off-by: Max Filippov <max.filippov@cogentembedded.com> >>>> [Sergei: moved *enum* declaring HPB-DMAC slave IDs from now removed >>>> <mach/dma.h> >>>> to <mach/r8a7779.h>, removed #include <mach/dma.h> from setup-r8a7779.c, >>>> removed >>>> SSI-related *enum* values and SSI-related data from hpb_dmae_slaves[] and >>>> hpb_dmae_channels[], added ASYNCMDR.ASBTMD{20|24|43} and >>>> ASYNCMDR.ASMD{20|24|43} >>>> fields/values, fixed comments to ASYNCMDR.ASBTMD2[123] and ASYNCMDR.ASMD2[123] >>>> fields/values, renamed all the bit/field/value #define's to include 'HBP_DMAE_' >>>> prefix to match the driver, moved comments after the element initializers of >>>> hpb_dmae_channels[].] >>>> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> >>>> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> >>>> --- >>>> arch/arm/mach-shmobile/include/mach/r8a7779.h | 7 ++ >>>> arch/arm/mach-shmobile/setup-r8a7779.c | 154 >>>> ++++++++++++++++++++++++++ >>>> 2 files changed, 161 insertions(+) >>> Hm, Simon, do you know how this patch and the next one ended up being >>> merged twice into Linus' tree? >> Sorry, I followed up to the wrong patch. So, the question was >> about this patch and the previous one. >>> https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=1eb6b5a0e55bfcfb0852b7d0f9442841ff807345 >>> https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=338c4991ed350abd7c5b3cb807fe022cb712a8ba >> https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=a43e5bd76a4a3df58167d85e8020a1c9e566ad75 >> https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=441f750236f3d3d435a1e89ad885ec896832b9c6 > I assume that the reference to above git IDs implies that the answer > to your question is yes. And answer to the question "how" is? :-) WBR, Sergei
On Tue, Nov 12, 2013 at 08:13:34PM +0400, Sergei Shtylyov wrote: > Hello. > > On 12-11-2013 5:58, Simon Horman wrote: > > >>>>From: Max Filippov <max.filippov@cogentembedded.com> > > >>>>Add HPB-DMAC platform device on R8A7779 SoC along with its slave and channel > >>>>configurations (only for SDHI0 so far). > > >>>>Signed-off-by: Max Filippov <max.filippov@cogentembedded.com> > >>>>[Sergei: moved *enum* declaring HPB-DMAC slave IDs from now removed > >>>><mach/dma.h> > >>>>to <mach/r8a7779.h>, removed #include <mach/dma.h> from setup-r8a7779.c, > >>>>removed > >>>>SSI-related *enum* values and SSI-related data from hpb_dmae_slaves[] and > >>>>hpb_dmae_channels[], added ASYNCMDR.ASBTMD{20|24|43} and > >>>>ASYNCMDR.ASMD{20|24|43} > >>>>fields/values, fixed comments to ASYNCMDR.ASBTMD2[123] and ASYNCMDR.ASMD2[123] > >>>>fields/values, renamed all the bit/field/value #define's to include 'HBP_DMAE_' > >>>>prefix to match the driver, moved comments after the element initializers of > >>>>hpb_dmae_channels[].] > >>>>Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> > >>>>Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > >>>>--- > >>>> arch/arm/mach-shmobile/include/mach/r8a7779.h | 7 ++ > >>>> arch/arm/mach-shmobile/setup-r8a7779.c | 154 > >>>>++++++++++++++++++++++++++ > >>>> 2 files changed, 161 insertions(+) > > >>> Hm, Simon, do you know how this patch and the next one ended up being > >>>merged twice into Linus' tree? > > >> Sorry, I followed up to the wrong patch. So, the question was > >>about this patch and the previous one. > > >>>https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=1eb6b5a0e55bfcfb0852b7d0f9442841ff807345 > >>>https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=338c4991ed350abd7c5b3cb807fe022cb712a8ba > > >>https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=a43e5bd76a4a3df58167d85e8020a1c9e566ad75 > >>https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=441f750236f3d3d435a1e89ad885ec896832b9c6 > > >I assume that the reference to above git IDs implies that the answer > >to your question is yes. > > And answer to the question "how" is? :-) Due to a rebasing error on my part two versions of a branch containing these patches and several others were merged. I checked and it looks like the code-changes made by both versions of the branch are the same. So at this stage I think the only problem is that this causes some confusion as there are duplicates of some patches in git, permanently.