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

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

Merge branches 'rmobile/kota2' and 'rmobile/marzen' into rmobile-latest 



Conflicts:
	arch/arm/mach-shmobile/Kconfig
	arch/arm/mach-shmobile/Makefile

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parents cc9e4fed 43aa77f4 d06830e7

arch/arm/configs/kota2_defconfig

0 → 100644
+122 −0
Original line number Diff line number Diff line 
# CONFIG_ARM_PATCH_PHYS_VIRT is not set

CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=16

CONFIG_CGROUPS=y

CONFIG_CPUSETS=y

CONFIG_NAMESPACES=y

# CONFIG_UTS_NS is not set

# CONFIG_IPC_NS is not set

# CONFIG_USER_NS is not set

# CONFIG_PID_NS is not set

CONFIG_SYSCTL_SYSCALL=y

CONFIG_EMBEDDED=y

CONFIG_SLAB=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_SHMOBILE=y

CONFIG_KEYBOARD_GPIO_POLLED=y

CONFIG_ARCH_SH73A0=y

CONFIG_MACH_KOTA2=y

CONFIG_MEMORY_SIZE=0x1e0000000

# CONFIG_SH_TIMER_TMU is not set

# CONFIG_SWP_EMULATE is not set

CONFIG_CPU_BPREDICT_DISABLE=y

CONFIG_ARM_ERRATA_460075=y

CONFIG_ARM_ERRATA_742230=y

CONFIG_ARM_ERRATA_742231=y

CONFIG_PL310_ERRATA_588369=y

CONFIG_ARM_ERRATA_720789=y

CONFIG_PL310_ERRATA_727915=y

CONFIG_ARM_ERRATA_743622=y

CONFIG_ARM_ERRATA_751472=y

CONFIG_PL310_ERRATA_753970=y

CONFIG_ARM_ERRATA_754322=y

CONFIG_PL310_ERRATA_769419=y

CONFIG_NO_HZ=y

CONFIG_SMP=y

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

CONFIG_HIGHMEM=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel"

CONFIG_CMDLINE_FORCE=y

CONFIG_KEXEC=y

CONFIG_CPU_IDLE=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_PM_RUNTIME=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

CONFIG_CFG80211=y

CONFIG_WIRELESS_EXT_SYSFS=y

CONFIG_MAC80211=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

# CONFIG_BLK_DEV is not set

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_CHELSIO is not set

# CONFIG_NET_VENDOR_FARADAY is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_SEEQ is not set

CONFIG_SMSC911X=y

# CONFIG_NET_VENDOR_STMICRO is not set

CONFIG_B43=y

CONFIG_B43_PHY_N=y

CONFIG_B43_DEBUG=y

CONFIG_INPUT_SPARSEKMAP=y

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

CONFIG_INPUT_EVDEV=y

# CONFIG_KEYBOARD_ATKBD is not set

CONFIG_KEYBOARD_GPIO=y

CONFIG_KEYBOARD_SH_KEYSC=y

# CONFIG_INPUT_MOUSE is not set

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_SH_SCI=y

CONFIG_SERIAL_SH_SCI_NR_UARTS=9

CONFIG_SERIAL_SH_SCI_CONSOLE=y

# CONFIG_HW_RANDOM is not set

CONFIG_I2C_SH_MOBILE=y

# CONFIG_HWMON is not set

CONFIG_BCMA=y

CONFIG_BCMA_DEBUG=y

CONFIG_FB=y

CONFIG_FB_SH_MOBILE_LCDC=y

CONFIG_LCD_PLATFORM=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_MMC=y

CONFIG_MMC_SDHI=y

CONFIG_MMC_SH_MMCIF=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_RENESAS_TPU=y

CONFIG_LEDS_TRIGGERS=y

# CONFIG_DNOTIFY is not set

# CONFIG_INOTIFY_USER is not set

CONFIG_TMPFS=y

# CONFIG_MISC_FILESYSTEMS is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_INFO_REDUCED=y

# CONFIG_FTRACE is not set

CONFIG_DEBUG_USER=y

arch/arm/configs/marzen_defconfig

0 → 100644
+87 −0
Original line number Diff line number Diff line 
# CONFIG_ARM_PATCH_PHYS_VIRT is not set

CONFIG_EXPERIMENTAL=y

CONFIG_KERNEL_LZMA=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=16

CONFIG_SYSCTL_SYSCALL=y

CONFIG_EMBEDDED=y

CONFIG_SLAB=y

# CONFIG_BLOCK is not set

CONFIG_ARCH_SHMOBILE=y

CONFIG_ARCH_R8A7779=y

CONFIG_MACH_MARZEN=y

CONFIG_MEMORY_START=0x60000000

CONFIG_MEMORY_SIZE=0x10000000

CONFIG_SHMOBILE_TIMER_HZ=1024

# CONFIG_SH_TIMER_CMT is not set

# CONFIG_SWP_EMULATE is not set

CONFIG_ARM_ERRATA_430973=y

CONFIG_ARM_ERRATA_458693=y

CONFIG_ARM_ERRATA_460075=y

CONFIG_ARM_ERRATA_743622=y

CONFIG_ARM_ERRATA_754322=y

CONFIG_NO_HZ=y

CONFIG_SMP=y

# CONFIG_ARM_CPU_TOPOLOGY is not set

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

CONFIG_HIGHMEM=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel"

CONFIG_CMDLINE_FORCE=y

CONFIG_KEXEC=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_PM_RUNTIME=y

CONFIG_NET=y

CONFIG_INET=y

# CONFIG_IPV6 is not set

# CONFIG_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_STANDALONE is not set

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_FW_LOADER is not set

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_FARADAY is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_SEEQ is not set

CONFIG_SMC911X=y

CONFIG_SMSC911X=y

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_WLAN is not set

# CONFIG_INPUT_MOUSEDEV is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

# CONFIG_LEGACY_PTYS is not set

# CONFIG_DEVKMEM is not set

CONFIG_SERIAL_SH_SCI=y

CONFIG_SERIAL_SH_SCI_NR_UARTS=6

CONFIG_SERIAL_SH_SCI_CONSOLE=y

# CONFIG_HW_RANDOM is not set

CONFIG_GPIO_SYSFS=y

# CONFIG_HWMON is not set

CONFIG_SSB=y

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_UIO=y

CONFIG_UIO_PDRV_GENIRQ=y

# CONFIG_IOMMU_SUPPORT is not set

# CONFIG_FILE_LOCKING is not set

# CONFIG_DNOTIFY is not set

# CONFIG_INOTIFY_USER is not set

CONFIG_TMPFS=y

# CONFIG_MISC_FILESYSTEMS is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_INFO_REDUCED=y

# CONFIG_FTRACE is not set

CONFIG_DEBUG_USER=y

CONFIG_AVERAGE=y

arch/arm/mach-shmobile/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -34,6 +34,13 @@ 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

	select ARCH_WANT_OPTIONAL_GPIOLIB



comment "SH-Mobile Board Type"



config MACH_G3EVM
@@ -86,6 +93,11 @@ config MACH_BONITO 
	select ARCH_REQUIRE_GPIOLIB

	depends on ARCH_R8A7740



config MACH_MARZEN

	bool "MARZEN board"

	depends on ARCH_R8A7779

	select ARCH_REQUIRE_GPIOLIB



comment "SH-Mobile System Configuration"



menu "Memory configuration"

arch/arm/mach-shmobile/Makefile

+4 −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
@@ -25,6 +26,7 @@ pfc-$(CONFIG_ARCH_SH7377) += pfc-sh7377.o 
pfc-$(CONFIG_ARCH_SH7372)	+= pfc-sh7372.o

pfc-$(CONFIG_ARCH_SH73A0)	+= pfc-sh73a0.o

pfc-$(CONFIG_ARCH_R8A7740)	+= pfc-r8a7740.o

pfc-$(CONFIG_ARCH_R8A7779)	+= pfc-r8a7779.o



# IRQ objects

obj-$(CONFIG_ARCH_SH7367)	+= entry-intc.o
@@ -36,6 +38,7 @@ obj-$(CONFIG_ARCH_R8A7740) += entry-intc.o 
obj-$(CONFIG_SUSPEND)		+= suspend.o

obj-$(CONFIG_CPU_IDLE)		+= cpuidle.o

obj-$(CONFIG_ARCH_SH7372)	+= pm-sh7372.o sleep-sh7372.o

obj-$(CONFIG_ARCH_R8A7779)	+= pm-r8a7779.o



# Board objects

obj-$(CONFIG_MACH_G3EVM)	+= board-g3evm.o
@@ -45,6 +48,7 @@ obj-$(CONFIG_MACH_AG5EVM) += board-ag5evm.o 
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



# Framework support

obj-$(CONFIG_SMP)		+= $(smp-y)

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

0 → 100644
+157 −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/gpio.h>

#include <linux/dma-mapping.h>

#include <linux/smsc911x.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>



/* SMSC LAN89218 */

static struct resource smsc911x_resources[] = {

	[0] = {

		.start		= 0x18000000, /* ExCS0 */

		.end		= 0x180000ff, /* A1->A7 */

		.flags		= IORESOURCE_MEM,

	},

	[1] = {

		.start		= gic_spi(28), /* IRQ 1 */

		.flags		= IORESOURCE_IRQ,

	},

};



static struct smsc911x_platform_config smsc911x_platdata = {

	.flags		= SMSC911X_USE_32BIT, /* 32-bit SW on 16-bit HW bus */

	.phy_interface	= PHY_INTERFACE_MODE_MII,

	.irq_polarity	= SMSC911X_IRQ_POLARITY_ACTIVE_LOW,

	.irq_type	= SMSC911X_IRQ_TYPE_PUSH_PULL,

};



static struct platform_device eth_device = {

	.name		= "smsc911x",

	.id		= 0,

	.dev  = {

		.platform_data = &smsc911x_platdata,

	},

	.resource	= smsc911x_resources,

	.num_resources	= ARRAY_SIZE(smsc911x_resources),

};



static struct platform_device *marzen_devices[] __initdata = {

	&eth_device,

};



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_pinmux_init();



	/* SCIF2 (CN18: DEBUG0) */

	gpio_request(GPIO_FN_TX2_C, NULL);

	gpio_request(GPIO_FN_RX2_C, NULL);



	/* SCIF4 (CN19: DEBUG1) */

	gpio_request(GPIO_FN_TX4, NULL);

	gpio_request(GPIO_FN_RX4, NULL);



	/* LAN89218 */

	gpio_request(GPIO_FN_EX_CS0, NULL); /* nCS */

	gpio_request(GPIO_FN_IRQ1_B, NULL); /* IRQ + PME */



	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	= gic_handle_irq,

	.init_machine	= marzen_init,

	.timer		= &marzen_timer,

MACHINE_END