From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Horman Date: Tue, 12 Nov 2013 01:58:53 +0000 Subject: Re: [PATCH 03/14] ARM: shmobile: r8a7779: add HPB-DMAC support Message-Id: <20131112015853.GC9863@verge.net.au> List-Id: References: <441f750236f3d3d435a1e89ad885ec896832b9c6.1381293239.git.horms+renesas@verge.net.au> <52814F8E.4090606@cogentembedded.com> <5281501A.9070009@cogentembedded.com> In-Reply-To: <5281501A.9070009@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 12:46:02AM +0300, Sergei Shtylyov wrote: > On 11/12/2013 12:43 AM, Sergei Shtylyov wrote: >=20 > >>From: Max Filippov >=20 > >>Add HPB-DMAC platform device on R8A7779 SoC along with its slave and ch= annel > >>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[] a= nd > >>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.ASM= D2[123] > >>fields/values, renamed all the bit/field/value #define's to include 'HB= P_DMAE_' > >>prefix to match the driver, moved comments after the element initialize= rs 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 being > >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/?i= d=A43e5bd76a4a3df58167d85e8020a1c9e566ad75 > https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?i= dD1f750236f3d3d435a1e89ad885ec896832b9c6 I assume that the reference to above git IDs implies that the answer to your question is yes.