Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcb86e0a authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branches 'sh/wdt' and 'sh/rsk-updates' into sh-latest 



Conflicts:
	arch/sh/Kconfig

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parents c5e50fa9 d42c9744 ef0fa533

arch/sh/Kconfig

+9 −1
Original line number Diff line number Diff line
@@ -295,6 +295,13 @@ config CPU_SUBTYPE_SH7264 
	select SYS_SUPPORTS_CMT

	select SYS_SUPPORTS_MTU2



config CPU_SUBTYPE_SH7269

	bool "Support SH7269 processor"

	select CPU_SH2A

	select CPU_HAS_FPU

	select SYS_SUPPORTS_CMT

	select SYS_SUPPORTS_MTU2



config CPU_SUBTYPE_MXG

	bool "Support MX-G processor"

	select CPU_SH2A
@@ -602,7 +609,8 @@ config SH_CLK_CPG_LEGACY 
	depends on SH_CLK_CPG

	def_bool y if !CPU_SUBTYPE_SH7785 && !ARCH_SHMOBILE && \

		      !CPU_SHX3 && !CPU_SUBTYPE_SH7757 && \

		      !CPU_SUBTYPE_SH7734 && !CPU_SUBTYPE_SH7264

		      !CPU_SUBTYPE_SH7734 && !CPU_SUBTYPE_SH7264 && \

		      !CPU_SUBTYPE_SH7269



source "kernel/time/Kconfig"

arch/sh/boards/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -133,7 +133,8 @@ config SH_RTS7751R2D 


config SH_RSK

	bool "Renesas Starter Kit"

	depends on CPU_SUBTYPE_SH7201 || CPU_SUBTYPE_SH7203 || CPU_SUBTYPE_SH7264

	depends on CPU_SUBTYPE_SH7201 || CPU_SUBTYPE_SH7203 || \

	  CPU_SUBTYPE_SH7264 || CPU_SUBTYPE_SH7269

	help

	 Select this option if configuring for any of the RSK+ MCU

	 evaluation platforms.

arch/sh/boards/mach-rsk/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,11 @@ config SH_RSK7264 
	select ARCH_REQUIRE_GPIOLIB

	depends on CPU_SUBTYPE_SH7264



config SH_RSK7269

	bool "RSK2+SH7269"

	select ARCH_REQUIRE_GPIOLIB

	depends on CPU_SUBTYPE_SH7269



endchoice



endif

arch/sh/boards/mach-rsk/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-y				:= setup.o

obj-$(CONFIG_SH_RSK7203)	+= devices-rsk7203.o

obj-$(CONFIG_SH_RSK7264)	+= devices-rsk7264.o

obj-$(CONFIG_SH_RSK7269)	+= devices-rsk7269.o

arch/sh/boards/mach-rsk/devices-rsk7269.c

0 → 100644
+60 −0
Original line number Diff line number Diff line 
/*

 * RSK+SH7269 Support

 *

 * Copyright (C) 2012  Renesas Electronics Europe Ltd

 * Copyright (C) 2012  Phil Edworthy

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 */

#include <linux/init.h>

#include <linux/types.h>

#include <linux/platform_device.h>

#include <linux/interrupt.h>

#include <linux/input.h>

#include <linux/smsc911x.h>

#include <linux/gpio.h>

#include <asm/machvec.h>

#include <asm/io.h>



static struct smsc911x_platform_config smsc911x_config = {

	.phy_interface	= PHY_INTERFACE_MODE_MII,

	.irq_polarity	= SMSC911X_IRQ_POLARITY_ACTIVE_LOW,

	.irq_type	= SMSC911X_IRQ_TYPE_PUSH_PULL,

	.flags		= SMSC911X_USE_16BIT | SMSC911X_SWAP_FIFO,

};



static struct resource smsc911x_resources[] = {

	[0] = {

		.start		= 0x24000000,

		.end		= 0x240000ff,

		.flags		= IORESOURCE_MEM,

	},

	[1] = {

		.start		= 85,

		.end		= 85,

		.flags		= IORESOURCE_IRQ,

	},

};



static struct platform_device smsc911x_device = {

	.name		= "smsc911x",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(smsc911x_resources),

	.resource	= smsc911x_resources,

	.dev		= {

		.platform_data = &smsc911x_config,

	},

};



static struct platform_device *rsk7269_devices[] __initdata = {

	&smsc911x_device,

};



static int __init rsk7269_devices_setup(void)

{

	return platform_add_devices(rsk7269_devices,

				    ARRAY_SIZE(rsk7269_devices));

}

device_initcall(rsk7269_devices_setup);