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

Commit 586eeb01 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

Merge tag 'renesas-boards-for-v3.13' 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.13

* Display Unit support for lager and marzen boards
* Update regulators for MMC0, SDHI0 and SDHI1 on ape6evm board
* Enable use of FPGA on bockw board
* Add sounds support to bockw board
* Add USB function support to bockw board
* Add Koelsch board
* Disable MMCIF command completion signal on ape6evm, armadillo800eva,
  kzm9g and lager boards.

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

:
  ARM: shmobile: lager: disable MMCIF Command Completion Signal, add CLK_CTRL2
  ARM: shmobile: kzm9g: disable MMCIF Command Completion Signal
  ARM: shmobile: armadillo800eva: disable MMCIF Command Completion Signal
  ARM: shmobile: ape6evm: disable MMCIF Command Completion Signal
  ARM: shmobile: bockw: add USB Function support
  ARM: shmobile: Koelsch support
  ARM: shmobile: bockw: add R-Car sound support (PIO)
  ARM: shmobile: bockw: enable global use of FPGA
  ARM: shmobile: lager: Fix Display Unit platform data
  ARM: shmobile: ape6evm: update MMC0, SDHI0 and SDHI1 with correct regulators
  ARM: shmobile: lager: Add Display Unit support
  ARM: shmobile: marzen: Add Display Unit support
  ARM: shmobile: r8a7778: add usb phy power control function
  ARM: shmobile: r8a7778: add USBHS clock
  ARM: shmobile: r8a7791 CMT support
  ARM: shmobile: r8a7791 SCIF support
  ARM: shmobile: Initial r8a7791 SoC support
  ARM: shmobile: r8a7778: add SSI/SRU clock support
  ARM: shmobile: r8a7790: Add DU and LVDS clocks
  ARM: shmobile: r8a7779: Rename DU device in clock lookups list

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 4a10c2ac b77c6bce

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -203,6 +203,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \ 
	r8a7740-armadillo800eva-reference.dtb \

	r8a7779-marzen.dtb \

	r8a7779-marzen-reference.dtb \

	r8a7791-koelsch.dtb \

	r8a7790-lager.dtb \

	r8a7790-lager-reference.dtb \

	sh73a0-kzm9g.dtb \

arch/arm/boot/dts/r8a7791-koelsch.dts

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

 * Device Tree Source for the Koelsch board

 *

 * Copyright (C) 2013 Renesas Electronics Corporation

 * 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/ "r8a7791.dtsi"



/ {

	model = "Koelsch";

	compatible = "renesas,koelsch", "renesas,r8a7791";



	chosen {

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

	};



	memory@40000000 {

		device_type = "memory";

		reg = <0 0x40000000 0 0x80000000>;

	};



	lbsc {

		#address-cells = <1>;

		#size-cells = <1>;

	};

};

arch/arm/boot/dts/r8a7791.dtsi

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

 * Device Tree Source for the r8a7791 SoC

 *

 * Copyright (C) 2013 Renesas Electronics Corporation

 * 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.

 */



/ {

	compatible = "renesas,r8a7791";

	interrupt-parent = <&gic>;

	#address-cells = <2>;

	#size-cells = <2>;



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;



		cpu0: cpu@0 {

			device_type = "cpu";

			compatible = "arm,cortex-a15";

			reg = <0>;

			clock-frequency = <1300000000>;

		};

	};



	gic: interrupt-controller@f1001000 {

		compatible = "arm,cortex-a15-gic";

		#interrupt-cells = <3>;

		#address-cells = <0>;

		interrupt-controller;

		reg = <0 0xf1001000 0 0x1000>,

			<0 0xf1002000 0 0x1000>,

			<0 0xf1004000 0 0x2000>,

			<0 0xf1006000 0 0x2000>;

		interrupts = <1 9 0xf04>;

	};

};

arch/arm/mach-shmobile/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -101,6 +101,12 @@ config ARCH_R8A7790 
	select SH_CLK_CPG

	select RENESAS_IRQC



config ARCH_R8A7791

	bool "R-Car M2 (R8A77910)"

	select ARM_GIC

	select CPU_V7

	select SH_CLK_CPG



config ARCH_EMEV2

	bool "Emma Mobile EV2"

	select ARCH_WANT_OPTIONAL_GPIOLIB
@@ -162,6 +168,8 @@ config MACH_BOCKW 
	select RENESAS_INTC_IRQPIN

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	select USE_OF

	select SND_SOC_AK4554 if SND_SIMPLE_CARD

	select SND_SOC_AK4642 if SND_SIMPLE_CARD



config MACH_BOCKW_REFERENCE

	bool "BOCK-W  - Reference Device Tree Implementation"
@@ -213,6 +221,11 @@ config MACH_LAGER_REFERENCE 


	   This is intended to aid developers



config MACH_KOELSCH

	bool "Koelsch board"

	depends on ARCH_R8A7791

	select USE_OF



config MACH_KZM9D

	bool "KZM9D board"

	depends on ARCH_EMEV2

arch/arm/mach-shmobile/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ obj-$(CONFIG_ARCH_R8A7740) += setup-r8a7740.o 
obj-$(CONFIG_ARCH_R8A7778)	+= setup-r8a7778.o

obj-$(CONFIG_ARCH_R8A7779)	+= setup-r8a7779.o

obj-$(CONFIG_ARCH_R8A7790)	+= setup-r8a7790.o

obj-$(CONFIG_ARCH_R8A7791)	+= setup-r8a7791.o

obj-$(CONFIG_ARCH_EMEV2)	+= setup-emev2.o



# Clock objects
@@ -27,6 +28,7 @@ obj-$(CONFIG_ARCH_R8A7740) += clock-r8a7740.o 
obj-$(CONFIG_ARCH_R8A7778)	+= clock-r8a7778.o

obj-$(CONFIG_ARCH_R8A7779)	+= clock-r8a7779.o

obj-$(CONFIG_ARCH_R8A7790)	+= clock-r8a7790.o

obj-$(CONFIG_ARCH_R8A7791)	+= clock-r8a7791.o

obj-$(CONFIG_ARCH_EMEV2)	+= clock-emev2.o

endif
@@ -59,6 +61,7 @@ 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_KZM9D)	+= board-kzm9d.o

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

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