Commit 345bc449 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'renesas-soc-for-v3.14' of... 

Merge tag 'renesas-soc-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

From Simon Horman:
Renesas ARM based SoC updates for v3.14

* Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY

* r8a7791 SoC (R-Car M2)
  - Add thermal platform device
  - Add DU and LVDS clocks
  - GPIO platform device support
  - PFC platform device support
  - Select IRQC

* r8a7790 SoC (R-Car H2)
  - Tidyup clock table order
  - Fixup I2C clock source
  - Correct EXTAL divider settings
  - Add clocks for thermal devices and SSI

* r8a7779 SoC (R-Car H1)
  - Add I2C clock for DT

* r8a7778 SoC (R-Car M1)
  - Add HSPI clocks for DT
  - Add I2C clock for DT
  - Add HPBIFx DMAEngine support

* r8a7740 SoC (R-Mobile A1)
  - Add FSI clocks for DT

* emev2 SoC (Emma Mobile)
  - Move to Multi-platform
  - Remove legacy board code

* r7s72100 SoC (RZ/A1H)
  - Select GPIO

* r8a73a4 SoC (R-Mobile APE6)
  - Don't used named IRC for DMAEngine

* tag 'renesas-soc-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

: (33 commits)
  ARM: shmobile: r8a7779: add HSPI clock support for DT
  ARM: shmobile: r8a7740: add FSI clock support for DT
  ARM: shmobile: r8a7790: add SSI MSTP clocks
  ARM: shmobile: r8a7778: add HPBIFx DMAEngine support
  ARM: shmobile: Select AUTO_ZRELADDR for EMEV2
  ARM: shmobile: r8a7790: tidyup clock table order
  ARM: shmobile: r8a7790: fixup I2C clock source
  ARM: shmobile: r8a7790: care EXTAL divider settings
  ARM: shmobile: Add r8a7791 clocks for thermal devices
  ARM: shmobile: Add r8a7791 thermal platform device
  ARM: shmobile: Add r8a7790 clocks for thermal devices
  ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY
  ARM: shmobile: r8a7791: Add DU and LVDS clocks
  ARM: shmobile: Select USE_OF on EMEV2
  ARM: shmobile: r8a7778: add HSPI clock support for DT
  ARM: shmobile: Remove legacy platform devices from EMEV2 SoC code
  ARM: shmobile: Remove legacy KZM9D board code
  ARM: shmobile: Use ->init_late() in shared EMEV2 case
  ARM: shmobile: Add shared EMEV2 code for ->init_machine()
  ARM: shmobile: Enable MTU2 on r7s72100
  ...

Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parents 02ee25c3 fee05eb3

arch/arm/Kconfig

+8 −6
Original line number Diff line number Diff line
@@ -664,8 +664,9 @@ config ARCH_MSM 
	  stack and controls some vital subsystems

	  (clock and power control, etc).



config ARCH_SHMOBILE

	bool "Renesas SH-Mobile / R-Mobile"

config ARCH_SHMOBILE_LEGACY

	bool "Renesas SH-Mobile / R-Mobile (non-multiplatform)"

	select ARCH_SHMOBILE

	select ARM_PATCH_PHYS_VIRT

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS
@@ -680,7 +681,8 @@ config ARCH_SHMOBILE 
	select PM_GENERIC_DOMAINS if PM

	select SPARSE_IRQ

	help

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

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

	  a non-multiplatform kernel.



config ARCH_RPC

	bool "RiscPC"
@@ -1633,7 +1635,7 @@ config HZ_FIXED 
	default 200 if ARCH_EBSA110 || ARCH_S3C24XX || ARCH_S5P64X0 || \

		ARCH_S5PV210 || ARCH_EXYNOS4

	default AT91_TIMER_HZ if ARCH_AT91

	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE

	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE_LEGACY

	default 0



choice
@@ -1818,8 +1820,8 @@ config ARCH_WANT_GENERAL_HUGETLB 
source "mm/Kconfig"



config FORCE_MAX_ZONEORDER

	int "Maximum zone order" if ARCH_SHMOBILE

	range 11 64 if ARCH_SHMOBILE

	int "Maximum zone order" if ARCH_SHMOBILE_LEGACY

	range 11 64 if ARCH_SHMOBILE_LEGACY

	default "12" if SOC_AM33XX

	default "9" if SA1111 || ARCH_EFM32

	default "11"

arch/arm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -192,7 +192,6 @@ machine-$(CONFIG_ARCH_S5PC100) += s5pc100 
machine-$(CONFIG_ARCH_S5PV210)		+= s5pv210

machine-$(CONFIG_ARCH_SA1100)		+= sa1100

machine-$(CONFIG_ARCH_SHMOBILE) 	+= shmobile

machine-$(CONFIG_ARCH_SHMOBILE_MULTI) 	+= shmobile

machine-$(CONFIG_ARCH_SIRF)		+= prima2

machine-$(CONFIG_ARCH_SOCFPGA)		+= socfpga

machine-$(CONFIG_ARCH_STI)		+= sti

arch/arm/boot/compressed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ else 
endif

endif



ifeq ($(CONFIG_ARCH_SHMOBILE),y)

ifeq ($(CONFIG_ARCH_SHMOBILE_LEGACY),y)

OBJS		+= head-shmobile.o

endif

arch/arm/boot/dts/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \ 
dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb

dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \

	s3c6410-smdk6410.dtb

dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \

dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \

	r7s72100-genmai.dtb \

	r8a7740-armadillo800eva.dtb \

	r8a7778-bockw.dtb \

arch/arm/configs/ape6evm_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ CONFIG_EMBEDDED=y 
CONFIG_PERF_EVENTS=y

CONFIG_SLAB=y

# CONFIG_BLOCK is not set

CONFIG_ARCH_SHMOBILE=y

CONFIG_ARCH_SHMOBILE_LEGACY=y

CONFIG_ARCH_R8A73A4=y

CONFIG_MACH_APE6EVM=y

# CONFIG_ARM_THUMB is not set

CRA Git | Maintained and supported by SUSTech CRA and CCSE