Second Round of Renesas ARM Based SoC r8a7779-multiplatform Updates for v3.17
* Move r8a7779.h out of mach directory. This is part of a multi-stage effort to move headers out of that directory. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJTsfwOAAoJENfPZGlqN0++uAAP/0VefX1OFTFFfSbBF0srIMGp LbwxFjxfip8MSQnwL8R93C51jP9OWO1ePKM5EE3uMDicEszlmr5otXTC5m8/c8Mn BLK8hf0DCF2VH2lnNegH8QuLoNh3p3N7Ck8/PgIh/S0uUiOF0QdOKUEeFaCNqeg5 CTwUVv3xK8kteXcMxgUpB6F1dZA/Kw2KtlMIO4pH07M2bKif8W5wgCbr3GIHiGYP DawE4s0kxCb0bTM6f+T0Q+KezstgTglYq4zjK4WezH+xAXGfmPRDQnXw/CHCRqdB Ku87pqa9GSB68aqdk7kLSDk9WRaaPIeeRtsTkejmoXLtO2KesDBlWXV9fU88ueSt zx/2VUTr2w75N6CvQidtvjU7vO3knokxC+CTKfUWXmw1ge90tMjB97q5NYlx+vxk yLN5yQbzCED5kK8GUNZ3JptEUqD2rlD9pYz5BqXWh4JmCxNPsPK/4zU9IPZsM1Ga zmK6hyCBogWPsy0WtdDhSrRSeWaCuE7XPU2tai3TdLl00W9sSgGUBsy86Am2vYq9 bENBVPw7qKOO83A0BnFkwZGQo8cR8FvAlkw1fP1wPgAUGOyivaEzEdbbL1GOl8eV ucREW8dTkI00dQvByjl0w+6t3mP2cjJbJqNH2jSbeM2PlP+0oGm/olZ89zfFkJO8 snXaY03X+0nY4rtIy2MT =RNdD -----END PGP SIGNATURE----- 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: Olof Johansson <olof@lixom.net>
This commit is contained in:
commit
edf4f16f27
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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[] = {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -40,14 +40,16 @@
|
|||
#include <linux/usb/ehci_pdriver.h>
|
||||
#include <linux/usb/ohci_pdriver.h>
|
||||
#include <linux/pm_runtime.h>
|
||||
#include <mach/r8a7779.h>
|
||||
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/mach/arch.h>
|
||||
#include <asm/mach/time.h>
|
||||
#include <asm/mach/map.h>
|
||||
#include <asm/hardware/cache-l2x0.h>
|
||||
|
||||
#include "common.h"
|
||||
#include "irqs.h"
|
||||
#include "r8a7779.h"
|
||||
|
||||
static struct map_desc r8a7779_io_desc[] __initdata = {
|
||||
/* 2M entity map for 0xf0000000 (MPCORE) */
|
||||
|
|
|
@ -23,13 +23,15 @@
|
|||
#include <linux/spinlock.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/delay.h>
|
||||
#include <mach/r8a7779.h>
|
||||
|
||||
#include <asm/cacheflush.h>
|
||||
#include <asm/smp_plat.h>
|
||||
#include <asm/smp_scu.h>
|
||||
#include <asm/smp_twd.h>
|
||||
|
||||
#include "common.h"
|
||||
#include "pm-rcar.h"
|
||||
#include "r8a7779.h"
|
||||
|
||||
#define AVECR IOMEM(0xfe700040)
|
||||
#define R8A7779_SCU_BASE 0xf0000000
|
||||
|
|
Loading…
Reference in a new issue