From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Horman Date: Wed, 13 Nov 2013 02:41:33 +0000 Subject: Re: [PATCH 03/14] ARM: shmobile: r8a7779: add HPB-DMAC support Message-Id: <20131113024133.GA22484@verge.net.au> List-Id: References: <441f750236f3d3d435a1e89ad885ec896832b9c6.1381293239.git.horms+renesas@verge.net.au> <52814F8E.4090606@cogentembedded.com> <5281501A.9070009@cogentembedded.com> <20131112015853.GC9863@verge.net.au> <528253AE.4040708@cogentembedded.com> In-Reply-To: <528253AE.4040708@cogentembedded.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable To: linux-arm-kernel@lists.infradead.org On Tue, Nov 12, 2013 at 08:13:34PM +0400, Sergei Shtylyov wrote: > Hello. >=20 > On 12-11-2013 5:58, Simon Horman wrote: >=20 > >>>>From: Max Filippov >=20 > >>>>Add HPB-DMAC platform device on R8A7779 SoC along with its slave and = channel > >>>>configurations (only for SDHI0 so far). >=20 > >>>>Signed-off-by: Max Filippov > >>>>[Sergei: moved *enum* declaring HPB-DMAC slave IDs from now removed > >>>> > >>>>to , removed #include 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.A= SMD2[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 initiali= zers of > >>>>hpb_dmae_channels[].] > >>>>Signed-off-by: Sergei Shtylyov > >>>>Signed-off-by: Simon Horman > >>>>--- > >>>> arch/arm/mach-shmobile/include/mach/r8a7779.h | 7 ++ > >>>> arch/arm/mach-shmobile/setup-r8a7779.c | 154 > >>>>++++++++++++++++++++++++++ > >>>> 2 files changed, 161 insertions(+) >=20 > >>> Hm, Simon, do you know how this patch and the next one ended up be= ing > >>>merged twice into Linus' tree? >=20 > >> Sorry, I followed up to the wrong patch. So, the question was > >>about this patch and the previous one. >=20 > >>>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= /?id38c4991ed350abd7c5b3cb807fe022cb712a8ba >=20 > >>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/= ?idD1f750236f3d3d435a1e89ad885ec896832b9c6 >=20 > >I assume that the reference to above git IDs implies that the answer > >to your question is yes. >=20 > 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. From mboxrd@z Thu Jan 1 00:00:00 1970 From: horms@verge.net.au (Simon Horman) Date: Wed, 13 Nov 2013 11:41:33 +0900 Subject: [PATCH 03/14] ARM: shmobile: r8a7779: add HPB-DMAC support In-Reply-To: <528253AE.4040708@cogentembedded.com> References: <441f750236f3d3d435a1e89ad885ec896832b9c6.1381293239.git.horms+renesas@verge.net.au> <52814F8E.4090606@cogentembedded.com> <5281501A.9070009@cogentembedded.com> <20131112015853.GC9863@verge.net.au> <528253AE.4040708@cogentembedded.com> Message-ID: <20131113024133.GA22484@verge.net.au> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 > > >>>>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 > >>>>[Sergei: moved *enum* declaring HPB-DMAC slave IDs from now removed > >>>> > >>>>to , removed #include 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 > >>>>Signed-off-by: Simon Horman > >>>>--- > >>>> 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.