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

Commit d074b104 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 

* 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (67 commits)
  ARM: mach-shmobile: update for SMP changes.
  ARM: mach-shmobile: update for GIC changes.
  ARM: mach-shmobile: Fix up clkdev fallout for SH73A0.
  dma: shdma: don't register the global die notifier multiple times
  ARM: mach-shmobile: Rely on run-time IRQ handlers
  ARM: mach-shmobile: Run-time IRQ handler for GIC
  ARM: mach-shmobile: Run-time IRQ handler for INTCA
  ARM: mach-shmobile: Enable CONFIG_MULTI_IRQ_HANDLER
  ARM: mach-shmobile: Use shared GIC entry macros
  ARM: mach-shmobile: mackerel: Add zboot support
  ARM: mach-shmobile: mackerel: Add HDMI sound support
  ARM: mach-shmobile: mackerel: add HDMI video support
  ARM: mach-shmobile: ap4evb: fixup clk_put timing of fsib_clk
  ARM: mach-shmobile: sh73a0: fix div4 table
  ARM: mach-shmobile: ap4/mackerel: modify wrong comment out of USB
  ARM: mach-shmobile: Mackerel VGA camera support
  mmc: sh_mmcif: make DMA support by the driver unconditional
  ARM: mach-shmobile: Add eMMC support through MMCIF on AG5EVM
  ARM: mach-shmobile: Use pullups for AG5EVM KEYSC pins
  ARM: mach-shmobile: sh73a0 GPIO pullup improvement
  ...
parents 31b6ca0a c413521e

.mailmap

+1 −0
Original line number Original line Diff line number Diff line
@@ -105,3 +105,4 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> 
Uwe Kleine-König <ukl@pengutronix.de>

Uwe Kleine-König <ukl@pengutronix.de>

Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

arch/arm/Kconfig

+9 −3
Original line number Original line Diff line number Diff line
@@ -632,9 +632,15 @@ config ARCH_MSM 
	  (clock and power control, etc).

	  (clock and power control, etc).





config ARCH_SHMOBILE

config ARCH_SHMOBILE

	bool "Renesas SH-Mobile"

	bool "Renesas SH-Mobile / R-Mobile"

	select HAVE_CLK

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	select NO_IOPORT

	select SPARSE_IRQ

	select MULTI_IRQ_HANDLER

	help

	help

	  Support for Renesas's SH-Mobile ARM platforms

	  Support for Renesas's SH-Mobile and R-Mobile ARM platforms.





config ARCH_RPC

config ARCH_RPC

	bool "RiscPC"

	bool "RiscPC"
@@ -1252,7 +1258,7 @@ config SMP 
	depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \

	depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \

		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \

		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \

		 ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \

		 ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \

		 ARCH_MSM_SCORPIONMP

		 ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE

	select USE_GENERIC_SMP_HELPERS

	select USE_GENERIC_SMP_HELPERS

	select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP

	select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP

	help

	help

arch/arm/configs/ag5evm_defconfig

0 → 100644
+83 −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_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_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE=""

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_ARCH_SH73A0=y

CONFIG_MACH_AG5EVM=y

CONFIG_MEMORY_SIZE=0x10000000

CONFIG_CPU_BPREDICT_DISABLE=y

CONFIG_ARM_ERRATA_430973=y

CONFIG_ARM_ERRATA_458693=y

CONFIG_NO_HZ=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=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=y

# CONFIG_SUSPEND is not set

CONFIG_PM_RUNTIME=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=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_BLK_DEV is not set

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_SMSC911X=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

# CONFIG_WLAN is not set

CONFIG_INPUT_SPARSEKMAP=y

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

CONFIG_INPUT_EVDEV=y

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_SERIAL_SH_SCI=y

CONFIG_SERIAL_SH_SCI_NR_UARTS=9

CONFIG_SERIAL_SH_SCI_CONSOLE=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

CONFIG_I2C_SH_MOBILE=y

# CONFIG_HWMON is not set

# CONFIG_MFD_SUPPORT is not set

CONFIG_FB=y

CONFIG_FB_SH_MOBILE_LCDC=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT 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_KERNEL=y

# CONFIG_FTRACE is not set

arch/arm/configs/mackerel_defconfig

0 → 100644
+138 −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_NET_NS is not set

CONFIG_SLAB=y

CONFIG_MODULES=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_ARCH_SH7372=y

CONFIG_MACH_MACKEREL=y

CONFIG_MEMORY_SIZE=0x10000000

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

CONFIG_FORCE_MAX_ZONEORDER=15

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="console=tty0, console=ttySC0,115200 earlyprintk=sh-sci.0,115200 root=/dev/nfs nfsroot=,tcp,v3 ip=dhcp memchunk.vpu=64m memchunk.veu0=8m memchunk.spu0=2m mem=240m"

CONFIG_KEXEC=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_PM=y

CONFIG_PM_RUNTIME=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=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_IPV6 is not set

# CONFIG_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

# CONFIG_FIRMWARE_IN_KERNEL is not set

CONFIG_MTD=y

CONFIG_MTD_CONCAT=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_ADV_OPTIONS=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_ARM_INTEGRATOR=y

CONFIG_MTD_BLOCK2MTD=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

# CONFIG_SCSI_LOWLEVEL is not set

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_SMSC911X=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

# CONFIG_WLAN is not set

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_SERIAL_SH_SCI=y

CONFIG_SERIAL_SH_SCI_NR_UARTS=8

CONFIG_SERIAL_SH_SCI_CONSOLE=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_HW_RANDOM is not set

# CONFIG_HWMON is not set

# CONFIG_MFD_SUPPORT is not set

CONFIG_FB=y

CONFIG_FB_MODE_HELPERS=y

CONFIG_FB_SH_MOBILE_LCDC=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

# CONFIG_LOGO_LINUX_MONO is not set

# CONFIG_LOGO_LINUX_CLUT224 is not set

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_POSIX_ACL=y

CONFIG_EXT2_FS_SECURITY=y

CONFIG_EXT2_FS_XIP=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_EXT3_FS_POSIX_ACL=y

CONFIG_EXT3_FS_SECURITY=y

# CONFIG_DNOTIFY is not set

# CONFIG_INOTIFY_USER 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_CODEPAGE_737=y

CONFIG_NLS_CODEPAGE_775=y

CONFIG_NLS_CODEPAGE_850=y

CONFIG_NLS_CODEPAGE_852=y

CONFIG_NLS_CODEPAGE_855=y

CONFIG_NLS_CODEPAGE_857=y

CONFIG_NLS_CODEPAGE_860=y

CONFIG_NLS_CODEPAGE_861=y

CONFIG_NLS_CODEPAGE_862=y

CONFIG_NLS_CODEPAGE_863=y

CONFIG_NLS_CODEPAGE_864=y

CONFIG_NLS_CODEPAGE_865=y

CONFIG_NLS_CODEPAGE_866=y

CONFIG_NLS_CODEPAGE_869=y

CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_ISO8859_2=y

CONFIG_NLS_ISO8859_3=y

CONFIG_NLS_ISO8859_4=y

CONFIG_NLS_ISO8859_5=y

CONFIG_NLS_ISO8859_6=y

CONFIG_NLS_ISO8859_7=y

CONFIG_NLS_ISO8859_9=y

CONFIG_NLS_ISO8859_13=y

CONFIG_NLS_ISO8859_14=y

CONFIG_NLS_ISO8859_15=y

CONFIG_NLS_KOI8_R=y

CONFIG_NLS_KOI8_U=y

CONFIG_NLS_UTF8=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_ANSI_CPRNG=y

arch/arm/mach-shmobile/Kconfig

+23 −12
Original line number Original line Diff line number Diff line
@@ -5,26 +5,27 @@ comment "SH-Mobile System Type" 
config ARCH_SH7367

config ARCH_SH7367

	bool "SH-Mobile G3 (SH7367)"

	bool "SH-Mobile G3 (SH7367)"

	select CPU_V6

	select CPU_V6

	select HAVE_CLK

	select CLKDEV_LOOKUP

	select SH_CLK_CPG

	select SH_CLK_CPG

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB





config ARCH_SH7377

config ARCH_SH7377

	bool "SH-Mobile G4 (SH7377)"

	bool "SH-Mobile G4 (SH7377)"

	select CPU_V7

	select CPU_V7

	select HAVE_CLK

	select CLKDEV_LOOKUP

	select SH_CLK_CPG

	select SH_CLK_CPG

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB





config ARCH_SH7372

config ARCH_SH7372

	bool "SH-Mobile AP4 (SH7372)"

	bool "SH-Mobile AP4 (SH7372)"

	select CPU_V7

	select CPU_V7

	select HAVE_CLK

	select CLKDEV_LOOKUP

	select SH_CLK_CPG

	select SH_CLK_CPG

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB



config ARCH_SH73A0

	bool "SH-Mobile AG5 (R8A73A00)"

	select CPU_V7

	select SH_CLK_CPG

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_GIC





comment "SH-Mobile Board Type"

comment "SH-Mobile Board Type"
@@ -57,6 +58,15 @@ config AP4EVB_WVGA 




endchoice

endchoice





config MACH_AG5EVM

	bool "AG5EVM board"

	depends on ARCH_SH73A0



config MACH_MACKEREL

	bool "mackerel board"

	depends on ARCH_SH7372

	select ARCH_REQUIRE_GPIOLIB



comment "SH-Mobile System Configuration"

comment "SH-Mobile System Configuration"





menu "Memory configuration"

menu "Memory configuration"
@@ -64,8 +74,8 @@ menu "Memory configuration" 
config MEMORY_START

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

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

	default "0x40000000" if MACH_AP4EVB

				MACH_MACKEREL

	default "0x00000000"

	default "0x00000000"

	---help---

	---help---

	  Tweak this only when porting to a new machine which does not

	  Tweak this only when porting to a new machine which does not
@@ -76,7 +86,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 "0x10000000" if MACH_AP4EVB

	default "0x20000000" if MACH_AG5EVM

	default "0x10000000" if MACH_AP4EVB || MACH_MACKEREL

	default "0x04000000"

	default "0x04000000"

	help

	help

	  This sets the default memory size assumed by your kernel. It can

	  This sets the default memory size assumed by your kernel. It can