ARM: mach-shmobile: r8a7779 and Marzen base support V2 (f411fade) · Commits · 戴 / test

arch/arm/mach-shmobile/Kconfig

+10 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,12 @@ config ARCH_R8A7740
		select SH_CLK_CPG
		select ARCH_WANT_OPTIONAL_GPIOLIB

		config ARCH_R8A7779
		bool "R-Car H1 (R8A77790)"
		select CPU_V7
		select SH_CLK_CPG
		select ARM_GIC

		comment "SH-Mobile Board Type"

		config MACH_G3EVM
		@@ -81,6 +87,10 @@ config MACH_KOTA2
		select ARCH_REQUIRE_GPIOLIB
		depends on ARCH_SH73A0

		config MACH_MARZEN
		bool "MARZEN board"
		depends on ARCH_R8A7779

		comment "SH-Mobile System Configuration"

		menu "Memory configuration"

arch/arm/mach-shmobile/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ obj-$(CONFIG_ARCH_SH7377) += setup-sh7377.o clock-sh7377.o intc-sh7377.o
		obj-$(CONFIG_ARCH_SH7372) += setup-sh7372.o clock-sh7372.o intc-sh7372.o
		obj-$(CONFIG_ARCH_SH73A0) += setup-sh73a0.o clock-sh73a0.o intc-sh73a0.o
		obj-$(CONFIG_ARCH_R8A7740) += setup-r8a7740.o clock-r8a7740.o intc-r8a7740.o
		obj-$(CONFIG_ARCH_R8A7779) += setup-r8a7779.o clock-r8a7779.o intc-r8a7779.o

		# SMP objects
		smp-y := platsmp.o headsmp.o
		@@ -44,6 +45,7 @@ obj-$(CONFIG_MACH_AP4EVB) += board-ap4evb.o
		obj-$(CONFIG_MACH_AG5EVM) += board-ag5evm.o
		obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o
		obj-$(CONFIG_MACH_KOTA2) += board-kota2.o
		obj-$(CONFIG_MACH_MARZEN) += board-marzen.o

		# Framework support
		obj-$(CONFIG_SMP) += $(smp-y)

arch/arm/mach-shmobile/board-marzen.c

0 → 100644

+110 −0

Original line number	Diff line number	Diff line
		/*
		* marzen board support
		*
		* Copyright (C) 2011 Renesas Solutions Corp.
		* Copyright (C) 2011 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/kernel.h>
		#include <linux/init.h>
		#include <linux/interrupt.h>
		#include <linux/irq.h>
		#include <linux/platform_device.h>
		#include <linux/delay.h>
		#include <linux/io.h>
		#include <linux/dma-mapping.h>
		#include <mach/hardware.h>
		#include <mach/r8a7779.h>
		#include <mach/common.h>
		#include <asm/mach-types.h>
		#include <asm/mach/arch.h>
		#include <asm/mach/map.h>
		#include <asm/mach/time.h>
		#include <asm/hardware/gic.h>
		#include <asm/traps.h>

		static struct platform_device *marzen_devices[] __initdata = {
		};

		static struct map_desc marzen_io_desc[] __initdata = {
		/* 2M entity map for 0xf0000000 (MPCORE) */
		{
		.virtual = 0xf0000000,
		.pfn = __phys_to_pfn(0xf0000000),
		.length = SZ_2M,
		.type = MT_DEVICE_NONSHARED
		},
		/* 16M entity map for 0xfexxxxxx (DMAC-S/HPBREG/INTC2/LRAM/DBSC) */
		{
		.virtual = 0xfe000000,
		.pfn = __phys_to_pfn(0xfe000000),
		.length = SZ_16M,
		.type = MT_DEVICE_NONSHARED
		},
		};

		static void __init marzen_map_io(void)
		{
		iotable_init(marzen_io_desc, ARRAY_SIZE(marzen_io_desc));
		}

		static void __init marzen_init_early(void)
		{
		r8a7779_add_early_devices();

		/* Early serial console setup is not included here due to
		* memory map collisions. The SCIF serial ports in r8a7779
		* are difficult to entity map 1:1 due to collision with the
		* virtual memory range used by the coherent DMA code on ARM.
		*
		* Anyone wanting to debug early can remove UPF_IOREMAP from
		* the sh-sci serial console platform data, adjust mapbase
		* to a static M:N virt:phys mapping that needs to be added to
		* the mappings passed with iotable_init() above.
		*
		* Then add a call to shmobile_setup_console() from this function.
		*
		* As a final step pass earlyprint=sh-sci.2,115200 on the kernel
		* command line.
		*/
		}

		static void __init marzen_init(void)
		{
		r8a7779_add_standard_devices();
		platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));
		}

		static void __init marzen_timer_init(void)
		{
		r8a7779_clock_init();
		shmobile_timer.init();
		return;
		}

		struct sys_timer marzen_timer = {
		.init = marzen_timer_init,
		};

		MACHINE_START(MARZEN, "marzen")
		.map_io = marzen_map_io,
		.init_early = marzen_init_early,
		.nr_irqs = NR_IRQS_LEGACY,
		.init_irq = r8a7779_init_irq,
		.handle_irq = shmobile_handle_irq_gic,
		.init_machine = marzen_init,
		.timer = &marzen_timer,
		MACHINE_END

arch/arm/mach-shmobile/clock-r8a7779.c

0 → 100644

+105 −0

Original line number	Diff line number	Diff line
		/*
		* r8a7779 clock framework support
		*
		* Copyright (C) 2011 Renesas Solutions Corp.
		* Copyright (C) 2011 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; either 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
		*/
		#include <linux/init.h>
		#include <linux/kernel.h>
		#include <linux/io.h>
		#include <linux/sh_clk.h>
		#include <linux/clkdev.h>
		#include <mach/common.h>

		#define FRQMR 0xffc80014
		#define MSTPCR0 0xffc80030
		#define MSTPCR1 0xffc80034
		#define MSTPCR3 0xffc8003c
		#define MSTPSR1 0xffc80044
		#define MSTPSR4 0xffc80048
		#define MSTPSR6 0xffc8004c
		#define MSTPCR4 0xffc80050
		#define MSTPCR5 0xffc80054
		#define MSTPCR6 0xffc80058
		#define MSTPCR7 0xffc80040

		/* ioremap() through clock mapping mandatory to avoid
		* collision with ARM coherent DMA virtual memory range.
		*/

		static struct clk_mapping cpg_mapping = {
		.phys = 0xffc80000,
		.len = 0x80,
		};

		static struct clk clkp = {
		.rate = 62500000, /* FIXME: shortcut */
		.flags = CLK_ENABLE_ON_INIT,
		.mapping = &cpg_mapping,
		};

		static struct clk *main_clks[] = {
		&clkp,
		};

		enum { MSTP026, MSTP025, MSTP024, MSTP023, MSTP022, MSTP021,
		MSTP016, MSTP015, MSTP014,
		MSTP_NR };

		#define MSTP(_parent, _reg, _bit, _flags) \
		SH_CLK_MSTP32(_parent, _reg, _bit, _flags)

		static struct clk mstp_clks[MSTP_NR] = {
		[MSTP026] = MSTP(&clkp, MSTPCR0, 26, 0), /* SCIF0 */
		[MSTP025] = MSTP(&clkp, MSTPCR0, 25, 0), /* SCIF1 */
		[MSTP024] = MSTP(&clkp, MSTPCR0, 24, 0), /* SCIF2 */
		[MSTP023] = MSTP(&clkp, MSTPCR0, 23, 0), /* SCIF3 */
		[MSTP022] = MSTP(&clkp, MSTPCR0, 22, 0), /* SCIF4 */
		[MSTP021] = MSTP(&clkp, MSTPCR0, 21, 0), /* SCIF5 */
		[MSTP016] = MSTP(&clkp, MSTPCR0, 16, 0), /* TMU0 */
		[MSTP015] = MSTP(&clkp, MSTPCR0, 15, 0), /* TMU1 */
		[MSTP014] = MSTP(&clkp, MSTPCR0, 14, 0), /* TMU2 */
		};

		static struct clk_lookup lookups[] = {
		/* MSTP32 clocks */
		CLKDEV_DEV_ID("sh_tmu.0", &mstp_clks[MSTP016]), /* TMU00 */
		CLKDEV_DEV_ID("sh_tmu.1", &mstp_clks[MSTP016]), /* TMU01 */
		CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP026]), /* SCIF0 */
		CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP025]), /* SCIF1 */
		CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP024]), /* SCIF2 */
		CLKDEV_DEV_ID("sh-sci.3", &mstp_clks[MSTP023]), /* SCIF3 */
		CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP022]), /* SCIF4 */
		CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP021]), /* SCIF6 */
		};

		void __init r8a7779_clock_init(void)
		{
		int k, ret = 0;

		for (k = 0; !ret && (k < ARRAY_SIZE(main_clks)); k++)
		ret = clk_register(main_clks[k]);

		if (!ret)
		ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);

		clkdev_add_table(lookups, ARRAY_SIZE(lookups));

		if (!ret)
		clk_init();
		else
		panic("failed to setup r8a7779 clocks\n");
		}

arch/arm/mach-shmobile/include/mach/common.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -60,4 +60,9 @@ extern void r8a7740_add_standard_devices(void);
		extern void r8a7740_clock_init(u8 md_ck);
		extern void r8a7740_pinmux_init(void);

		extern void r8a7779_init_irq(void);
		extern void r8a7779_add_early_devices(void);
		extern void r8a7779_add_standard_devices(void);
		extern void r8a7779_clock_init(void);

		#endif /* __ARCH_MACH_COMMON_H */

Admin message