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

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

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

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

From Simon Horman:
Second Round of Renesas ARM based SoC Board updates for v3.14

* r8a7791 (R-Car M2) based Koelsch board
  - Let Koelsch multiplatform boot with Koelsch DTB
  - Remove non-multiplatform DT reference support
  - Instantiate clkdevs for SCIF and CMT
  - Remove duplicate CCF initialization
  - Add Ether and DU support

* r8a7790 (R-Car H2) based Lager board
  - Let Lager multiplatform boot with Lager DTB
  - Remove non-multiplatform DT reference support
  - Instantiate clkdevs for SCIF and CMT
  - Enable multiplaform kernel support

* r8a7740 (R-Mobile A1) based Armadillo board
  - Set backlight enable GPIO

* sh7374 (SH-Mobile AP4) based Mackerel board
  - Correct USBHS pinconf entry

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

: (25 commits)
  ARM: shmobile: mackerel: Fix USBHS pinconf entry
  ARM: shmobile: Let Koelsch multiplatform boot with Koelsch DTB
  ARM: shmobile: Let Lager multiplatform boot with Lager DTB
  ARM: shmobile: Remove non-multiplatform Koelsch reference support
  ARM: shmobile: Remove non-multiplatform Lager reference support
  ARM: shmobile: koelsch-reference: Instantiate clkdevs for SCIF and CMT
  ARM: shmobile: lager-reference: Instantiate clkdevs for SCIF and CMT
  ARM: shmobile: koelsch-reference: Remove duplicate CCF initialization
  ARM: shmobile: lager-reference: Enable multiplaform kernel support
  ARM: shmobile: armadillo: Set backlight enable GPIO
  ARM: shmobile: Koelsch: add Ether support
  ARM: shmobile: koelsch: Add DU device
  arm: shmobile: clks: remove duplicated clock from r7s72100
  ARM: shmobile: koelsch: Conditionally select MICREL_PHY
  ARM: shmobile: rcar-gen2: Initialize CCF before clock sources
  ARM: shmobile: r8a7791: Add clock index macros for DT sources
  ARM: shmobile: r8a7790: Add clock index macros for DT sources
  ARM: shmobile: Add select MIGHT_HAVE_PCI for PCI-AHB bridge code
  ARM: shmobile: r8a7778: add USB Func DMAEngine support
  ARM: rcar-gen2: Do not setup timer in non-secure mode
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 160c39a2 b58c8e7b

arch/arm/boot/dts/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -233,7 +233,6 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \ 
	r8a7779-marzen-reference.dtb \

	r8a7791-koelsch.dtb \

	r8a7790-lager.dtb \

	r8a7790-lager-reference.dtb \

	sh73a0-kzm9g.dtb \

	sh73a0-kzm9g-reference.dtb \

	r8a73a4-ape6evm.dtb \
@@ -241,7 +240,8 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \ 
	sh7372-mackerel.dtb

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

	r7s72100-genmai-reference.dtb \

	r8a7791-koelsch-reference.dtb

	r8a7791-koelsch.dtb \

	r8a7790-lager.dtb

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

	socfpga_cyclone5_socdk.dtb \

	socfpga_cyclone5_sockit.dtb \

arch/arm/mach-shmobile/Kconfig

+13 −22
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ config ARCH_SHMOBILE_MULTI 
	select HAVE_SMP

	select ARM_GIC

	select MIGHT_HAVE_CACHE_L2X0

	select MIGHT_HAVE_PCI

	select NO_IOPORT

	select PINCTRL

	select ARCH_REQUIRE_GPIOLIB
@@ -27,6 +28,10 @@ config ARCH_EMEV2 
config ARCH_R7S72100

	bool "RZ/A1H (R7S72100)"



config ARCH_R8A7790

	bool "R-Car H2 (R8A77900)"

	select RENESAS_IRQC



config ARCH_R8A7791

	bool "R-Car M2 (R8A77910)"

	select RENESAS_IRQC
@@ -46,6 +51,10 @@ config MACH_KZM9D 
	depends on ARCH_EMEV2

	select REGULATOR_FIXED_VOLTAGE if REGULATOR



config MACH_LAGER

	bool "Lager board"

	depends on ARCH_R8A7790



comment "Renesas ARM SoCs System Configuration"

endif
@@ -111,6 +120,7 @@ config ARCH_R8A7790 
	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_GIC

	select CPU_V7

	select MIGHT_HAVE_PCI

	select SH_CLK_CPG

	select RENESAS_IRQC
@@ -119,6 +129,7 @@ config ARCH_R8A7791 
	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_GIC

	select CPU_V7

	select MIGHT_HAVE_PCI

	select SH_CLK_CPG

	select RENESAS_IRQC
@@ -127,6 +138,7 @@ config ARCH_EMEV2 
	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_GIC

	select CPU_V7

	select MIGHT_HAVE_PCI

	select USE_OF

	select AUTO_ZRELADDR
@@ -250,32 +262,11 @@ config MACH_LAGER 
	depends on ARCH_R8A7790

	select USE_OF



config MACH_LAGER_REFERENCE

	bool "Lager board - Reference Device Tree Implementation"

	depends on ARCH_R8A7790

	select USE_OF

	---help---

	   Use reference implementation of Lager board support

	   which makes use of device tree at the expense

	   of not supporting a number of devices.



	   This is intended to aid developers



config MACH_KOELSCH

	bool "Koelsch board"

	depends on ARCH_R8A7791

	select USE_OF



config MACH_KOELSCH_REFERENCE

	bool "Koelsch board - Reference Device Tree Implementation"

	depends on ARCH_R8A7791

	select USE_OF

	---help---

	   Use reference implementation of Koelsch board support

	   which makes use of device tree at the expense

	   of not supporting a number of devices.



	   This is intended to aid developers

	select MICREL_PHY if SH_ETH



config MACH_KZM9G

	bool "KZM-A9-GT board"

arch/arm/mach-shmobile/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ ifdef CONFIG_ARCH_SHMOBILE_MULTI 
obj-$(CONFIG_MACH_GENMAI)	+= board-genmai-reference.o

obj-$(CONFIG_MACH_KOELSCH)	+= board-koelsch-reference.o

obj-$(CONFIG_MACH_KZM9D)	+= board-kzm9d-reference.o

obj-$(CONFIG_MACH_LAGER)	+= board-lager-reference.o

else

obj-$(CONFIG_MACH_APE6EVM)	+= board-ape6evm.o

obj-$(CONFIG_MACH_APE6EVM_REFERENCE)	+= board-ape6evm-reference.o
@@ -70,11 +71,9 @@ obj-$(CONFIG_MACH_GENMAI_REFERENCE) += board-genmai-reference.o 
obj-$(CONFIG_MACH_MARZEN)	+= board-marzen.o

obj-$(CONFIG_MACH_MARZEN_REFERENCE)	+= board-marzen-reference.o

obj-$(CONFIG_MACH_LAGER)	+= board-lager.o

obj-$(CONFIG_MACH_LAGER_REFERENCE)	+= board-lager-reference.o

obj-$(CONFIG_MACH_ARMADILLO800EVA)	+= board-armadillo800eva.o

obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE)	+= board-armadillo800eva-reference.o

obj-$(CONFIG_MACH_KOELSCH)	+= board-koelsch.o

obj-$(CONFIG_MACH_KOELSCH_REFERENCE)	+= board-koelsch-reference.o

obj-$(CONFIG_MACH_KZM9G)	+= board-kzm9g.o

obj-$(CONFIG_MACH_KZM9G_REFERENCE)	+= board-kzm9g-reference.o

endif

arch/arm/mach-shmobile/Makefile.boot

+0 −2
Original line number Diff line number Diff line
@@ -9,11 +9,9 @@ loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000 
loadaddr-$(CONFIG_MACH_GENMAI) += 0x08008000

loadaddr-$(CONFIG_MACH_GENMAI_REFERENCE) += 0x08008000

loadaddr-$(CONFIG_MACH_KOELSCH) += 0x40008000

loadaddr-$(CONFIG_MACH_KOELSCH_REFERENCE) += 0x40008000

loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000

loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000

loadaddr-$(CONFIG_MACH_LAGER) += 0x40008000

loadaddr-$(CONFIG_MACH_LAGER_REFERENCE) += 0x40008000

loadaddr-$(CONFIG_MACH_MACKEREL) += 0x40008000

loadaddr-$(CONFIG_MACH_MARZEN) += 0x60008000

loadaddr-$(CONFIG_MACH_MARZEN_REFERENCE) += 0x60008000

arch/arm/mach-shmobile/board-armadillo800eva.c

+1 −4
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ static struct platform_pwm_backlight_data pwm_backlight_data = { 
	.max_brightness = 255,

	.dft_brightness = 255,

	.pwm_period_ns = 33333, /* 30kHz */

	.enable_gpio = -1,

	.enable_gpio = 61,

};



static struct platform_device pwm_backlight_device = {
@@ -1203,9 +1203,6 @@ static void __init eva_init(void) 
	r8a7740_pinmux_init();

	r8a7740_meram_workaround();



	/* LCDC0 */

	gpio_request_one(61, GPIOF_OUT_INIT_HIGH, NULL); /* LCDDON */



	/* GETHER */

	gpio_request_one(18, GPIOF_OUT_INIT_HIGH, NULL); /* PHY_RST */