Merge branch 'emev2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/soc (0804dcb2) · Commits · 戴 / test

arch/arm/boot/dts/emev2-kzm9d.dts

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		/*
		* Device Tree Source for the KZM9D board
		*
		* 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.
		*/
		/dts-v1/;

		/include/ "emev2.dtsi"

		/ {
		model = "EMEV2 KZM9D Board";
		compatible = "renesas,kzm9d", "renesas,emev2";

		memory {
		device_type = "memory";
		reg = <0x40000000 0x8000000>;
		};

		chosen {
		bootargs = "console=ttyS1,115200n81";
		};
		};

arch/arm/boot/dts/emev2.dtsi

0 → 100644

+63 −0

Original line number	Diff line number	Diff line
		/*
		* Device Tree Source for the EMEV2 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,emev2";
		interrupt-parent = <&gic>;

		cpus {
		cpu@0 {
		compatible = "arm,cortex-a9";
		};
		cpu@1 {
		compatible = "arm,cortex-a9";
		};
		};

		gic: interrupt-controller@e0020000 {
		compatible = "arm,cortex-a9-gic";
		interrupt-controller;
		#interrupt-cells = <3>;
		reg = <0xe0028000 0x1000>,
		<0xe0020000 0x0100>;
		};

		sti@e0180000 {
		compatible = "renesas,em-sti";
		reg = <0xe0180000 0x54>;
		interrupts = <0 125 0>;
		};

		uart@e1020000 {
		compatible = "renesas,em-uart";
		reg = <0xe1020000 0x38>;
		interrupts = <0 8 0>;
		};

		uart@e1030000 {
		compatible = "renesas,em-uart";
		reg = <0xe1030000 0x38>;
		interrupts = <0 9 0>;
		};

		uart@e1040000 {
		compatible = "renesas,em-uart";
		reg = <0xe1040000 0x38>;
		interrupts = <0 10 0>;
		};

		uart@e1050000 {
		compatible = "renesas,em-uart";
		reg = <0xe1050000 0x38>;
		interrupts = <0 11 0>;
		};
		};

arch/arm/mach-shmobile/Kconfig

+11 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,12 @@ config ARCH_R8A7779
		select ARM_GIC
		select ARCH_WANT_OPTIONAL_GPIOLIB

		config ARCH_EMEV2
		bool "Emma Mobile EV2"
		select CPU_V7
		select ARM_GIC
		select ARCH_WANT_OPTIONAL_GPIOLIB

		comment "SH-Mobile Board Type"

		config MACH_G3EVM
		@@ -98,6 +104,11 @@ config MACH_MARZEN
		depends on ARCH_R8A7779
		select ARCH_REQUIRE_GPIOLIB

		config MACH_KZM9D
		bool "KZM9D board"
		depends on ARCH_EMEV2
		select USE_OF

		comment "SH-Mobile System Configuration"

		config CPU_HAS_INTEVT

arch/arm/mach-shmobile/Makefile

+3 −0

Original line number	Diff line number	Diff line
		@@ -12,12 +12,14 @@ 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
		obj-$(CONFIG_ARCH_EMEV2) += setup-emev2.o clock-emev2.o

		# SMP objects
		smp-y := platsmp.o headsmp.o
		smp-$(CONFIG_HOTPLUG_CPU) += hotplug.o
		smp-$(CONFIG_ARCH_SH73A0) += smp-sh73a0.o
		smp-$(CONFIG_ARCH_R8A7779) += smp-r8a7779.o
		smp-$(CONFIG_ARCH_EMEV2) += smp-emev2.o

		# Pinmux setup
		pfc-y :=
		@@ -49,6 +51,7 @@ obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o
		obj-$(CONFIG_MACH_KOTA2) += board-kota2.o
		obj-$(CONFIG_MACH_BONITO) += board-bonito.o
		obj-$(CONFIG_MACH_MARZEN) += board-marzen.o
		obj-$(CONFIG_MACH_KZM9D) += board-kzm9d.o

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

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

0 → 100644

+85 −0

Original line number	Diff line number	Diff line
		/*
		* kzm9d board support
		*
		* Copyright (C) 2012 Renesas Solutions Corp.
		* Copyright (C) 2012 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/interrupt.h>
		#include <linux/platform_device.h>
		#include <linux/smsc911x.h>
		#include <mach/common.h>
		#include <mach/emev2.h>
		#include <asm/mach-types.h>
		#include <asm/mach/arch.h>
		#include <asm/hardware/gic.h>

		/* Ether */
		static struct resource smsc911x_resources[] = {
		[0] = {
		.start = 0x20000000,
		.end = 0x2000ffff,
		.flags = IORESOURCE_MEM,
		},
		[1] = {
		.start = EMEV2_GPIO_IRQ(1),
		.flags = IORESOURCE_IRQ \| IRQF_TRIGGER_HIGH,
		},
		};

		static struct smsc911x_platform_config smsc911x_platdata = {
		.flags = SMSC911X_USE_32BIT,
		.irq_type = SMSC911X_IRQ_TYPE_PUSH_PULL,
		.irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_HIGH,
		};

		static struct platform_device smsc91x_device = {
		.name = "smsc911x",
		.id = 0,
		.dev = {
		.platform_data = &smsc911x_platdata,
		},
		.num_resources = ARRAY_SIZE(smsc911x_resources),
		.resource = smsc911x_resources,
		};

		static struct platform_device *kzm9d_devices[] __initdata = {
		&smsc91x_device,
		};

		void __init kzm9d_add_standard_devices(void)
		{
		emev2_add_standard_devices();

		platform_add_devices(kzm9d_devices, ARRAY_SIZE(kzm9d_devices));
		}

		static const char *kzm9d_boards_compat_dt[] __initdata = {
		"renesas,kzm9d",
		NULL,
		};

		DT_MACHINE_START(KZM9D_DT, "kzm9d")
		.map_io = emev2_map_io,
		.init_early = emev2_add_early_devices,
		.nr_irqs = NR_IRQS_LEGACY,
		.init_irq = emev2_init_irq,
		.handle_irq = gic_handle_irq,
		.init_machine = kzm9d_add_standard_devices,
		.timer = &shmobile_timer,
		.dt_compat = kzm9d_boards_compat_dt,
		MACHINE_END

Admin message