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

Commit be944f1e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'board-new' of... 

Merge branch 'board-new' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/boards

"Rafael J. Wysocki" <rjw@sisk.pl> writes:

   Renesas ARM-based platforms: new boards support for v3.5

    * Support for the KZM-A9-GT board from Kuninori Morimoto and Magnus Damm.
    * Support for the armadillo800eva board from Kuninori Morimoto and Magnus Damm.

   This is based on the Renesas core SoC code updates I've sent a separate pull
   request for.

* 'board-new' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas

: (29 commits)
  ARM: mach-shmobile: Use DT_MACHINE for armadillo 800 eva
  ARM: mach-shmobile: Use DT_MACHINE for KZM9G
  ARM: mach-shmobile: kzm9g: enable SMP boot
  ARM: mach-shmobile: kzm9g: defconfig update
  ARM: mach-shmobile: kzm9g: add PCF8757 gpio-key
  ARM: mach-shmobile: kzm9g: add SDHI support
  ARM: mach-shmobile: kzm9g: add MMCIF support
  ARM: mach-shmobile: kzm9g: correct screen direction
  ARM: mach-shmobile: sh73a0.h: add GPIO_NR
  ARM: mach-shmobile: pfc-sh73a0: fixup MSEL2CR MSEL18 for I2C-3
  ARM: mach-shmobile: kzm9g: add ST1232 Touchscreen support
  ARM: mach-shmobile: kzm9g: add LCDC support
  ARM: mach-shmobile: kzm9g: add external USB Host support
  ARM: mach-shmobile: kzm9g: add SMSC 9221 support
  ARM: mach-shmobile: kzm9g: add defconfig
  ARM: mach-shmobile: add KZM-A9-GT board support
  ARM: mach-shmobile: armadillo800eva: defconfig update
  ARM: mach-shmobile: clock-r8a7740: add sh-eth clock
  ARM: mach-shmobile: r8a7740: reserve DMA memory for the frame buffer
  ARM: mach-shmobile: armadillo800eva: add MMCIF support
  ...

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 98a5f124 4fc5e65c

arch/arm/boot/dts/r8a7740-armadillo800eva.dts

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

 * Device Tree Source for the armadillo 800 eva 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/ "skeleton.dtsi"



/ {

	model = "armadillo 800 eva";

	compatible = "renesas,armadillo800eva";



	memory {

		device_type = "memory";

		reg = <0x40000000 0x20000000>;

	};

};

arch/arm/boot/dts/sh73a0-kzm9g.dts

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

 * Device Tree Source for the KZM-A9-GT 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/ "skeleton.dtsi"



/ {

	model = "KZM-A9-GT";

	compatible = "renesas,kzm9g";



	memory {

		device_type = "memory";

		reg = <0x41000000 0x1e800000>;

	};

};

arch/arm/configs/armadillo800eva_defconfig

0 → 100644
+142 −0
Original line number Original line Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=16

# 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_SYSFS_DEPRECATED=y

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=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_ARCH_R8A7740=y

CONFIG_MACH_ARMADILLO800EVA=y

# CONFIG_SH_TIMER_TMU is not set

# CONFIG_ARM_THUMB is not set

CONFIG_CPU_BPREDICT_DISABLE=y

# CONFIG_CACHE_L2X0 is not set

CONFIG_ARM_ERRATA_430973=y

CONFIG_ARM_ERRATA_458693=y

CONFIG_ARM_ERRATA_460075=y

CONFIG_ARM_ERRATA_720789=y

CONFIG_ARM_ERRATA_743622=y

CONFIG_ARM_ERRATA_751472=y

CONFIG_ARM_ERRATA_754322=y

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

CONFIG_FORCE_MAX_ZONEORDER=13

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096"

CONFIG_CMDLINE_FORCE=y

CONFIG_KEXEC=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_SUSPEND is not set

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_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_CHELSIO is not set

# CONFIG_NET_VENDOR_CIRRUS 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_SH_ETH=y

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SMSC is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_WLAN is not set

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

CONFIG_INPUT_EVDEV=y

# CONFIG_KEYBOARD_ATKBD is not set

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ST1232=y

# CONFIG_SERIO is not set

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_SH_SCI=y

CONFIG_SERIAL_SH_SCI_NR_UARTS=8

CONFIG_SERIAL_SH_SCI_CONSOLE=y

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

CONFIG_I2C_SH_MOBILE=y

# CONFIG_HWMON is not set

CONFIG_FB=y

CONFIG_FB_MODE_HELPERS=y

CONFIG_FB_SH_MOBILE_LCDC=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

CONFIG_LOGO=y

# CONFIG_LOGO_LINUX_MONO is not set

# CONFIG_LOGO_LINUX_VGA16 is not set

CONFIG_SOUND=y

CONFIG_SND=y

# CONFIG_SND_SUPPORT_OLD_API is not set

# CONFIG_SND_VERBOSE_PROCFS is not set

# CONFIG_SND_DRIVERS is not set

# CONFIG_SND_ARM is not set

CONFIG_SND_SOC=y

CONFIG_SND_SOC_SH4_FSI=y

# CONFIG_HID_SUPPORT is not set

CONFIG_USB=y

# CONFIG_USB_DEVICE_CLASS is not set

CONFIG_USB_RENESAS_USBHS=y

CONFIG_USB_GADGET=y

CONFIG_USB_RENESAS_USBHS_UDC=y

CONFIG_USB_ETH=m

CONFIG_MMC=y

CONFIG_MMC_SDHI=y

CONFIG_MMC_SH_MMCIF=y

CONFIG_UIO=y

CONFIG_UIO_PDRV_GENIRQ=y

# CONFIG_DNOTIFY is not set

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

# CONFIG_MISC_FILESYSTEMS is not set

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_NFS_V3_ACL=y

CONFIG_NFS_V4=y

CONFIG_NFS_V4_1=y

CONFIG_ROOT_NFS=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

# CONFIG_ENABLE_WARN_DEPRECATED is not set

# CONFIG_ENABLE_MUST_CHECK is not set

# CONFIG_ARM_UNWIND is not set

CONFIG_CRYPTO=y

CONFIG_CRYPTO_CBC=y

CONFIG_CRYPTO_MD5=y

CONFIG_CRYPTO_DES=y

CONFIG_CRYPTO_ANSI_CPRNG=y

CONFIG_XZ_DEC=y

arch/arm/configs/kzm9g_defconfig

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

CONFIG_EXPERIMENTAL=y

# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_SYSVIPC=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=16

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_NET_NS is not set

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_SYSCTL_SYSCALL=y

CONFIG_EMBEDDED=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_FORCE_LOAD=y

CONFIG_MODULE_UNLOAD=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_KZM9G=y

CONFIG_MEMORY_START=0x41000000

CONFIG_MEMORY_SIZE=0x1f000000

CONFIG_ARM_ERRATA_743622=y

CONFIG_ARM_ERRATA_754322=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_SMP=y

CONFIG_SCHED_MC=y

CONFIG_PREEMPT=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=tty0 console=ttySC4,115200 root=/dev/nfs ip=dhcp ignore_loglevel earlyprintk=sh-sci.4,115200"

CONFIG_KEXEC=y

CONFIG_VFP=y

CONFIG_NEON=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_IRDA=y

CONFIG_SH_IRDA=y

# CONFIG_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_NETDEVICES=y

CONFIG_SMSC911X=y

# CONFIG_WLAN is not set

CONFIG_INPUT_SPARSEKMAP=y

# CONFIG_INPUT_MOUSEDEV is not set

CONFIG_INPUT_EVDEV=y

# CONFIG_KEYBOARD_ATKBD is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ST1232=y

# 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_CHARDEV=y

CONFIG_I2C_SH_MOBILE=y

CONFIG_GPIO_PCF857X=y

# CONFIG_HWMON is not set

CONFIG_FB=y

CONFIG_FB_SH_MOBILE_LCDC=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

CONFIG_FB_SH_MOBILE_MERAM=y

CONFIG_SOUND=y

CONFIG_SND=y

# CONFIG_SND_SUPPORT_OLD_API is not set

# CONFIG_SND_VERBOSE_PROCFS is not set

# CONFIG_SND_DRIVERS is not set

# CONFIG_SND_ARM is not set

# CONFIG_SND_USB is not set

CONFIG_SND_SOC=y

CONFIG_SND_SOC_SH4_FSI=y

# CONFIG_HID_SUPPORT is not set

CONFIG_USB=y

CONFIG_USB_DEVICEFS=y

CONFIG_USB_R8A66597_HCD=y

CONFIG_USB_STORAGE=y

CONFIG_MMC=y

# CONFIG_MMC_BLOCK_BOUNCE is not set

CONFIG_MMC_SDHI=y

CONFIG_MMC_SH_MMCIF=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_RTC_CLASS=y

CONFIG_DMADEVICES=y

CONFIG_SH_DMAE=y

CONFIG_ASYNC_TX_DMA=y

CONFIG_STAGING=y

# CONFIG_DNOTIFY is not set

# CONFIG_INOTIFY_USER is not set

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

# CONFIG_MISC_FILESYSTEMS is not set

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_NFS_V3_ACL=y

CONFIG_NFS_V4=y

CONFIG_NFS_V4_1=y

CONFIG_ROOT_NFS=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

# CONFIG_ENABLE_WARN_DEPRECATED is not set

# CONFIG_ENABLE_MUST_CHECK is not set

# CONFIG_SCHED_DEBUG is not set

# CONFIG_DEBUG_PREEMPT is not set

# CONFIG_DEBUG_BUGVERBOSE is not set

# CONFIG_FTRACE is not set

# CONFIG_ARM_UNWIND is not set

CONFIG_CRYPTO=y

CONFIG_CRYPTO_CBC=y

CONFIG_CRYPTO_MD5=y

CONFIG_CRYPTO_DES=y

CONFIG_CRC16=y

arch/arm/mach-shmobile/Kconfig

+16 −2
Original line number Original line Diff line number Diff line
@@ -93,11 +93,23 @@ config MACH_BONITO 
	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB

	depends on ARCH_R8A7740

	depends on ARCH_R8A7740





config MACH_ARMADILLO800EVA

	bool "Armadillo-800 EVA board"

	depends on ARCH_R8A7740

	select ARCH_REQUIRE_GPIOLIB

	select USE_OF



config MACH_MARZEN

config MACH_MARZEN

	bool "MARZEN board"

	bool "MARZEN board"

	depends on ARCH_R8A7779

	depends on ARCH_R8A7779

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB





config MACH_KZM9G

	bool "KZM-A9-GT board"

	depends on ARCH_SH73A0

	select ARCH_REQUIRE_GPIOLIB

	select USE_OF



comment "SH-Mobile System Configuration"

comment "SH-Mobile System Configuration"





config CPU_HAS_INTEVT

config CPU_HAS_INTEVT
@@ -110,7 +122,8 @@ config MEMORY_START 
	hex "Physical memory start address"

	hex "Physical memory start address"

	default "0x50000000" if MACH_G3EVM

	default "0x50000000" if MACH_G3EVM

	default "0x40000000" if MACH_G4EVM || MACH_AP4EVB || MACH_AG5EVM || \

	default "0x40000000" if MACH_G4EVM || MACH_AP4EVB || MACH_AG5EVM || \

				MACH_MACKEREL || MACH_BONITO

				MACH_MACKEREL || MACH_BONITO || \

				MACH_ARMADILLO800EVA

	default "0x41000000" if MACH_KOTA2

	default "0x41000000" if MACH_KOTA2

	default "0x00000000"

	default "0x00000000"

	---help---

	---help---
@@ -122,7 +135,8 @@ config MEMORY_SIZE 
	hex "Physical memory size"

	hex "Physical memory size"

	default "0x08000000" if MACH_G3EVM

	default "0x08000000" if MACH_G3EVM

	default "0x08000000" if MACH_G4EVM

	default "0x08000000" if MACH_G4EVM

	default "0x20000000" if MACH_AG5EVM || MACH_BONITO

	default "0x20000000" if MACH_AG5EVM || MACH_BONITO || \

				MACH_ARMADILLO800EVA

	default "0x1e000000" if MACH_KOTA2

	default "0x1e000000" if MACH_KOTA2

	default "0x10000000" if MACH_AP4EVB || MACH_MACKEREL

	default "0x10000000" if MACH_AP4EVB || MACH_MACKEREL

	default "0x04000000"

	default "0x04000000"