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

Commit acdcbd63 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

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

* Global
  - Kconfig: Mention Renesas ARM SoCs instead of SH-Mobile

* r7s72100 SoC (RZ/A1H) based Genmai Board
  - Add Multiplatform support
  - Add Reference DT

* r8a7791 (R-Car M2) based Koelsch board
  - Add pinctrl_register_mappings() for Koelsch
  - Hook up SW30-SW36 on Koelsch
  - Mark GPIO keys as wake-up sources
  - Use ->init_late()
  - Add Multiplatform support
  - Set .debounce_interval for GPIO keys
  - Add SW2 to GPIO keys
  - Add Led 6, 7 and 8 support
  - Add reference DT
  - Enable PFC/GPIO

* r8a7790 (R-Car H2) based Lager board
  - Add gpio/fixed regulator for SDHI
  - Add SPI FLASH support on QSPI
  - Mark GPIO keys as wake-up sources
  - Use ->init_late()
  - Set .debounce_interval for GPIO keys

* r8a7778 (R-Car M1) based Bock-W board
  - bockw: remove unused RSND_SSI_CLK_FROM_ADG
  - Set .debounce_interval for GPIO keys
  - Correct FPGA ioremap area
  - Use regulator for MMCIF

* r8a7740 (R-Mobile A1) based Armadillo board
  - Correct FSI address size

* sh7374 (SH-Mobile AP4) based Mackerel board
  - Use pinconf API to configure pin pull-down
  - clk_round_rate() can return a zero to indicate an error

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

: (75 commits)
  ARM: shmobile: lager: add gpio/fixed regulator for SDHI
  ARM: shmobile: bockw: remove unused RSND_SSI_CLK_FROM_ADG
  ARM: shmobile: armadillo: fixup FSI address size
  ARM: Kconfig: Mention Renesas ARM SoCs instead of SH-Mobile
  ARM: shmobile: mackerel: Use pinconf API to configure pin pull-down
  ARM: shmobile: Lager:add SPI FLASH support on QSPI
  ARM: shmobile: mackerel: clk_round_rate() can return a zero to indicate an error
  ARM: shmobile: Add pinctrl_register_mappings() for Koelsch
  ARM: shmobile: Use ->init_late() on Lager
  ARM: shmobile: Hook up SW30-SW36 on Koelsch
  ARM: shmobile: koelsch: mark GPIO keys as wake-up sources
  ARM: shmobile: Use ->init_late() on Koelsch
  ARM: shmobile: lager: mark GPIO keys as wake-up sources
  ARM: shmobile: r7s72100 Genmai Multiplatform
  ARM: shmobile: r7s72100 Genmai DT reference C bits
  ARM: shmobile: r7s72100 Genmai DT reference DTS bits
  ARM: shmobile: Initial r8a7791 and Koelsch multiplatform support
  ARM: shmobile: koelsch: set .debounce_interval
  ARM: shmobile: lager: set .debounce_interval
  ARM: shmobile: bockw: add pin pull-up setting for SDHI
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 91a38be8 be0647d5

arch/arm/Kconfig

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

	  stack and controls some vital subsystems

	  (clock and power control, etc).

	  (clock and power control, etc).





config ARCH_SHMOBILE

config ARCH_SHMOBILE_LEGACY

	bool "Renesas SH-Mobile / R-Mobile"

	bool "Renesas ARM SoCs (non-multiplatform)"

	select ARCH_SHMOBILE

	select ARM_PATCH_PHYS_VIRT

	select ARM_PATCH_PHYS_VIRT

	select CLKDEV_LOOKUP

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS
@@ -660,7 +661,9 @@ config ARCH_SHMOBILE 
	select PM_GENERIC_DOMAINS if PM

	select PM_GENERIC_DOMAINS if PM

	select SPARSE_IRQ

	select SPARSE_IRQ

	help

	help

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

	  Support for Renesas ARM SoC platforms using a non-multiplatform

	  kernel. This includes the SH-Mobile, R-Mobile, EMMA-Mobile, R-Car

	  and RZ families.





config ARCH_RPC

config ARCH_RPC

	bool "RiscPC"

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

	default 200 if ARCH_EBSA110 || ARCH_S3C24XX || ARCH_S5P64X0 || \

		ARCH_S5PV210 || ARCH_EXYNOS4

		ARCH_S5PV210 || ARCH_EXYNOS4

	default AT91_TIMER_HZ if ARCH_AT91

	default AT91_TIMER_HZ if ARCH_AT91

	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE

	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE_LEGACY

	default 0

	default 0





choice

choice
@@ -1796,8 +1799,8 @@ config ARCH_WANT_GENERAL_HUGETLB 
source "mm/Kconfig"

source "mm/Kconfig"





config FORCE_MAX_ZONEORDER

config FORCE_MAX_ZONEORDER

	int "Maximum zone order" if ARCH_SHMOBILE

	int "Maximum zone order" if ARCH_SHMOBILE_LEGACY

	range 11 64 if ARCH_SHMOBILE

	range 11 64 if ARCH_SHMOBILE_LEGACY

	default "12" if SOC_AM33XX

	default "12" if SOC_AM33XX

	default "9" if SA1111

	default "9" if SA1111

	default "11"

	default "11"

arch/arm/Makefile

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

machine-$(CONFIG_ARCH_S5PV210)		+= s5pv210

machine-$(CONFIG_ARCH_SA1100)		+= sa1100

machine-$(CONFIG_ARCH_SA1100)		+= sa1100

machine-$(CONFIG_ARCH_SHMOBILE) 	+= shmobile

machine-$(CONFIG_ARCH_SHMOBILE) 	+= shmobile

machine-$(CONFIG_ARCH_SHMOBILE_MULTI) 	+= shmobile

machine-$(CONFIG_ARCH_SIRF)		+= prima2

machine-$(CONFIG_ARCH_SIRF)		+= prima2

machine-$(CONFIG_ARCH_SOCFPGA)		+= socfpga

machine-$(CONFIG_ARCH_SOCFPGA)		+= socfpga

machine-$(CONFIG_ARCH_STI)		+= sti

machine-$(CONFIG_ARCH_STI)		+= sti

arch/arm/boot/compressed/Makefile

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

endif

endif

endif





ifeq ($(CONFIG_ARCH_SHMOBILE),y)

ifeq ($(CONFIG_ARCH_SHMOBILE_LEGACY),y)

OBJS		+= head-shmobile.o

OBJS		+= head-shmobile.o

endif

endif

arch/arm/boot/dts/Makefile

+5 −2
Original line number Original line Diff line number Diff line
@@ -221,8 +221,9 @@ dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \ 
dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb

dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb

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

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

	s3c6410-smdk6410.dtb

	s3c6410-smdk6410.dtb

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

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

	r7s72100-genmai.dtb \

	r7s72100-genmai.dtb \

	r7s72100-genmai-reference.dtb \

	r8a7740-armadillo800eva.dtb \

	r8a7740-armadillo800eva.dtb \

	r8a7778-bockw.dtb \

	r8a7778-bockw.dtb \

	r8a7778-bockw-reference.dtb \

	r8a7778-bockw-reference.dtb \
@@ -237,7 +238,9 @@ dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \ 
	r8a73a4-ape6evm.dtb \

	r8a73a4-ape6evm.dtb \

	r8a73a4-ape6evm-reference.dtb \

	r8a73a4-ape6evm-reference.dtb \

	sh7372-mackerel.dtb

	sh7372-mackerel.dtb

dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb

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

	r7s72100-genmai-reference.dtb \

	r8a7791-koelsch-reference.dtb

dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \

dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \

	socfpga_cyclone5_socdk.dtb \

	socfpga_cyclone5_socdk.dtb \

	socfpga_cyclone5_sockit.dtb \

	socfpga_cyclone5_sockit.dtb \

arch/arm/boot/dts/r7s72100-genmai-reference.dts

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

 * Device Tree Source for the Genmai board

 *

 * Copyright (C) 2013 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/ "r7s72100.dtsi"



/ {

	model = "Genmai";

	compatible = "renesas,genmai-reference", "renesas,r7s72100";



	chosen {

		bootargs = "console=ttySC2,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";

	};



	memory {

		device_type = "memory";

		reg = <0x08000000 0x08000000>;

	};



	lbsc {

		#address-cells = <1>;

		#size-cells = <1>;

	};

};