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

Commit 9641f408 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-soc-cleanup2-for-v3.17' of... 

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

Merge "Second Round of Renesas ARM Based SoC soc-cleanup Updates for v3.17"
from Simon Horman:

* Move SOC-specific headers out of mach directory.
  This is part of a multi-stage effort to move headers
  out of that directory.

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

:
  ARM: shmobile: Move sh7372.h
  ARM: shmobile: Move sh73a0.h
  ARM: shmobile: Move r8a7790.h
  ARM: shmobile: Move r8a7778.h
  ARM: shmobile: Move r8a7740.h
  ARM: shmobile: Move r8a73a4.h
  ARM: shmobile: Move r7s72100.h

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 5db3f620 113522ee

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

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

#include <linux/platform_device.h>

#include <linux/sh_clk.h>

#include <mach/r8a73a4.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>



#include "common.h"

#include "r8a73a4.h"



static void __init ape6evm_add_standard_devices(void)

{

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

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

#include <linux/sh_clk.h>

#include <linux/smsc911x.h>

#include <mach/r8a73a4.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>



#include "common.h"

#include "irqs.h"

#include "r8a73a4.h"



/* LEDS */

static struct gpio_led ape6evm_leds[] = {

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

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

#include <linux/gpio.h>

#include <linux/io.h>

#include <mach/r8a7740.h>



#include <asm/mach/arch.h>

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



#include "common.h"

#include "r8a7740.h"



/*

 * CON1		Camera Module

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

+3 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
#include <linux/mmc/sh_mobile_sdhi.h>

#include <linux/i2c-gpio.h>

#include <linux/reboot.h>

#include <mach/r8a7740.h>



#include <media/mt9t112.h>

#include <media/sh_mobile_ceu.h>

#include <media/soc_camera.h>
@@ -59,9 +59,11 @@ 
#include <video/sh_mobile_hdmi.h>

#include <sound/sh_fsi.h>

#include <sound/simple_card.h>



#include "common.h"

#include "irqs.h"

#include "pm-rmobile.h"

#include "r8a7740.h"

#include "sh-gpio.h"



/*

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

+3 −1
Original line number Diff line number Diff line
@@ -19,9 +19,11 @@ 
 */



#include <linux/of_platform.h>

#include <mach/r8a7778.h>



#include <asm/mach/arch.h>



#include "common.h"

#include "r8a7778.h"



/*

 *	see board-bock.c for checking detail of dip-switch