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

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

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

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

Merge "Renesas ARM Based SoC Boards Updates for v3.17" from Simon Horman:

- armadillo800eva LED support
- Remove now unnecessary work arounds for c\lock issues
- Enable R-Car Gen2 CMA code

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

:
  ARM: shmobile: Enable R-Car Gen2 CMA code in board files
  ARM: shmobile: armadillo800eva reference: Spelling s/ED/LED/
  ARM: shmobile: armadillo800eva legacy: Add LED support
  ARM: shmobile: lager-reference: Remove workarounds for core clock issues
  ARM: shmobile: koelsch-reference: Remove workarounds for core clock issues

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 4c834452 5f65c5bd

arch/arm/mach-shmobile/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ menuconfig ARCH_SHMOBILE_MULTI 
	select NO_IOPORT_MAP

	select PINCTRL

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_HAS_CPUFREQ

	select ARCH_HAS_OPP



if ARCH_SHMOBILE_MULTI

arch/arm/mach-shmobile/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ obj-$(CONFIG_ARCH_SH73A0) += pm-sh73a0.o 
obj-$(CONFIG_ARCH_R8A7740)	+= pm-r8a7740.o pm-rmobile.o

obj-$(CONFIG_ARCH_R8A7779)	+= pm-r8a7779.o pm-rcar.o

obj-$(CONFIG_ARCH_R8A7790)	+= pm-r8a7790.o pm-rcar.o

obj-$(CONFIG_ARCH_R8A7791)	+= pm-r8a7791.o pm-rcar.o



# Board objects

ifdef CONFIG_ARCH_SHMOBILE_MULTI

arch/arm/mach-shmobile/board-ape6evm-reference.c

+1 −1
Original line number Diff line number Diff line
@@ -24,10 +24,10 @@ 
#include <linux/pinctrl/machine.h>

#include <linux/platform_device.h>

#include <linux/sh_clk.h>

#include <mach/common.h>

#include <mach/r8a73a4.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include "common.h"



static void __init ape6evm_add_standard_devices(void)

{

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

+2 −2
Original line number Diff line number Diff line
@@ -33,11 +33,11 @@ 
#include <linux/regulator/machine.h>

#include <linux/sh_clk.h>

#include <linux/smsc911x.h>

#include <mach/common.h>

#include <mach/irqs.h>

#include <mach/r8a73a4.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include "common.h"

#include "irqs.h"



/* LEDS */

static struct gpio_led ape6evm_leds[] = {

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

+5 −5
Original line number Diff line number Diff line
@@ -24,10 +24,10 @@ 
#include <linux/kernel.h>

#include <linux/gpio.h>

#include <linux/io.h>

#include <mach/common.h>

#include <mach/r8a7740.h>

#include <asm/mach/arch.h>

#include <asm/hardware/cache-l2x0.h>

#include "common.h"



/*

 * CON1		Camera Module
@@ -55,7 +55,7 @@ 
 * CON24	USB3

 * LED1		Camera LED (Yellow)

 * LED2		Power LED (Green)

 * ED3-LED6	User LED(Yellow)

 * LED3-LED6	User LED (Yellow)

 * LED7		LAN link LED (Green)

 * LED8		LAN activity LED (Yellow)

 */