| Message ID | 20130318151002.28231.37531.sendpatchset@w520 (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Mar 19, 2013 at 12:10:02AM +0900, Magnus Damm wrote: > From: Magnus Damm <damm@opensource.se> > > V2 of APE6EVM base board support making use of > 1 GiB of memory, the SCIFA0 serial port and > ARM architected timer. > > Signed-off-by: Magnus Damm <damm@opensource.se> > --- > > Changes since V1: > - Sorted headers > - Use ape6evm_add_standard_devices() to setup SoC devices and clocks > > Written against "next" renesas.git 811689afc214564c4a5f238ecf4d8bdc0e52b615 > > Depends on the following series: > [PATCH 00/04] ARM: shmobile: r8a73a4 SoC support V2 > > Does not depend on: > [PATCH 00/02] sh-pfc: Initial r8a73a4 PFC support > > arch/arm/boot/dts/Makefile | 1 > arch/arm/boot/dts/r8a73a4-ape6evm.dts | 26 ++++++++++++++++++ > arch/arm/mach-shmobile/Kconfig | 8 ++++- > arch/arm/mach-shmobile/Makefile | 1 > arch/arm/mach-shmobile/board-ape6evm.c | 46 ++++++++++++++++++++++++++++++++ > 5 files changed, 81 insertions(+), 1 deletion(-) > > --- 0001/arch/arm/boot/dts/Makefile > +++ work/arch/arm/boot/dts/Makefile 2013-03-18 21:44:34.000000000 +0900 > @@ -139,6 +139,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm > r8a7779-marzen-reference.dtb \ > sh73a0-kzm9g.dtb \ > sh73a0-kzm9g-reference.dtb \ > + r8a73a4-ape6evm.dtb \ > sh7372-mackerel.dtb > dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \ > socfpga_vt.dtb > --- /dev/null > +++ work/arch/arm/boot/dts/r8a73a4-ape6evm.dts 2013-03-18 21:44:35.000000000 +0900 > @@ -0,0 +1,26 @@ > +/* > + * Device Tree Source for the APE6EVM board > + * > + * Copyright (C) 2013 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. > + */ > + > +/dts-v1/; > +/include/ "r8a73a4.dtsi" > + > +/ { > + model = "APE6EVM"; > + compatible = "renesas,ape6evm", "renesas,r8a73a4"; > + > + chosen { > + bootargs = "console=ttySC0,115200 ignore_loglevel"; I think that earlyprintk=sh-sci.0,11520 go in here. > + }; > + > + memory@40000000 { > + device_type = "memory"; > + reg = <0x40000000 0x40000000>; > + }; > +}; > --- 0007/arch/arm/mach-shmobile/Kconfig > +++ work/arch/arm/mach-shmobile/Kconfig 2013-03-18 21:44:34.000000000 +0900 > @@ -79,6 +79,11 @@ config MACH_AG5EVM > select REGULATOR_FIXED_VOLTAGE if REGULATOR > select SH_LCD_MIPI_DSI > > +config MACH_APE6EVM > + bool "APE6EVM board" > + depends on ARCH_R8A73A4 > + select USE_OF > + > config MACH_MACKEREL > bool "mackerel board" > depends on ARCH_SH7372 > @@ -166,7 +171,7 @@ config MEMORY_START > hex "Physical memory start address" > default "0x40000000" if MACH_AP4EVB || MACH_AG5EVM || \ > MACH_MACKEREL || MACH_BONITO || \ > - MACH_ARMADILLO800EVA > + MACH_ARMADILLO800EVA || MACH_APE6EVM > default "0x41000000" if MACH_KOTA2 > default "0x00000000" > ---help--- > @@ -176,6 +181,7 @@ config MEMORY_START > > config MEMORY_SIZE > hex "Physical memory size" > + default "0x40000000" if MACH_APE6EVM > default "0x20000000" if MACH_AG5EVM || MACH_BONITO || \ > MACH_ARMADILLO800EVA > default "0x1e000000" if MACH_KOTA2 > --- 0003/arch/arm/mach-shmobile/Makefile > +++ work/arch/arm/mach-shmobile/Makefile 2013-03-18 21:44:34.000000000 +0900 > @@ -35,6 +35,7 @@ obj-$(CONFIG_ARCH_SH73A0) += pm-sh73a0.o > # Board objects > obj-$(CONFIG_MACH_AP4EVB) += board-ap4evb.o > obj-$(CONFIG_MACH_AG5EVM) += board-ag5evm.o > +obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o > obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o > obj-$(CONFIG_MACH_KOTA2) += board-kota2.o > obj-$(CONFIG_MACH_BONITO) += board-bonito.o > --- /dev/null > +++ work/arch/arm/mach-shmobile/board-ape6evm.c 2013-03-18 21:45:34.000000000 +0900 > @@ -0,0 +1,46 @@ > +/* > + * APE6EVM board support > + * > + * Copyright (C) 2013 Renesas Solutions Corp. > + * Copyright (C) 2013 Magnus Damm > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; version 2 of the License. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA > + */ > + > +#include <linux/interrupt.h> > +#include <linux/irqchip.h> > +#include <linux/kernel.h> > +#include <linux/platform_device.h> > +#include <mach/common.h> > +#include <mach/r8a73a4.h> > +#include <asm/mach-types.h> > +#include <asm/mach/arch.h> > + > +static void __init ape6evm_add_standard_devices(void) > +{ > + r8a73a4_clock_init(); > + r8a73a4_add_standard_devices(); > +} > + > +static const char *ape6evm_boards_compat_dt[] __initdata = { > + "renesas,ape6evm", > + NULL, > +}; > + > +DT_MACHINE_START(APE6EVM_DT, "ape6evm") > + .init_irq = irqchip_init, > + .init_time = shmobile_timer_init, > + .init_machine = ape6evm_add_standard_devices, > + .dt_compat = ape6evm_boards_compat_dt, > +MACHINE_END >
On Tue, Mar 19, 2013 at 04:25:33PM +0900, Simon Horman wrote: > On Tue, Mar 19, 2013 at 12:10:02AM +0900, Magnus Damm wrote: > > From: Magnus Damm <damm@opensource.se> > > > > V2 of APE6EVM base board support making use of > > 1 GiB of memory, the SCIFA0 serial port and > > ARM architected timer. > > > > Signed-off-by: Magnus Damm <damm@opensource.se> > > --- > > > > Changes since V1: > > - Sorted headers > > - Use ape6evm_add_standard_devices() to setup SoC devices and clocks > > > > Written against "next" renesas.git 811689afc214564c4a5f238ecf4d8bdc0e52b615 > > > > Depends on the following series: > > [PATCH 00/04] ARM: shmobile: r8a73a4 SoC support V2 > > > > Does not depend on: > > [PATCH 00/02] sh-pfc: Initial r8a73a4 PFC support > > > > arch/arm/boot/dts/Makefile | 1 > > arch/arm/boot/dts/r8a73a4-ape6evm.dts | 26 ++++++++++++++++++ > > arch/arm/mach-shmobile/Kconfig | 8 ++++- > > arch/arm/mach-shmobile/Makefile | 1 > > arch/arm/mach-shmobile/board-ape6evm.c | 46 ++++++++++++++++++++++++++++++++ > > 5 files changed, 81 insertions(+), 1 deletion(-) > > > > --- 0001/arch/arm/boot/dts/Makefile > > +++ work/arch/arm/boot/dts/Makefile 2013-03-18 21:44:34.000000000 +0900 > > @@ -139,6 +139,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm > > r8a7779-marzen-reference.dtb \ > > sh73a0-kzm9g.dtb \ > > sh73a0-kzm9g-reference.dtb \ > > + r8a73a4-ape6evm.dtb \ > > sh7372-mackerel.dtb > > dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \ > > socfpga_vt.dtb > > --- /dev/null > > +++ work/arch/arm/boot/dts/r8a73a4-ape6evm.dts 2013-03-18 21:44:35.000000000 +0900 > > @@ -0,0 +1,26 @@ > > +/* > > + * Device Tree Source for the APE6EVM board > > + * > > + * Copyright (C) 2013 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. > > + */ > > + > > +/dts-v1/; > > +/include/ "r8a73a4.dtsi" > > + > > +/ { > > + model = "APE6EVM"; > > + compatible = "renesas,ape6evm", "renesas,r8a73a4"; > > + > > + chosen { > > + bootargs = "console=ttySC0,115200 ignore_loglevel"; > > I think that earlyprintk=sh-sci.0,11520 go in here. Also, to be consistent with the dts of other shmobile boards could you add root=/dev/nfs ip=dhcp. This history behind this is that many boards defaulted to using nfsroot in their defconfigs, a reasonable default IMHO, and recently the command line for all boards that boot using DT was moved from their defconfig to their .dtsi in preparation for defconfig consolidation. [snip]
On Tue, Mar 19, 2013 at 4:25 PM, Simon Horman <horms@verge.net.au> wrote: > On Tue, Mar 19, 2013 at 12:10:02AM +0900, Magnus Damm wrote: >> From: Magnus Damm <damm@opensource.se> >> >> V2 of APE6EVM base board support making use of >> 1 GiB of memory, the SCIFA0 serial port and >> ARM architected timer. >> >> Signed-off-by: Magnus Damm <damm@opensource.se> >> --- >> >> Changes since V1: >> - Sorted headers >> - Use ape6evm_add_standard_devices() to setup SoC devices and clocks >> >> Written against "next" renesas.git 811689afc214564c4a5f238ecf4d8bdc0e52b615 >> >> Depends on the following series: >> [PATCH 00/04] ARM: shmobile: r8a73a4 SoC support V2 >> >> Does not depend on: >> [PATCH 00/02] sh-pfc: Initial r8a73a4 PFC support >> >> arch/arm/boot/dts/Makefile | 1 >> arch/arm/boot/dts/r8a73a4-ape6evm.dts | 26 ++++++++++++++++++ >> arch/arm/mach-shmobile/Kconfig | 8 ++++- >> arch/arm/mach-shmobile/Makefile | 1 >> arch/arm/mach-shmobile/board-ape6evm.c | 46 ++++++++++++++++++++++++++++++++ >> 5 files changed, 81 insertions(+), 1 deletion(-) >> >> --- 0001/arch/arm/boot/dts/Makefile >> +++ work/arch/arm/boot/dts/Makefile 2013-03-18 21:44:34.000000000 +0900 >> @@ -139,6 +139,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm >> r8a7779-marzen-reference.dtb \ >> sh73a0-kzm9g.dtb \ >> sh73a0-kzm9g-reference.dtb \ >> + r8a73a4-ape6evm.dtb \ >> sh7372-mackerel.dtb >> dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \ >> socfpga_vt.dtb >> --- /dev/null >> +++ work/arch/arm/boot/dts/r8a73a4-ape6evm.dts 2013-03-18 21:44:35.000000000 +0900 >> @@ -0,0 +1,26 @@ >> +/* >> + * Device Tree Source for the APE6EVM board >> + * >> + * Copyright (C) 2013 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. >> + */ >> + >> +/dts-v1/; >> +/include/ "r8a73a4.dtsi" >> + >> +/ { >> + model = "APE6EVM"; >> + compatible = "renesas,ape6evm", "renesas,r8a73a4"; >> + >> + chosen { >> + bootargs = "console=ttySC0,115200 ignore_loglevel"; > > I think that earlyprintk=sh-sci.0,11520 go in here. Thanks for checking, but we're not making use of earlyprintk on r8a73a4. So adding this parameter will not make any difference, just potential confusion IMO. On r8a73a4 the SCIF ports are added as regular device drivers at ->init_machine() timing. With this approach transition to DT in the future will be just a small step. Thanks, / magnus
On Tue, Mar 19, 2013 at 4:50 PM, Simon Horman <horms@verge.net.au> wrote: > On Tue, Mar 19, 2013 at 04:25:33PM +0900, Simon Horman wrote: >> On Tue, Mar 19, 2013 at 12:10:02AM +0900, Magnus Damm wrote: >> > From: Magnus Damm <damm@opensource.se> >> > >> > V2 of APE6EVM base board support making use of >> > 1 GiB of memory, the SCIFA0 serial port and >> > ARM architected timer. >> > >> > Signed-off-by: Magnus Damm <damm@opensource.se> >> > --- >> > >> > Changes since V1: >> > - Sorted headers >> > - Use ape6evm_add_standard_devices() to setup SoC devices and clocks >> > >> > Written against "next" renesas.git 811689afc214564c4a5f238ecf4d8bdc0e52b615 >> > >> > Depends on the following series: >> > [PATCH 00/04] ARM: shmobile: r8a73a4 SoC support V2 >> > >> > Does not depend on: >> > [PATCH 00/02] sh-pfc: Initial r8a73a4 PFC support >> > >> > arch/arm/boot/dts/Makefile | 1 >> > arch/arm/boot/dts/r8a73a4-ape6evm.dts | 26 ++++++++++++++++++ >> > arch/arm/mach-shmobile/Kconfig | 8 ++++- >> > arch/arm/mach-shmobile/Makefile | 1 >> > arch/arm/mach-shmobile/board-ape6evm.c | 46 ++++++++++++++++++++++++++++++++ >> > 5 files changed, 81 insertions(+), 1 deletion(-) >> > >> > --- /dev/null >> > +++ work/arch/arm/boot/dts/r8a73a4-ape6evm.dts 2013-03-18 21:44:35.000000000 +0900 >> > @@ -0,0 +1,26 @@ >> > +/* >> > + * Device Tree Source for the APE6EVM board >> > + * >> > + * Copyright (C) 2013 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. >> > + */ >> > + >> > +/dts-v1/; >> > +/include/ "r8a73a4.dtsi" >> > + >> > +/ { >> > + model = "APE6EVM"; >> > + compatible = "renesas,ape6evm", "renesas,r8a73a4"; >> > + >> > + chosen { >> > + bootargs = "console=ttySC0,115200 ignore_loglevel"; >> >> I think that earlyprintk=sh-sci.0,11520 go in here. > > Also, to be consistent with the dts of other shmobile boards > could you add root=/dev/nfs ip=dhcp. This history behind this > is that many boards defaulted to using nfsroot in their defconfigs, > a reasonable default IMHO, and recently the command line for all > boards that boot using DT was moved from their defconfig > to their .dtsi in preparation for defconfig consolidation. Sounds like a good idea. Network is however not existing until pretty late in the series. How about adding it in that patch that includes SMSC ethernet support? Thanks, / magnus
Hi Magnus, On Tue, Mar 19, 2013 at 07:15:22PM +0900, Magnus Damm wrote: > On Tue, Mar 19, 2013 at 4:25 PM, Simon Horman <horms@verge.net.au> wrote: > > On Tue, Mar 19, 2013 at 12:10:02AM +0900, Magnus Damm wrote: > >> From: Magnus Damm <damm@opensource.se> > >> > >> V2 of APE6EVM base board support making use of > >> 1 GiB of memory, the SCIFA0 serial port and > >> ARM architected timer. > >> > >> Signed-off-by: Magnus Damm <damm@opensource.se> > >> --- > >> > >> Changes since V1: > >> - Sorted headers > >> - Use ape6evm_add_standard_devices() to setup SoC devices and clocks > >> > >> Written against "next" renesas.git 811689afc214564c4a5f238ecf4d8bdc0e52b615 > >> > >> Depends on the following series: > >> [PATCH 00/04] ARM: shmobile: r8a73a4 SoC support V2 > >> > >> Does not depend on: > >> [PATCH 00/02] sh-pfc: Initial r8a73a4 PFC support > >> > >> arch/arm/boot/dts/Makefile | 1 > >> arch/arm/boot/dts/r8a73a4-ape6evm.dts | 26 ++++++++++++++++++ > >> arch/arm/mach-shmobile/Kconfig | 8 ++++- > >> arch/arm/mach-shmobile/Makefile | 1 > >> arch/arm/mach-shmobile/board-ape6evm.c | 46 ++++++++++++++++++++++++++++++++ > >> 5 files changed, 81 insertions(+), 1 deletion(-) > >> > >> --- 0001/arch/arm/boot/dts/Makefile > >> +++ work/arch/arm/boot/dts/Makefile 2013-03-18 21:44:34.000000000 +0900 > >> @@ -139,6 +139,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm > >> r8a7779-marzen-reference.dtb \ > >> sh73a0-kzm9g.dtb \ > >> sh73a0-kzm9g-reference.dtb \ > >> + r8a73a4-ape6evm.dtb \ > >> sh7372-mackerel.dtb > >> dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \ > >> socfpga_vt.dtb > >> --- /dev/null > >> +++ work/arch/arm/boot/dts/r8a73a4-ape6evm.dts 2013-03-18 21:44:35.000000000 +0900 > >> @@ -0,0 +1,26 @@ > >> +/* > >> + * Device Tree Source for the APE6EVM board > >> + * > >> + * Copyright (C) 2013 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. > >> + */ > >> + > >> +/dts-v1/; > >> +/include/ "r8a73a4.dtsi" > >> + > >> +/ { > >> + model = "APE6EVM"; > >> + compatible = "renesas,ape6evm", "renesas,r8a73a4"; > >> + > >> + chosen { > >> + bootargs = "console=ttySC0,115200 ignore_loglevel"; > > > > I think that earlyprintk=sh-sci.0,11520 go in here. > > Thanks for checking, but we're not making use of earlyprintk on > r8a73a4. So adding this parameter will not make any difference, just > potential confusion IMO. > > On r8a73a4 the SCIF ports are added as regular device drivers at > ->init_machine() timing. With this approach transition to DT in the > future will be just a small step. Thanks for the clarification.
On Tue, Mar 19, 2013 at 07:18:18PM +0900, Magnus Damm wrote: > On Tue, Mar 19, 2013 at 4:50 PM, Simon Horman <horms@verge.net.au> wrote: > > On Tue, Mar 19, 2013 at 04:25:33PM +0900, Simon Horman wrote: > >> On Tue, Mar 19, 2013 at 12:10:02AM +0900, Magnus Damm wrote: > >> > From: Magnus Damm <damm@opensource.se> > >> > > >> > V2 of APE6EVM base board support making use of > >> > 1 GiB of memory, the SCIFA0 serial port and > >> > ARM architected timer. > >> > > >> > Signed-off-by: Magnus Damm <damm@opensource.se> > >> > --- > >> > > >> > Changes since V1: > >> > - Sorted headers > >> > - Use ape6evm_add_standard_devices() to setup SoC devices and clocks > >> > > >> > Written against "next" renesas.git 811689afc214564c4a5f238ecf4d8bdc0e52b615 > >> > > >> > Depends on the following series: > >> > [PATCH 00/04] ARM: shmobile: r8a73a4 SoC support V2 > >> > > >> > Does not depend on: > >> > [PATCH 00/02] sh-pfc: Initial r8a73a4 PFC support > >> > > >> > arch/arm/boot/dts/Makefile | 1 > >> > arch/arm/boot/dts/r8a73a4-ape6evm.dts | 26 ++++++++++++++++++ > >> > arch/arm/mach-shmobile/Kconfig | 8 ++++- > >> > arch/arm/mach-shmobile/Makefile | 1 > >> > arch/arm/mach-shmobile/board-ape6evm.c | 46 ++++++++++++++++++++++++++++++++ > >> > 5 files changed, 81 insertions(+), 1 deletion(-) > >> > > >> > --- /dev/null > >> > +++ work/arch/arm/boot/dts/r8a73a4-ape6evm.dts 2013-03-18 21:44:35.000000000 +0900 > >> > @@ -0,0 +1,26 @@ > >> > +/* > >> > + * Device Tree Source for the APE6EVM board > >> > + * > >> > + * Copyright (C) 2013 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. > >> > + */ > >> > + > >> > +/dts-v1/; > >> > +/include/ "r8a73a4.dtsi" > >> > + > >> > +/ { > >> > + model = "APE6EVM"; > >> > + compatible = "renesas,ape6evm", "renesas,r8a73a4"; > >> > + > >> > + chosen { > >> > + bootargs = "console=ttySC0,115200 ignore_loglevel"; > >> > >> I think that earlyprintk=sh-sci.0,11520 go in here. > > > > Also, to be consistent with the dts of other shmobile boards > > could you add root=/dev/nfs ip=dhcp. This history behind this > > is that many boards defaulted to using nfsroot in their defconfigs, > > a reasonable default IMHO, and recently the command line for all > > boards that boot using DT was moved from their defconfig > > to their .dtsi in preparation for defconfig consolidation. > > Sounds like a good idea. Network is however not existing until pretty > late in the series. How about adding it in that patch that includes > SMSC ethernet support? Yes, that sounds reasonable to me.
On Wed, Mar 20, 2013 at 9:50 PM, Simon Horman <horms@verge.net.au> wrote: > On Tue, Mar 19, 2013 at 07:18:18PM +0900, Magnus Damm wrote: >> On Tue, Mar 19, 2013 at 4:50 PM, Simon Horman <horms@verge.net.au> wrote: >> > On Tue, Mar 19, 2013 at 04:25:33PM +0900, Simon Horman wrote: >> >> On Tue, Mar 19, 2013 at 12:10:02AM +0900, Magnus Damm wrote: >> >> > From: Magnus Damm <damm@opensource.se> >> >> > >> >> > V2 of APE6EVM base board support making use of >> >> > 1 GiB of memory, the SCIFA0 serial port and >> >> > ARM architected timer. >> >> > >> >> > Signed-off-by: Magnus Damm <damm@opensource.se> >> >> > --- >> >> > >> >> > Changes since V1: >> >> > - Sorted headers >> >> > - Use ape6evm_add_standard_devices() to setup SoC devices and clocks >> >> > >> >> > Written against "next" renesas.git 811689afc214564c4a5f238ecf4d8bdc0e52b615 >> >> > >> >> > Depends on the following series: >> >> > [PATCH 00/04] ARM: shmobile: r8a73a4 SoC support V2 >> >> > >> >> > Does not depend on: >> >> > [PATCH 00/02] sh-pfc: Initial r8a73a4 PFC support >> >> > >> >> > arch/arm/boot/dts/Makefile | 1 >> >> > arch/arm/boot/dts/r8a73a4-ape6evm.dts | 26 ++++++++++++++++++ >> >> > arch/arm/mach-shmobile/Kconfig | 8 ++++- >> >> > arch/arm/mach-shmobile/Makefile | 1 >> >> > arch/arm/mach-shmobile/board-ape6evm.c | 46 ++++++++++++++++++++++++++++++++ >> >> > 5 files changed, 81 insertions(+), 1 deletion(-) >> >> > >> >> > --- /dev/null >> >> > +++ work/arch/arm/boot/dts/r8a73a4-ape6evm.dts 2013-03-18 21:44:35.000000000 +0900 >> >> > @@ -0,0 +1,26 @@ >> >> > +/* >> >> > + * Device Tree Source for the APE6EVM board >> >> > + * >> >> > + * Copyright (C) 2013 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. >> >> > + */ >> >> > + >> >> > +/dts-v1/; >> >> > +/include/ "r8a73a4.dtsi" >> >> > + >> >> > +/ { >> >> > + model = "APE6EVM"; >> >> > + compatible = "renesas,ape6evm", "renesas,r8a73a4"; >> >> > + >> >> > + chosen { >> >> > + bootargs = "console=ttySC0,115200 ignore_loglevel"; >> >> >> >> I think that earlyprintk=sh-sci.0,11520 go in here. >> > >> > Also, to be consistent with the dts of other shmobile boards >> > could you add root=/dev/nfs ip=dhcp. This history behind this >> > is that many boards defaulted to using nfsroot in their defconfigs, >> > a reasonable default IMHO, and recently the command line for all >> > boards that boot using DT was moved from their defconfig >> > to their .dtsi in preparation for defconfig consolidation. >> >> Sounds like a good idea. Network is however not existing until pretty >> late in the series. How about adding it in that patch that includes >> SMSC ethernet support? > > Yes, that sounds reasonable to me. Thanks. I will include that change in V3 together with a bug fix for the SCIF ports. Also, if there is any suggestion about the the split of platform device vs DT then I can also rework that portion of the code. And yes, will need to update the PFC with PINCTRL support too. Cheers, / magnus
--- 0001/arch/arm/boot/dts/Makefile +++ work/arch/arm/boot/dts/Makefile 2013-03-18 21:44:34.000000000 +0900 @@ -139,6 +139,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm r8a7779-marzen-reference.dtb \ sh73a0-kzm9g.dtb \ sh73a0-kzm9g-reference.dtb \ + r8a73a4-ape6evm.dtb \ sh7372-mackerel.dtb dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \ socfpga_vt.dtb --- /dev/null +++ work/arch/arm/boot/dts/r8a73a4-ape6evm.dts 2013-03-18 21:44:35.000000000 +0900 @@ -0,0 +1,26 @@ +/* + * Device Tree Source for the APE6EVM board + * + * Copyright (C) 2013 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. + */ + +/dts-v1/; +/include/ "r8a73a4.dtsi" + +/ { + model = "APE6EVM"; + compatible = "renesas,ape6evm", "renesas,r8a73a4"; + + chosen { + bootargs = "console=ttySC0,115200 ignore_loglevel"; + }; + + memory@40000000 { + device_type = "memory"; + reg = <0x40000000 0x40000000>; + }; +}; --- 0007/arch/arm/mach-shmobile/Kconfig +++ work/arch/arm/mach-shmobile/Kconfig 2013-03-18 21:44:34.000000000 +0900 @@ -79,6 +79,11 @@ config MACH_AG5EVM select REGULATOR_FIXED_VOLTAGE if REGULATOR select SH_LCD_MIPI_DSI +config MACH_APE6EVM + bool "APE6EVM board" + depends on ARCH_R8A73A4 + select USE_OF + config MACH_MACKEREL bool "mackerel board" depends on ARCH_SH7372 @@ -166,7 +171,7 @@ config MEMORY_START hex "Physical memory start address" default "0x40000000" if MACH_AP4EVB || MACH_AG5EVM || \ MACH_MACKEREL || MACH_BONITO || \ - MACH_ARMADILLO800EVA + MACH_ARMADILLO800EVA || MACH_APE6EVM default "0x41000000" if MACH_KOTA2 default "0x00000000" ---help--- @@ -176,6 +181,7 @@ config MEMORY_START config MEMORY_SIZE hex "Physical memory size" + default "0x40000000" if MACH_APE6EVM default "0x20000000" if MACH_AG5EVM || MACH_BONITO || \ MACH_ARMADILLO800EVA default "0x1e000000" if MACH_KOTA2 --- 0003/arch/arm/mach-shmobile/Makefile +++ work/arch/arm/mach-shmobile/Makefile 2013-03-18 21:44:34.000000000 +0900 @@ -35,6 +35,7 @@ obj-$(CONFIG_ARCH_SH73A0) += pm-sh73a0.o # Board objects obj-$(CONFIG_MACH_AP4EVB) += board-ap4evb.o obj-$(CONFIG_MACH_AG5EVM) += board-ag5evm.o +obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o obj-$(CONFIG_MACH_KOTA2) += board-kota2.o obj-$(CONFIG_MACH_BONITO) += board-bonito.o --- /dev/null +++ work/arch/arm/mach-shmobile/board-ape6evm.c 2013-03-18 21:45:34.000000000 +0900 @@ -0,0 +1,46 @@ +/* + * APE6EVM board support + * + * Copyright (C) 2013 Renesas Solutions Corp. + * Copyright (C) 2013 Magnus Damm + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <linux/interrupt.h> +#include <linux/irqchip.h> +#include <linux/kernel.h> +#include <linux/platform_device.h> +#include <mach/common.h> +#include <mach/r8a73a4.h> +#include <asm/mach-types.h> +#include <asm/mach/arch.h> + +static void __init ape6evm_add_standard_devices(void) +{ + r8a73a4_clock_init(); + r8a73a4_add_standard_devices(); +} + +static const char *ape6evm_boards_compat_dt[] __initdata = { + "renesas,ape6evm", + NULL, +}; + +DT_MACHINE_START(APE6EVM_DT, "ape6evm") + .init_irq = irqchip_init, + .init_time = shmobile_timer_init, + .init_machine = ape6evm_add_standard_devices, + .dt_compat = ape6evm_boards_compat_dt, +MACHINE_END