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

Commit 4c4d285a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'rmobile-for-linus' of git://github.com/pmundt/linux-sh 

SH/R-Mobile updates for 3.3 merge window.

* tag 'rmobile-for-linus' of git://github.com/pmundt/linux-sh: (32 commits)
  arm: mach-shmobile: add a resource name for shdma
  ARM: mach-shmobile: r8a7779 SMP support V3
  ARM: mach-shmobile: Add kota2 defconfig.
  ARM: mach-shmobile: Add marzen defconfig.
  ARM: mach-shmobile: r8a7779 power domain support V2
  ARM: mach-shmobile: Fix up marzen build for recent GIC changes.
  ARM: mach-shmobile: r8a7779 PFC function support
  ARM: mach-shmobile: Flush caches in platform_cpu_die()
  ARM: mach-shmobile: Allow SoC specific CPU kill code
  ARM: mach-shmobile: Fix headsmp.S code to use CPUINIT
  ARM: mach-shmobile: clock-r8a7779: clkz/clkzs support
  ARM: mach-shmobile: clock-r8a7779: add DIV4 clock support
  ARM: mach-shmobile: Marzen LAN89218 support
  ARM: mach-shmobile: Marzen SCIF2/SCIF4 support
  ARM: mach-shmobile: r8a7779 PFC GPIO-only support V2
  ARM: mach-shmobile: r8a7779 and Marzen base support V2
  sh: pfc: Unlock register support
  sh: pfc: Variable bitfield width config register support
  sh: pfc: Add config_reg_helper() function
  sh: pfc: Convert index to field and value pair
  ...
parents 56c8bc3b e64e1b11

arch/arm/configs/bonito_defconfig

0 → 100644
+72 −0
Original line number 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_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE=""

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

# CONFIG_SH_TIMER_TMU is not set

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

CONFIG_FORCE_MAX_ZONEORDER=12

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="console=ttySC5,115200 earlyprintk=sh-sci.5,115200 ignore_loglevel"

CONFIG_KEXEC=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_SUSPEND is not set

CONFIG_PM_RUNTIME=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

# CONFIG_FIRMWARE_IN_KERNEL is not set

CONFIG_MTD=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_INPUT_KEYBOARD is not set

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

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_SH_MOBILE=y

CONFIG_GPIO_SYSFS=y

# CONFIG_HWMON is not set

# CONFIG_MFD_SUPPORT is not set

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_UIO=y

CONFIG_UIO_PDRV=y

CONFIG_UIO_PDRV_GENIRQ=y

# CONFIG_DNOTIFY is not set

# CONFIG_INOTIFY_USER is not set

CONFIG_TMPFS=y

# CONFIG_MISC_FILESYSTEMS is not set

# CONFIG_ENABLE_WARN_DEPRECATED is not set

# CONFIG_ENABLE_MUST_CHECK is not set

# CONFIG_ARM_UNWIND is not set

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

+25 −2
Original line number Diff line number Diff line
@@ -28,6 +28,19 @@ config ARCH_SH73A0 
	select ARM_GIC

	select I2C



config ARCH_R8A7740

	bool "R-Mobile A1 (R8A77400)"

	select CPU_V7

	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
@@ -75,6 +88,16 @@ config MACH_KOTA2 
	select ARCH_REQUIRE_GPIOLIB

	depends on ARCH_SH73A0



config MACH_BONITO

	bool "bonito board"

	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"
@@ -83,7 +106,7 @@ config MEMORY_START 
	hex "Physical memory start address"

	default "0x50000000" if MACH_G3EVM

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

				MACH_MACKEREL

				MACH_MACKEREL || MACH_BONITO

	default "0x41000000" if MACH_KOTA2

	default "0x00000000"

	---help---
@@ -95,7 +118,7 @@ config MEMORY_SIZE 
	hex "Physical memory size"

	default "0x08000000" if MACH_G3EVM

	default "0x08000000" if MACH_G4EVM

	default "0x20000000" if MACH_AG5EVM

	default "0x20000000" if MACH_AG5EVM || MACH_BONITO

	default "0x1e000000" if MACH_KOTA2

	default "0x10000000" if MACH_AP4EVB || MACH_MACKEREL

	default "0x04000000"

arch/arm/mach-shmobile/Makefile

+9 −0
Original line number Diff line number Diff line
@@ -10,12 +10,15 @@ obj-$(CONFIG_ARCH_SH7367) += setup-sh7367.o clock-sh7367.o intc-sh7367.o 
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

smp-$(CONFIG_HOTPLUG_CPU)	+= hotplug.o

smp-$(CONFIG_LOCAL_TIMERS)	+= localtimer.o

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

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



# Pinmux setup

pfc-y				:=
@@ -23,16 +26,20 @@ pfc-$(CONFIG_ARCH_SH7367) += pfc-sh7367.o 
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

obj-$(CONFIG_ARCH_SH7377)	+= entry-intc.o

obj-$(CONFIG_ARCH_SH7372)	+= entry-intc.o

obj-$(CONFIG_ARCH_R8A7740)	+= entry-intc.o



# PM objects

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
@@ -41,6 +48,8 @@ obj-$(CONFIG_MACH_AP4EVB) += board-ap4evb.o 
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)