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

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

Merge tag 'renesas-r8a7779-multiplatform2-for-v3.17' of... 

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

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

- Move r8a7779.h out of mach directory.
  This is part of a multi-stage effort to move headers
  out of that directory.

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

:
  ARM: shmobile: Move r8a7779.h

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3ae22f4d 1b55353c

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

+3 −1
Original line number Diff line number Diff line
@@ -22,12 +22,14 @@ 
#include <linux/clk/shmobile.h>

#include <linux/clocksource.h>

#include <linux/of_platform.h>

#include <mach/r8a7779.h>



#include <asm/irq.h>

#include <asm/mach/arch.h>



#include "clock.h"

#include "common.h"

#include "irqs.h"

#include "r8a7779.h"



static void __init marzen_init_timer(void)

{

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

+3 −1
Original line number Diff line number Diff line
@@ -41,13 +41,15 @@ 
#include <linux/mmc/host.h>

#include <linux/mmc/sh_mobile_sdhi.h>

#include <linux/mfd/tmio.h>



#include <media/soc_camera.h>

#include <mach/r8a7779.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/traps.h>



#include "common.h"

#include "irqs.h"

#include "r8a7779.h"



/* Fixed 3.3V regulator to be used by SDHI0 */

static struct regulator_consumer_supply fixed3v3_power_consumers[] = {

arch/arm/mach-shmobile/clock-r8a7779.c

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

#include <linux/clkdev.h>

#include <linux/sh_timer.h>

#include <mach/r8a7779.h>



#include "clock.h"

#include "common.h"

#include "r8a7779.h"



/*

 *		MD1 = 1			MD1 = 0

arch/arm/mach-shmobile/pm-r8a7779.c

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

#include <linux/interrupt.h>

#include <linux/console.h>



#include <asm/io.h>

#include <mach/r8a7779.h>



#include "common.h"

#include "pm-rcar.h"

#include "r8a7779.h"



/* SYSC */

#define SYSCIER 0x0c