[PATCH 08/14] ARM: shmobile: Add shared R-Car Gen2 CMA reservation code
horms at verge.net.au
Wed Jun 25 17:19:55 PDT 2014
On Thu, Jun 26, 2014 at 08:47:08AM +0900, Simon Horman wrote:
> On Wed, Jun 25, 2014 at 07:18:09PM +0400, Sergei Shtylyov wrote:
> > Hello.
> > On 06/25/2014 11:35 AM, Simon Horman wrote:
> > >From: Magnus Damm <damm+renesas at opensource.se>
> > >Add R-Car Gen2 CMA memory reservation code that can be
> > >shared between multiple SoCs and boards. At this point
> > >r8a7790 and r8a7791 are supported.
> > >The top 256MiB of the legacy 32-bit physical memory space
> > >is assigned to a separate CMA area that may be assigned
> > >to various devices later on.
> > >Signed-off-by: Magnus Damm <damm+renesas at opensource.se>
> > >[horms+renesas at verge.net.au: rebased]
> > >Signed-off-by: Simon Horman <horms+renesas at verge.net.au>
> > [...]
> > >diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c
> > >index fdc714e..544b9bf 100644
> > >--- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
> > >+++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
> > >@@ -20,8 +20,11 @@
> > >
> > > #include <linux/clk/shmobile.h>
> > > #include <linux/clocksource.h>
> > >+#include <linux/device.h>
> > >+#include <linux/dma-contiguous.h>
> > > #include <linux/io.h>
> > > #include <linux/kernel.h>
> > >+#include <linux/of_fdt.h>
> > > #include <asm/mach/arch.h>
> > > #include "common.h"
> > > #include "rcar-gen2.h"
> > Hm, this part looks incomplete. I thought you were going to add CMA code here?
> Thanks, something does indeed seem to have gone wrong there.
I suspect that this is the result of an error on my part when I rebased
the code on top of v3.16-rc1 before making it available to next.
The missing code appears to lie in "ARM: shmobile: rcar-gen2: Update for
Olof, I'd prefer not to rebase my branches in next. But if you'd like
me to do so to clean up this problem then let me know.
More information about the linux-arm-kernel