ARM: shmobile: Initial r7s72100 SoC and Genmai board support
Subsystems (6)
Magnus Damm
maintainercover ARM: shmobile: Initial r7s72100 SoC and Genmai board support
ARM: shmobile: Initial r7s72100 SoC and Genmai board support
[PATCH 01/03] ARM: shmobile: Initial r7s72100 SoC support [PATCH 02/03] ARM: shmobile: r7s72100 SCIF support [PATCH 03/03] ARM: shmobile: Genmai support
This series adds initial support for r7s72100 and Genmai. The SoC is known as r7s72100 which is based on a single core Cortex-A9 and makes use of SCIF for serial. Many other on-chip I/O devices are available, and support for those will be added by incremental feature patches.
This initial SoC and board support is providing limited DT-only support and a very basic C-version of board support. In the future improved PINCTRL and common clock framework support will be added.
Implemented in same style as r8a7790 and r8a7791.
---
Written against renesas.git tag renesas-devel-20130906
arch/arm/boot/dts/Makefile | 1 arch/arm/boot/dts/r7s72100-genmai.dts | 31 +++ arch/arm/boot/dts/r7s72100.dtsi | 36 ++++ arch/arm/mach-shmobile/Kconfig | 11 + arch/arm/mach-shmobile/Makefile | 3 arch/arm/mach-shmobile/Makefile.boot | 1 arch/arm/mach-shmobile/board-genmai.c | 43 +++++ arch/arm/mach-shmobile/clock-r7s72100.c | 202 ++++++++++++++++++++++++ arch/arm/mach-shmobile/include/mach/r7s72100.h | 8 arch/arm/mach-shmobile/setup-r7s72100.c | 88 ++++++++++ 10 files changed, 424 insertions(+)
Magnus Damm
maintainerPATCH 1/3 ARM: shmobile: Initial r7s72100 SoC support
From: Magnus Damm <[email protected]>
Add initial support for the r7272100 SoC including:
- Single Cortex-A9 CPU Core
- GIC
No static virtual mappings are used, all the components make use of ioremap(). DT_MACHINE_START is still wrapped in CONFIG_USE_OF to match other mach-shmobile code.
---
arch/arm/boot/dts/r7s72100.dtsi | 36 ++++ arch/arm/mach-shmobile/Kconfig | 6 arch/arm/mach-shmobile/Makefile | 2 arch/arm/mach-shmobile/clock-r7s72100.c | 194 ++++++++++++++++++++++++ arch/arm/mach-shmobile/include/mach/r7s72100.h | 7 arch/arm/mach-shmobile/setup-r7s72100.c | 43 +++++ 6 files changed, 288 insertions(+)
arch/arm/boot/dts/r7s72100.dtsi new file +36 -0
@@ -0,0 +1,36 @@ +/* + * Device Tree Source for the r7s72100 SoC + * + * 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. + */ + +/ { + compatible = "renesas,r7s72100"; + interrupt-parent = <&gic>; + #address-cells = <1>; + #size-cells = <1>; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu at 0 { + device_type = "cpu"; + compatible = "arm,cortex-a9"; + reg = <0>; + }; + }; + + gic: interrupt-controller at e8201000 { + compatible = "arm,cortex-a9-gic"; + #interrupt-cells = <3>; + #address-cells = <0>; + interrupt-controller; + reg = <0xe8201000 0x1000>, + <0xe8202000 0x1000>; + }; +};
arch/arm/mach-shmobile/Kconfig +6 -0
@@ -113,6 +113,12 @@ config ARCH_EMEV2 select ARM_GIC select CPU_V7 +config ARCH_R7S72100 + bool "RZ/A1H (R7S72100)" + select ARM_GIC + select CPU_V7 + select SH_CLK_CPG + comment "SH-Mobile Board Type" config MACH_APE6EVM
arch/arm/mach-shmobile/Makefile +2 -0
@@ -17,6 +17,7 @@ obj-$(CONFIG_ARCH_R8A7779) += setup-r8a7 obj-$(CONFIG_ARCH_R8A7790) += setup-r8a7790.o obj-$(CONFIG_ARCH_R8A7791) += setup-r8a7791.o obj-$(CONFIG_ARCH_EMEV2) += setup-emev2.o +obj-$(CONFIG_ARCH_R7S72100) += setup-r7s72100.o # Clock objects ifndef CONFIG_COMMON_CLK
@@ -30,6 +31,7 @@ obj-$(CONFIG_ARCH_R8A7779) += clock-r8a7 obj-$(CONFIG_ARCH_R8A7790) += clock-r8a7790.o obj-$(CONFIG_ARCH_R8A7791) += clock-r8a7791.o obj-$(CONFIG_ARCH_EMEV2) += clock-emev2.o +obj-$(CONFIG_ARCH_R7S72100) += clock-r7s72100.o endif # SMP objects
arch/arm/mach-shmobile/clock-r7s72100.c new file +194 -0
194 lines not on this page · raw message
arch/arm/mach-shmobile/include/mach/r7s72100.h new file +7 -0
@@ -0,0 +1,7 @@ +#ifndef __ASM_R7S72100_H__ +#define __ASM_R7S72100_H__ + +void r7s72100_clock_init (void ); +void r7s72100_init_early (void ); + +#endif /* __ASM_R7S72100_H__ */
arch/arm/mach-shmobile/setup-r7s72100.c new file +43 -0
43 lines not on this page · raw message
Magnus Damm
maintainerPATCH 2/3 ARM: shmobile: r7s72100 SCIF support
In reply to Magnus DammFrom: Magnus Damm <[email protected]>
Add SCIF serial port support to the r7s72100 SoC by adding platform devices for SCIF0 -> SCIF7 together with clock bindings. DT device description is excluded at this point since such bindings are still under development.
---
arch/arm/mach-shmobile/clock-r7s72100.c | 8 ++++ arch/arm/mach-shmobile/include/mach/r7s72100.h | 1 arch/arm/mach-shmobile/setup-r7s72100.c | 45 ++++++++++++++++++++++++ 3 files changed, 54 insertions(+)
arch/arm/mach-shmobile/clock-r7s72100.c +8 -0
@@ -170,6 +170,14 @@ static struct clk_lookup lookups[] = {CLKDEV_CON_ID ("cpu_clk" , &div4_clks[DIV4_I ]),/* MSTP clocks */ +CLKDEV_ICK_ID ("sci_fck" ,"sh-sci.0" , &mstp_clks[MSTP47 ]), +CLKDEV_ICK_ID ("sci_fck" ,"sh-sci.1" , &mstp_clks[MSTP46 ]), +CLKDEV_ICK_ID ("sci_fck" ,"sh-sci.2" , &mstp_clks[MSTP45 ]), +CLKDEV_ICK_ID ("sci_fck" ,"sh-sci.3" , &mstp_clks[MSTP44 ]), +CLKDEV_ICK_ID ("sci_fck" ,"sh-sci.4" , &mstp_clks[MSTP43 ]), +CLKDEV_ICK_ID ("sci_fck" ,"sh-sci.5" , &mstp_clks[MSTP42 ]), +CLKDEV_ICK_ID ("sci_fck" ,"sh-sci.6" , &mstp_clks[MSTP41 ]), + CLKDEV_ICK_ID("sci_fck", "sh-sci.7", &mstp_clks[MSTP40]), };void __init r7s72100_clock_init (void )
arch/arm/mach-shmobile/include/mach/r7s72100.h +1 -0
@@ -1,6 +1,7 @@#ifndef __ASM_R7S72100_H__#define __ASM_R7S72100_H__ +void r7s72100_add_dt_devices (void );void r7s72100_clock_init (void );void r7s72100_init_early (void );
arch/arm/mach-shmobile/setup-r7s72100.c +45 -0
55 lines not on this page · raw message
Magnus Damm
maintainerPATCH 3/3 ARM: shmobile: Genmai support
In reply to Magnus DammFrom: Magnus Damm <[email protected]>
Genmai base board support making use of 128 MiB of memory, the r7s7211 SoC with the SCIF2 serial port and CA9 core.
---
arch/arm/boot/dts/Makefile | 1 arch/arm/boot/dts/r7s72100-genmai.dts | 31 +++++++++++++++++++++++ arch/arm/mach-shmobile/Kconfig | 5 +++ arch/arm/mach-shmobile/Makefile | 1 arch/arm/mach-shmobile/Makefile.boot | 1 arch/arm/mach-shmobile/board-genmai.c | 43 +++++++++++++++++++++++++++++++++ 6 files changed, 82 insertions(+)
arch/arm/boot/dts/Makefile +1 -0
@@ -184,6 +184,7 @@ dtb-$(CONFIG_ARCH_U8500) += snowball.dtb dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \ emev2-kzm9d-reference.dtb \ + r7s72100-genmai.dtb \ r8a7740-armadillo800eva.dtb \ r8a7778-bockw.dtb \ r8a7778-bockw-reference.dtb \
arch/arm/boot/dts/r7s72100-genmai.dts new file +31 -0
@@ -0,0 +1,31 @@ +/* + * Device Tree Source for the Genmai 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/ "r7s72100.dtsi" + +/ { + model = "Genmai"; + compatible = "renesas,genmai", "renesas,r7s72100"; + + chosen { + bootargs = "console=ttySC2,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp"; + }; + + memory { + device_type = "memory"; + reg = <0x08000000 0x08000000>; + }; + + lbsc { + #address-cells = <1>; + #size-cells = <1>; + }; +};
arch/arm/mach-shmobile/Kconfig +5 -0
@@ -189,6 +189,11 @@ config MACH_BOCKW_REFERENCE This is intended to aid developers +config MACH_GENMAI + bool "Genmai board" + depends on ARCH_R7S72100 + select USE_OF + config MACH_MARZEN bool "MARZEN board" depends on ARCH_R8A7779
arch/arm/mach-shmobile/Makefile +1 -0
@@ -58,6 +58,7 @@ obj-$(CONFIG_MACH_APE6EVM_REFERENCE) += obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o obj-$(CONFIG_MACH_BOCKW) += board-bockw.o obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o +obj-$(CONFIG_MACH_GENMAI) += board-genmai.o obj-$(CONFIG_MACH_MARZEN) += board-marzen.o obj-$(CONFIG_MACH_MARZEN_REFERENCE) += board-marzen-reference.o obj-$(CONFIG_MACH_LAGER) += board-lager.o
arch/arm/mach-shmobile/Makefile.boot +1 -0
@@ -6,6 +6,7 @@ loadaddr-$(CONFIG_MACH_ARMADILLO800EVA) loadaddr-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += 0x40008000 loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000 loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000 +loadaddr-$(CONFIG_MACH_GENMAI) += 0x8008000 loadaddr-$(CONFIG_MACH_KOELSCH) += 0x40008000 loadaddr-$(CONFIG_MACH_KZM9D) += 0x40008000 loadaddr-$(CONFIG_MACH_KZM9D_REFERENCE) += 0x40008000
arch/arm/mach-shmobile/board-genmai.c new file +43 -0
43 lines not on this page · raw message
cover ARM: shmobile: Initial r7s72100 SoC and Genmai board support
In reply to Magnus DammQuoted 12 lines · Magnus Damm
ARM: shmobile: Initial r7s72100 SoC and Genmai board support
[PATCH 01/03] ARM: shmobile: Initial r7s72100 SoC support [PATCH 02/03] ARM: shmobile: r7s72100 SCIF support [PATCH 03/03] ARM: shmobile: Genmai support
This series adds initial support for r7s72100 and Genmai. The SoC is known as r7s72100 which is based on a single core Cortex-A9 and makes use of SCIF for serial. Many other on-chip I/O devices are available, and support for those will be added by incremental feature patches.
Quoted 7 lines
This initial SoC and board support is providing limited DT-only support and a very basic C-version of board support. In the future improved PINCTRL and common clock framework support will be added.
Implemented in same style as r8a7790 and r8a7791.
Signed-off-by Magnus Damm <[email protected]>
Hi Magnus,
please provide a defconfig if you would like this series merged. Otherwise this seems reasonable to me.
Magnus Damm
maintainercover ARM: shmobile: Initial r7s72100 SoC and Genmai board support
Hi Simon,
Quoted 17 lines · Simon Horman
Quoted 16 lines · Magnus Damm
ARM: shmobile: Initial r7s72100 SoC and Genmai board support
[PATCH 01/03] ARM: shmobile: Initial r7s72100 SoC support [PATCH 02/03] ARM: shmobile: r7s72100 SCIF support [PATCH 03/03] ARM: shmobile: Genmai support
This series adds initial support for r7s72100 and Genmai. The SoC is known as r7s72100 which is based on a single core Cortex-A9 and makes use of SCIF for serial. Many other on-chip I/O devices are available, and support for those will be added by incremental feature patches.
This initial SoC and board support is providing limited DT-only support and a very basic C-version of board support. In the future improved PINCTRL and common clock framework support will be added.
Quoted 8 lines
Quoted 3 lines
Implemented in same style as r8a7790 and r8a7791.
Signed-off-by Magnus Damm <[email protected]>Hi Magnus,
please provide a defconfig if you would like this series merged. Otherwise this seems reasonable to me.
Thanks, yes, I'd like to see this series merged.
Please use the recently posted defconfig in:
[PATCH] ARM: shmobile: Genmai defconfig
Cheers,
/ magnus
cover ARM: shmobile: Initial r7s72100 SoC and Genmai board support
Quoted 26 lines · Magnus Damm
Hi Simon,
Quoted 23 lines · Simon Horman
Quoted 12 lines · Magnus Damm
ARM: shmobile: Initial r7s72100 SoC and Genmai board support
[PATCH 01/03] ARM: shmobile: Initial r7s72100 SoC support [PATCH 02/03] ARM: shmobile: r7s72100 SCIF support [PATCH 03/03] ARM: shmobile: Genmai support
This series adds initial support for r7s72100 and Genmai. The SoC is known as r7s72100 which is based on a single core Cortex-A9 and makes use of SCIF for serial. Many other on-chip I/O devices are available, and support for those will be added by incremental feature patches.
Quoted 7 lines
This initial SoC and board support is providing limited DT-only support and a very basic C-version of board support. In the future improved PINCTRL and common clock framework support will be added.
Implemented in same style as r8a7790 and r8a7791.
Signed-off-by Magnus Damm <[email protected]>Hi Magnus,
Quoted 8 lines
Quoted 2 lines
please provide a defconfig if you would like this series merged. Otherwise this seems reasonable to me.
Thanks, yes, I'd like to see this series merged.
Please use the recently posted defconfig in:
[PATCH] ARM: shmobile: Genmai defconfig
Thanks, I see it.
PATCH 1/3 ARM: shmobile: Initial r7s72100 SoC support
In reply to Magnus DammQuoted 6 lines · Magnus Damm
From: Magnus Damm <[email protected]>
Add initial support for the r7272100 SoC including:
- Single Cortex-A9 CPU Core
- GIC
Quoted 8 lines
No static virtual mappings are used, all the components make use of
ioremap().DT_MACHINE_STARTis still wrapped inCONFIG_USE_OFto match other mach-shmobile code.Signed-off-by Magnus Damm <[email protected]>---
arch/arm/boot/dts/r7s72100.dtsi | 36 ++++
In future please consider adding the DTSI file in a separate patch.
Quoted 6 lines
arch/arm/mach-shmobile/Kconfig | 6 arch/arm/mach-shmobile/Makefile | 2 arch/arm/mach-shmobile/clock-r7s72100.c | 194 ++++++++++++++++++++++++ arch/arm/mach-shmobile/include/mach/r7s72100.h | 7 arch/arm/mach-shmobile/setup-r7s72100.c | 43 +++++ 6 files changed, 288 insertions(+)
Thanks, I have queued this up in the soc3 branch.
It should make it into v3.13 but if not I'll rename the branch soc after rebasing it on v3.13-rcX which will then be targeted at v3.14.
There was some fuzz when applying the Makefile portion of the patch. I have queued up the following, please check that it is correct.
From: Magnus Damm <[email protected]>
ARM: shmobile: Initial r7s72100 SoC support
Add initial support for the r7272100 SoC including:
- Single Cortex-A9 CPU Core
- GIC
No static virtual mappings are used, all the components make use of ioremap(). DT_MACHINE_START is still wrapped in CONFIG_USE_OF to match other mach-shmobile code.
--- arch/arm/boot/dts/r7s72100.dtsi | 36 +++++ arch/arm/mach-shmobile/Kconfig | 6 + arch/arm/mach-shmobile/Makefile | 2 + arch/arm/mach-shmobile/clock-r7s72100.c | 194 +++++++++++++++++++++++++ arch/arm/mach-shmobile/include/mach/r7s72100.h | 7 + arch/arm/mach-shmobile/setup-r7s72100.c | 43 ++++++ 6 files changed, 288 insertions(+) create mode 100644 arch/arm/boot/dts/r7s72100.dtsi create mode 100644 arch/arm/mach-shmobile/clock-r7s72100.c create mode 100644 arch/arm/mach-shmobile/include/mach/r7s72100.h create mode 100644 arch/arm/mach-shmobile/setup-r7s72100.c
arch/arm/boot/dts/r7s72100.dtsi new file +36 -0
@@ -0,0 +1,36 @@ +/* + * Device Tree Source for the r7s72100 SoC + * + * 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. + */ + +/ { + compatible = "renesas,r7s72100"; + interrupt-parent = <&gic>; + #address-cells = <1>; + #size-cells = <1>; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu at 0 { + device_type = "cpu"; + compatible = "arm,cortex-a9"; + reg = <0>; + }; + }; + + gic: interrupt-controller at e8201000 { + compatible = "arm,cortex-a9-gic"; + #interrupt-cells = <3>; + #address-cells = <0>; + interrupt-controller; + reg = <0xe8201000 0x1000>, + <0xe8202000 0x1000>; + }; +};
arch/arm/mach-shmobile/Kconfig +6 -0
@@ -113,6 +113,12 @@ config ARCH_EMEV2 select ARM_GIC select CPU_V7 +config ARCH_R7S72100 + bool "RZ/A1H (R7S72100)" + select ARM_GIC + select CPU_V7 + select SH_CLK_CPG + comment "SH-Mobile Board Type" config MACH_APE6EVM
arch/arm/mach-shmobile/Makefile +2 -0
@@ -18,6 +18,7 @@ obj-$(CONFIG_ARCH_R8A7790) += setup-r8a7790.o obj-$(CONFIG_ARCH_R8A7790) += setup-r8a7790.o setup-rcar-gen2.o obj-$(CONFIG_ARCH_R8A7791) += setup-r8a7791.o setup-rcar-gen2.o obj-$(CONFIG_ARCH_EMEV2) += setup-emev2.o +obj-$(CONFIG_ARCH_R7S72100) += setup-r7s72100.o # Clock objects ifndef CONFIG_COMMON_CLK
@@ -31,6 +32,7 @@ obj-$(CONFIG_ARCH_R8A7779) += clock-r8a7779.o obj-$(CONFIG_ARCH_R8A7790) += clock-r8a7790.o obj-$(CONFIG_ARCH_R8A7791) += clock-r8a7791.o obj-$(CONFIG_ARCH_EMEV2) += clock-emev2.o +obj-$(CONFIG_ARCH_R7S72100) += clock-r7s72100.o endif # SMP objects
arch/arm/mach-shmobile/clock-r7s72100.c new file +194 -0
194 lines not on this page · raw message
arch/arm/mach-shmobile/include/mach/r7s72100.h new file +7 -0
@@ -0,0 +1,7 @@ +#ifndef __ASM_R7S72100_H__ +#define __ASM_R7S72100_H__ + +void r7s72100_clock_init (void ); +void r7s72100_init_early (void ); + +#endif /* __ASM_R7S72100_H__ */
arch/arm/mach-shmobile/setup-r7s72100.c new file +43 -0
43 lines not on this page · raw message
Signature · 1 line
1.8.4
PATCH 2/3 ARM: shmobile: r7s72100 SCIF support
In reply to Magnus DammQuoted 9 lines · Magnus Damm
From: Magnus Damm <[email protected]>
Add SCIF serial port support to the r7s72100 SoC by adding platform devices for SCIF0 -> SCIF7 together with clock bindings. DT device description is excluded at this point since such bindings are still under development.
Signed-off-by Magnus Damm <[email protected]>
Thanks, I have queued this up in the soc3 branch.
It should make it into v3.13 but if not I'll rename the branch soc after rebasing it on v3.13-rcX which will then be targeted at v3.14.
PATCH 3/3 ARM: shmobile: Genmai support
In reply to Magnus DammQuoted 10 lines · Magnus Damm
From: Magnus Damm <[email protected]>
Genmai base board support making use of 128 MiB of memory, the r7s7211 SoC with the SCIF2 serial port and CA9 core.
Signed-off-by Magnus Damm <[email protected]>---
arch/arm/boot/dts/Makefile | 1 arch/arm/boot/dts/r7s72100-genmai.dts | 31 +++++++++++++++++++++++
Please consider adding the dts file in a separate patch next time.
Quoted 5 lines
arch/arm/mach-shmobile/Kconfig | 5 +++ arch/arm/mach-shmobile/Makefile | 1 arch/arm/mach-shmobile/Makefile.boot | 1 arch/arm/mach-shmobile/board-genmai.c | 43 +++++++++++++++++++++++++++++++++ 6 files changed, 82 insertions(+)
Thanks, I have queued this up in the boards3 branch.
It should make it into v3.13 but if not I'll rename the branch soc after rebasing it on v3.13-rcX which will then be targeted at v3.14.
The boards3 branch includes boards code previously queued up for v3.13 and a merge with soc changes previously queued up for v3.13. The reason for the merge is to provide various build and run-time dependencies including the r7s72100 SoC code which this board code uses.