| Message ID | 1359080013-29189-1-git-send-email-horms+renesas@verge.net.au |
|---|---|
| State | New |
| Headers | show |
Hi Simon, You seem to have changed the authorship of this patch. Original one at: https://patchwork.kernel.org/patch/1771091/ Regards Sachin On 25 January 2013 07:43, Simon Horman <horms+renesas@verge.net.au> wrote: > linux/dma-mapping.h was included twice. > > Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > --- > arch/arm/mach-shmobile/setup-r8a7740.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c > index 03c69f9..9ef397d 100644 > --- a/arch/arm/mach-shmobile/setup-r8a7740.c > +++ b/arch/arm/mach-shmobile/setup-r8a7740.c > @@ -27,7 +27,6 @@ > #include <linux/serial_sci.h> > #include <linux/sh_dma.h> > #include <linux/sh_timer.h> > -#include <linux/dma-mapping.h> > #include <mach/dma-register.h> > #include <mach/r8a7740.h> > #include <mach/pm-rmobile.h> > -- > 1.7.10.4 >
On Fri, Jan 25, 2013 at 08:25:27AM +0530, Sachin Kamat wrote: > Hi Simon, > > You seem to have changed the authorship of this patch. Sorry about that, I'll fix that up. > Original one at: > https://patchwork.kernel.org/patch/1771091/ > > Regards > Sachin > > On 25 January 2013 07:43, Simon Horman <horms+renesas@verge.net.au> wrote: > > linux/dma-mapping.h was included twice. > > > > Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > --- > > arch/arm/mach-shmobile/setup-r8a7740.c | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c > > index 03c69f9..9ef397d 100644 > > --- a/arch/arm/mach-shmobile/setup-r8a7740.c > > +++ b/arch/arm/mach-shmobile/setup-r8a7740.c > > @@ -27,7 +27,6 @@ > > #include <linux/serial_sci.h> > > #include <linux/sh_dma.h> > > #include <linux/sh_timer.h> > > -#include <linux/dma-mapping.h> > > #include <mach/dma-register.h> > > #include <mach/r8a7740.h> > > #include <mach/pm-rmobile.h> > > -- > > 1.7.10.4 > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-sh" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >
On Fri, Jan 25, 2013 at 11:13:18AM +0900, Simon Horman wrote: > Hi Olof, Hi Arnd, > > please consider the following soc enhancements for 3.9. It seems that this pull request includes a patch with the incorrect author. I will fix that and send a fresh pull request ASAP.
On 25 January 2013 09:08, Simon Horman <horms@verge.net.au> wrote: > On Fri, Jan 25, 2013 at 08:25:27AM +0530, Sachin Kamat wrote: >> Hi Simon, >> >> You seem to have changed the authorship of this patch. > > Sorry about that, I'll fix that up. Thanks Simon :) > >> Original one at: >> https://patchwork.kernel.org/patch/1771091/ >> >> Regards >> Sachin >> >> On 25 January 2013 07:43, Simon Horman <horms+renesas@verge.net.au> wrote: >> > linux/dma-mapping.h was included twice. >> > >> > Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> >> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> >> > --- >> > arch/arm/mach-shmobile/setup-r8a7740.c | 1 - >> > 1 file changed, 1 deletion(-)
On Fri, Jan 25, 2013 at 02:13:30AM +0000, Simon Horman wrote: > This allows the GIC interrupt controller of the sh73a0 SoC to be > initialised using a flattened device tree blob. > > It does not allow the INTC interrupt controller which is also present on > the sh73a0 SoC to be enabled via device tree. Nor does it handle sharing > of interrupts between the GIC and INTC interrupt controllers. > > This limits the usefulness of this code to applications which only wish to > access devices which use interrupts that can be handled by the GIC > interrupt controller. Other applications should, for now, continue using > non-device tree initialisation of the sh72a0 interrupt controllers. > > Includes update to use irqchip_init() by Thierry Reding > > Cc: Thierry Reding <thierry.reding@avionic-design.de> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > --- > arch/arm/boot/dts/sh73a0.dtsi | 33 ++++++++++++++++++++++++++ > arch/arm/mach-shmobile/include/mach/common.h | 1 + > arch/arm/mach-shmobile/intc-sh73a0.c | 9 +++++++ > 3 files changed, 43 insertions(+) > create mode 100644 arch/arm/boot/dts/sh73a0.dtsi > > diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi > new file mode 100644 > index 0000000..7dae1f4 > --- /dev/null > +++ b/arch/arm/boot/dts/sh73a0.dtsi > @@ -0,0 +1,33 @@ > +/* > + * Device Tree Source for the SH73A0 SoC > + * > + * Copyright (C) 2012 Renesas Solutions Corp. > + * > + * This file is licensed under the terms of the GNU General Public License > + * version 2. This program is licensed "as is" without any warranty of any > + * kind, whether express or implied. > + */ > + > +/include/ "skeleton.dtsi" > + > +/ { > + compatible = "renesas,sh73a0"; > + > + cpus { > + cpu@0 { > + compatible = "arm,cortex-a9"; > + }; > + cpu@1 { > + compatible = "arm,cortex-a9"; > + }; > + }; It would be good the have reg and device_type properties set for the cpu nodes, so they're guaranteed to work with the logical map. [...] Thanks, Mark.
Hi Olof, Hi Arnd, please consider the following soc enhancements for 3.9. This series is based on a merge of the irqchip/gic-vic-move and timer/cleanup branches in the arm-soc tree. There were a number of conflicts in this merge, as indicated by the merge commit 6265b0f325eed54558b35769aecb1d79423295c7. In each case I took care to match the merge made in the arm-soc tree which is evident in the for-next branch. ---------------------------------------------------------------- The following changes since commit 6265b0f325eed54558b35769aecb1d79423295c7: Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc (2013-01-24 17:57:20 +0900) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git soc for you to fetch changes up to 977b5564fc613d662a346abfce05104ea5080a46: ARM: shmobile: r8a7779: scif .irqs used SCIx_IRQ_MUXED() (2013-01-25 09:10:45 +0900) ---------------------------------------------------------------- Bastian Hecht (4): ARM: shmobile: sh73a0: Add CPU sleep suspend ARM: shmobile: r8a7740: Add CPU sleep suspend ARM: SH-Mobile: sh73a0: Secondary CPUs handle own SCU flags ARM: SH-Mobile: sh73a0: Add CPU Hotplug Guennadi Liakhovetski (3): ARM: sh7372: add clock lookup entries for DT-based devices ARM: sh7372: fix cache clean / invalidate order ARM: shmobile: add function declarations for sh7372 DT helper functions Kuninori Morimoto (3): ARM: shmobile: r8a7740: add TMU timer support ARM: shmobile: sh73a0: fixup div4_clks bitmap ARM: shmobile: r8a7779: scif .irqs used SCIx_IRQ_MUXED() Magnus Damm (1): ARM: mach-shmobile: sh73a0 external IRQ wake update Simon Horman (4): ARM: shmobile: Remove duplicate inclusion of dma-mapping.h in setup-r8a7740.c ARM: mach-shmobile: sh73a0: Allow initialisation of GIC by DT ARM: mach-shmobile: sh73a0: Minimal setup using DT ARM: mach-shmobile: sh73a0: Initialise MMCIF using DT arch/arm/boot/dts/sh73a0-reference.dtsi | 24 ++++++ arch/arm/boot/dts/sh73a0.dtsi | 93 +++++++++++++++++++++++ arch/arm/mach-shmobile/Makefile | 3 +- arch/arm/mach-shmobile/board-armadillo800eva.c | 2 + arch/arm/mach-shmobile/board-kzm9g.c | 2 + arch/arm/mach-shmobile/clock-r8a7740.c | 6 +- arch/arm/mach-shmobile/clock-sh7372.c | 9 +++ arch/arm/mach-shmobile/clock-sh73a0.c | 35 ++++++--- arch/arm/mach-shmobile/headsmp-sh73a0.S | 50 +++++++++++++ arch/arm/mach-shmobile/include/mach/common.h | 8 ++ arch/arm/mach-shmobile/intc-sh73a0.c | 16 ++-- arch/arm/mach-shmobile/pm-r8a7740.c | 22 ++++++ arch/arm/mach-shmobile/pm-sh73a0.c | 32 ++++++++ arch/arm/mach-shmobile/setup-r8a7740.c | 95 +++++++++++++++++++++++- arch/arm/mach-shmobile/setup-r8a7779.c | 18 ++--- arch/arm/mach-shmobile/setup-sh73a0.c | 62 +++++++++++++++- arch/arm/mach-shmobile/sleep-sh7372.S | 12 +-- arch/arm/mach-shmobile/smp-sh73a0.c | 66 ++++++++-------- 18 files changed, 485 insertions(+), 70 deletions(-) create mode 100644 arch/arm/boot/dts/sh73a0-reference.dtsi create mode 100644 arch/arm/boot/dts/sh73a0.dtsi create mode 100644 arch/arm/mach-shmobile/headsmp-sh73a0.S create mode 100644 arch/arm/mach-shmobile/pm-sh73a0.c