Commit e6a6e5ad authored by Tony Lindgren's avatar Tony Lindgren

ARM: OMAP: Make plat/common.h local to mach-omap1 and mach-omap2

We cannot keep this in plat/common.h for common zImage support.
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 3a8761c0
......@@ -26,7 +26,7 @@
#ifndef __ARCH_ARM_MACH_OMAP1_COMMON_H
#define __ARCH_ARM_MACH_OMAP1_COMMON_H
#include <plat/common.h>
#include "../plat-omap/common.h"
#include <linux/mtd/mtd.h>
#include <linux/i2c-omap.h>
......
......@@ -22,7 +22,7 @@
#include <linux/err.h>
#include <linux/io.h>
#include <plat/common.h>
#include "../plat-omap/common.h"
#include "cm.h"
#include "cm33xx.h"
......
......@@ -36,7 +36,8 @@
#include <plat/cpu.h>
#include <plat/serial.h>
#include <plat/common.h>
#include "../plat-omap/common.h"
#include "i2c.h"
......
......@@ -12,7 +12,7 @@
#include <plat/omap_hwmod.h>
#include <plat/serial.h>
#include <plat-omap/dma-omap.h>
#include <plat/common.h>
#include "../plat-omap/common.h"
#include "hdq1w.h"
#include "omap_hwmod_common_data.h"
......
......@@ -28,9 +28,10 @@
#include <linux/platform_data/spi-omap2-mcspi.h>
#include <linux/platform_data/asoc-ti-mcbsp.h>
#include <plat/dmtimer.h>
#include <plat/common.h>
#include <plat/iommu.h>
#include "../plat-omap/common.h"
#include "omap_hwmod_common_data.h"
#include "cm1_44xx.h"
#include "cm2_44xx.h"
......
......@@ -19,7 +19,7 @@
#include <linux/err.h>
#include <linux/io.h>
#include <plat/common.h>
#include "../plat-omap/common.h"
#include "common.h"
#include "prm33xx.h"
......
......@@ -24,7 +24,7 @@
#include <linux/interrupt.h>
#include <linux/slab.h>
#include <plat/common.h>
#include "../plat-omap/common.h"
#include <plat/prcm.h>
#include "prm2xxx_3xxx.h"
......
......@@ -16,7 +16,7 @@
#include <linux/io.h>
#include <linux/dma-mapping.h>
#include <plat/common.h>
#include "common.h"
#include <plat/vram.h>
#include <linux/platform_data/dsp-omap.h>
#include <plat-omap/dma-omap.h>
......
/*
* arch/arm/plat-omap/include/mach/common.h
*
* Header for code common to all OMAP machines.
* Header for shared OMAP code in plat-omap.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
......@@ -27,13 +25,12 @@
#ifndef __ARCH_ARM_MACH_OMAP_COMMON_H
#define __ARCH_ARM_MACH_OMAP_COMMON_H
#include <plat/omap_hwmod.h>
extern int __init omap_init_clocksource_32k(void __iomem *vbase);
extern void __init omap_check_revision(void);
extern void omap_reserve(void);
struct omap_hwmod;
extern int omap_dss_reset(struct omap_hwmod *);
void omap_sram_init(void);
......
......@@ -22,7 +22,7 @@
#include <asm/mach/time.h>
#include <asm/sched_clock.h>
#include <plat/common.h>
#include "common.h"
#include <plat/clock.h>
/* OMAP2_32KSYNCNT_CR_OFF: offset of 32ksync counter register */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment