Change location of rcar-gen2.h so it can be used as #include "rcar-gen2.h"
instead of the old style #include <mach/rcar-gen2.h>. Also clean up
the r8a7790 case to follow the same style as r8a7791.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
12 files changed:
#include <linux/kernel.h>
#include <linux/of_platform.h>
#include <linux/platform_data/rcar-du.h>
#include <linux/kernel.h>
#include <linux/of_platform.h>
#include <linux/platform_data/rcar-du.h>
-#include <mach/rcar-gen2.h>
#include <mach/r8a7791.h>
#include <asm/mach/arch.h>
#include "clock.h"
#include "common.h"
#include "irqs.h"
#include <mach/r8a7791.h>
#include <asm/mach/arch.h>
#include "clock.h"
#include "common.h"
#include "irqs.h"
/* DU */
static struct rcar_du_encoder_data koelsch_du_encoders[] = {
/* DU */
static struct rcar_du_encoder_data koelsch_du_encoders[] = {
#include <linux/spi/rspi.h>
#include <linux/spi/spi.h>
#include <mach/r8a7791.h>
#include <linux/spi/rspi.h>
#include <linux/spi/spi.h>
#include <mach/r8a7791.h>
-#include <mach/rcar-gen2.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include "common.h"
#include "irqs.h"
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include "common.h"
#include "irqs.h"
/* DU */
static struct rcar_du_encoder_data koelsch_du_encoders[] = {
/* DU */
static struct rcar_du_encoder_data koelsch_du_encoders[] = {
#include <linux/init.h>
#include <linux/of_platform.h>
#include <linux/platform_data/rcar-du.h>
#include <linux/init.h>
#include <linux/of_platform.h>
#include <linux/platform_data/rcar-du.h>
-#include <mach/rcar-gen2.h>
#include <mach/r8a7790.h>
#include <asm/mach/arch.h>
#include "clock.h"
#include "common.h"
#include "irqs.h"
#include <mach/r8a7790.h>
#include <asm/mach/arch.h>
#include "clock.h"
#include "common.h"
#include "irqs.h"
/* DU */
static struct rcar_du_encoder_data lager_du_encoders[] = {
/* DU */
static struct rcar_du_encoder_data lager_du_encoders[] = {
#include <sound/simple_card.h>
#include "common.h"
#include "irqs.h"
#include <sound/simple_card.h>
#include "common.h"
#include "irqs.h"
#include <mach/r8a7790.h>
#include "clock.h"
#include "common.h"
#include <mach/r8a7790.h>
#include "clock.h"
#include "common.h"
/*
* MD EXTAL PLL0 PLL1 PLL3
/*
* MD EXTAL PLL0 PLL1 PLL3
#include <linux/kernel.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
#include <linux/kernel.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/rcar-gen2.h>
#include "clock.h"
#include "common.h"
#include "clock.h"
#include "common.h"
/*
* MD EXTAL PLL0 PLL1 PLL3
/*
* MD EXTAL PLL0 PLL1 PLL3
#ifndef __ASM_R8A7790_H__
#define __ASM_R8A7790_H__
#ifndef __ASM_R8A7790_H__
#define __ASM_R8A7790_H__
-#include <mach/rcar-gen2.h>
-
/* DMA slave IDs */
enum {
RCAR_DMA_SLAVE_INVALID,
/* DMA slave IDs */
enum {
RCAR_DMA_SLAVE_INVALID,
#include "common.h"
#include "dma-register.h"
#include "irqs.h"
#include "common.h"
#include "dma-register.h"
#include "irqs.h"
/* Audio-DMAC */
#define AUDIO_DMAC_SLAVE(_id, _addr, t, r) \
/* Audio-DMAC */
#define AUDIO_DMAC_SLAVE(_id, _addr, t, r) \
#include <linux/serial_sci.h>
#include <linux/sh_timer.h>
#include <mach/r8a7791.h>
#include <linux/serial_sci.h>
#include <linux/sh_timer.h>
#include <mach/r8a7791.h>
-#include <mach/rcar-gen2.h>
#include <asm/mach/arch.h>
#include "common.h"
#include "irqs.h"
#include <asm/mach/arch.h>
#include "common.h"
#include "irqs.h"
static const struct resource pfc_resources[] __initconst = {
DEFINE_RES_MEM(0xe6060000, 0x250),
static const struct resource pfc_resources[] __initconst = {
DEFINE_RES_MEM(0xe6060000, 0x250),
#include <linux/clocksource.h>
#include <linux/io.h>
#include <linux/kernel.h>
#include <linux/clocksource.h>
#include <linux/io.h>
#include <linux/kernel.h>
-#include <mach/rcar-gen2.h>
#include <asm/mach/arch.h>
#include "common.h"
#include <asm/mach/arch.h>
#include "common.h"
#define MODEMR 0xe6160060
#define MODEMR 0xe6160060
#include <linux/io.h>
#include <asm/smp_plat.h>
#include <mach/r8a7791.h>
#include <linux/io.h>
#include <asm/smp_plat.h>
#include <mach/r8a7791.h>
-#include <mach/rcar-gen2.h>
#define RST 0xe6160000
#define CA15BAR 0x0020
#define RST 0xe6160000
#define CA15BAR 0x0020