mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
ARM: OMAP: Make plat/omap_hwmod.h local to mach-omap2
Let's make omap_hwmod local to mach-omap2 for ARM common zImage support. Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
parent
2ba30f0f23
commit
2a296c8f89
34 changed files with 47 additions and 36 deletions
|
@ -19,7 +19,7 @@
|
|||
|
||||
#include "powerdomain.h"
|
||||
#include <plat/clock.h>
|
||||
#include <plat/omap_hwmod.h>
|
||||
#include "omap_hwmod.h"
|
||||
#include <plat/cpu.h>
|
||||
|
||||
/*
|
||||
|
|
|
@ -23,9 +23,10 @@
|
|||
#include <asm/mach-types.h>
|
||||
#include <asm/mach/map.h>
|
||||
|
||||
#include "iomap.h"
|
||||
#include <plat-omap/dma-omap.h>
|
||||
#include <plat/omap_hwmod.h>
|
||||
|
||||
#include "iomap.h"
|
||||
#include "omap_hwmod.h"
|
||||
#include "omap_device.h"
|
||||
#include "omap4-keypad.h"
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include <linux/delay.h>
|
||||
|
||||
#include <video/omapdss.h>
|
||||
#include <plat/omap_hwmod.h>
|
||||
#include "omap_hwmod.h"
|
||||
#include "omap_device.h"
|
||||
#include <plat/omap-pm.h>
|
||||
#include "common.h"
|
||||
|
|
|
@ -28,9 +28,9 @@
|
|||
#include <linux/init.h>
|
||||
#include <linux/device.h>
|
||||
|
||||
#include <plat/omap_hwmod.h>
|
||||
#include <plat-omap/dma-omap.h>
|
||||
|
||||
#include "omap_hwmod.h"
|
||||
#include "omap_device.h"
|
||||
|
||||
#define OMAP2_DMA_STRIDE 0x60
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include <linux/dma-mapping.h>
|
||||
|
||||
#include "omap_device.h"
|
||||
#include <plat/omap_hwmod.h>
|
||||
#include "omap_hwmod.h"
|
||||
|
||||
#if defined(CONFIG_DRM_OMAP) || (CONFIG_DRM_OMAP_MODULE)
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include <linux/of.h>
|
||||
#include <linux/platform_data/gpio-omap.h>
|
||||
|
||||
#include <plat/omap_hwmod.h>
|
||||
#include "omap_hwmod.h"
|
||||
#include "omap_device.h"
|
||||
#include <plat/omap-pm.h>
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
#include <linux/err.h>
|
||||
#include <linux/platform_device.h>
|
||||
|
||||
#include <plat/omap_hwmod.h>
|
||||
#include "omap_hwmod.h"
|
||||
#include "omap_device.h"
|
||||
#include "hdq1w.h"
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#ifndef ARCH_ARM_MACH_OMAP2_HDQ1W_H
|
||||
#define ARCH_ARM_MACH_OMAP2_HDQ1W_H
|
||||
|
||||
#include <plat/omap_hwmod.h>
|
||||
#include "omap_hwmod.h"
|
||||
|
||||
/*
|
||||
* XXX A future cleanup patch should modify
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include <linux/err.h>
|
||||
#include <linux/hwspinlock.h>
|
||||
|
||||
#include <plat/omap_hwmod.h>
|
||||
#include "omap_hwmod.h"
|
||||
#include "omap_device.h"
|
||||
|
||||
static struct hwspinlock_pdata omap_hwspinlock_pdata __initdata = {
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
*/
|
||||
|
||||
#include "common.h"
|
||||
#include <plat/omap_hwmod.h>
|
||||
#include "omap_hwmod.h"
|
||||
#include "omap_device.h"
|
||||
|
||||
#include "mux.h"
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
#include <plat/serial.h>
|
||||
#include <plat/omap-pm.h>
|
||||
#include <plat/omap_hwmod.h>
|
||||
#include "omap_hwmod.h"
|
||||
#include <plat/multi.h>
|
||||
#include <plat-omap/dma-omap.h>
|
||||
|
||||
|
|
|
@ -25,9 +25,9 @@
|
|||
#include <linux/err.h>
|
||||
#include <linux/platform_data/gpio-omap.h>
|
||||
|
||||
#include <plat/omap_hwmod.h>
|
||||
#include "common.h"
|
||||
#include "control.h"
|
||||
#include "omap_hwmod.h"
|
||||
#include "omap_device.h"
|
||||
#include "mux.h"
|
||||
#include "mmc.h"
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
#include <linux/interrupt.h>
|
||||
|
||||
|
||||
#include <plat/omap_hwmod.h>
|
||||
#include "omap_hwmod.h"
|
||||
|
||||
#include "control.h"
|
||||
#include "mux.h"
|
||||
|
|
|
@ -90,7 +90,7 @@
|
|||
#include <linux/notifier.h>
|
||||
|
||||
#include "omap_device.h"
|
||||
#include <plat/omap_hwmod.h>
|
||||
#include "omap_hwmod.h"
|
||||
#include <plat/clock.h>
|
||||
|
||||
/* These parameters are passed to _omap_device_{de,}activate() */
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
#include <linux/kernel.h>
|
||||
#include <linux/platform_device.h>
|
||||
|
||||
#include <plat/omap_hwmod.h>
|
||||
#include "omap_hwmod.h"
|
||||
|
||||
extern struct dev_pm_domain omap_device_pm_domain;
|
||||
|
||||
|
|
|
@ -140,7 +140,7 @@
|
|||
#include <linux/bootmem.h>
|
||||
|
||||
#include <plat/clock.h>
|
||||
#include <plat/omap_hwmod.h>
|
||||
#include "omap_hwmod.h"
|
||||
#include <plat/prcm.h>
|
||||
|
||||
#include "soc.h"
|
||||
|
|
|
@ -16,9 +16,10 @@
|
|||
#include <linux/i2c-omap.h>
|
||||
#include <linux/platform_data/spi-omap2-mcspi.h>
|
||||
|
||||
#include <plat/omap_hwmod.h>
|
||||
#include <plat-omap/dma-omap.h>
|
||||
#include <plat/dmtimer.h>
|
||||
|
||||
#include "omap_hwmod.h"
|
||||
#include "l3_2xxx.h"
|
||||
#include "l4_2xxx.h"
|
||||
|
||||
|
|
|
@ -17,9 +17,10 @@
|
|||
#include <linux/platform_data/asoc-ti-mcbsp.h>
|
||||
#include <linux/platform_data/spi-omap2-mcspi.h>
|
||||
|
||||
#include <plat/omap_hwmod.h>
|
||||
#include <plat-omap/dma-omap.h>
|
||||
#include <plat/dmtimer.h>
|
||||
|
||||
#include "omap_hwmod.h"
|
||||
#include "mmc.h"
|
||||
#include "l3_2xxx.h"
|
||||
|
||||
|
|
|
@ -13,9 +13,10 @@
|
|||
*/
|
||||
#include <asm/sizes.h>
|
||||
|
||||
#include <plat/omap_hwmod.h>
|
||||
#include <plat/serial.h>
|
||||
|
||||
#include "omap_hwmod.h"
|
||||
|
||||
#include "omap_hwmod_common_data.h"
|
||||
|
||||
struct omap_hwmod_addr_space omap2430_mmc1_addr_space[] = {
|
||||
|
|
|
@ -9,10 +9,13 @@
|
|||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*/
|
||||
#include <plat/omap_hwmod.h>
|
||||
|
||||
#include <plat/serial.h>
|
||||
#include <plat-omap/dma-omap.h>
|
||||
|
||||
#include "../plat-omap/common.h"
|
||||
|
||||
#include "omap_hwmod.h"
|
||||
#include "hdq1w.h"
|
||||
|
||||
#include "omap_hwmod_common_data.h"
|
||||
|
|
|
@ -13,8 +13,9 @@
|
|||
*/
|
||||
#include <asm/sizes.h>
|
||||
|
||||
#include <plat/omap_hwmod.h>
|
||||
#include <plat/serial.h>
|
||||
|
||||
#include "omap_hwmod.h"
|
||||
#include "l3_2xxx.h"
|
||||
#include "l4_2xxx.h"
|
||||
|
||||
|
|
|
@ -8,13 +8,14 @@
|
|||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*/
|
||||
#include <plat/omap_hwmod.h>
|
||||
|
||||
#include <plat/serial.h>
|
||||
#include <linux/platform_data/gpio-omap.h>
|
||||
#include <plat-omap/dma-omap.h>
|
||||
#include <plat/dmtimer.h>
|
||||
#include <linux/platform_data/spi-omap2-mcspi.h>
|
||||
|
||||
#include "omap_hwmod.h"
|
||||
#include "omap_hwmod_common_data.h"
|
||||
#include "cm-regbits-24xx.h"
|
||||
#include "prm-regbits-24xx.h"
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
#include <linux/i2c-omap.h>
|
||||
|
||||
#include <plat/omap_hwmod.h>
|
||||
#include "omap_hwmod.h"
|
||||
#include <plat/cpu.h>
|
||||
#include <linux/platform_data/gpio-omap.h>
|
||||
#include <linux/platform_data/spi-omap2-mcspi.h>
|
||||
|
|
|
@ -19,9 +19,9 @@
|
|||
#include <linux/power/smartreflex.h>
|
||||
#include <linux/platform_data/gpio-omap.h>
|
||||
|
||||
#include <plat/omap_hwmod.h>
|
||||
#include <plat-omap/dma-omap.h>
|
||||
#include <plat/serial.h>
|
||||
|
||||
#include "l3_3xxx.h"
|
||||
#include "l4_3xxx.h"
|
||||
#include <linux/platform_data/asoc-ti-mcbsp.h>
|
||||
|
@ -32,6 +32,7 @@
|
|||
#include "am35xx.h"
|
||||
|
||||
#include "soc.h"
|
||||
#include "omap_hwmod.h"
|
||||
#include "omap_hwmod_common_data.h"
|
||||
#include "prm-regbits-34xx.h"
|
||||
#include "cm-regbits-34xx.h"
|
||||
|
|
|
@ -23,8 +23,8 @@
|
|||
#include <linux/power/smartreflex.h>
|
||||
#include <linux/i2c-omap.h>
|
||||
|
||||
#include <plat/omap_hwmod.h>
|
||||
#include <plat-omap/dma-omap.h>
|
||||
|
||||
#include <linux/platform_data/spi-omap2-mcspi.h>
|
||||
#include <linux/platform_data/asoc-ti-mcbsp.h>
|
||||
#include <plat/dmtimer.h>
|
||||
|
@ -32,6 +32,7 @@
|
|||
|
||||
#include "../plat-omap/common.h"
|
||||
|
||||
#include "omap_hwmod.h"
|
||||
#include "omap_hwmod_common_data.h"
|
||||
#include "cm1_44xx.h"
|
||||
#include "cm2_44xx.h"
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
* data and their integration with other OMAP modules and Linux.
|
||||
*/
|
||||
|
||||
#include <plat/omap_hwmod.h>
|
||||
#include "omap_hwmod.h"
|
||||
|
||||
#include "omap_hwmod_common_data.h"
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#ifndef __ARCH_ARM_MACH_OMAP2_OMAP_HWMOD_COMMON_DATA_H
|
||||
#define __ARCH_ARM_MACH_OMAP2_OMAP_HWMOD_COMMON_DATA_H
|
||||
|
||||
#include <plat/omap_hwmod.h>
|
||||
#include "omap_hwmod.h"
|
||||
|
||||
#include "common.h"
|
||||
#include "display.h"
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#ifndef __ARCH_ARM_MACH_OMAP2_OMAP_OPP_DATA_H
|
||||
#define __ARCH_ARM_MACH_OMAP2_OMAP_OPP_DATA_H
|
||||
|
||||
#include <plat/omap_hwmod.h>
|
||||
#include "omap_hwmod.h"
|
||||
|
||||
#include "voltage.h"
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
#include <asm/pmu.h>
|
||||
|
||||
#include <plat/omap_hwmod.h>
|
||||
#include "omap_hwmod.h"
|
||||
#include "omap_device.h"
|
||||
|
||||
static char *omap2_pmu_oh_names[] = {"mpu"};
|
||||
|
|
|
@ -28,13 +28,13 @@
|
|||
#include <linux/console.h>
|
||||
|
||||
#include <plat/omap-serial.h>
|
||||
#include "common.h"
|
||||
#include <plat-omap/dma-omap.h>
|
||||
#include <plat/omap_hwmod.h>
|
||||
#include "omap_device.h"
|
||||
#include <plat/omap-pm.h>
|
||||
#include <plat/serial.h>
|
||||
|
||||
#include "common.h"
|
||||
#include "omap_hwmod.h"
|
||||
#include "omap_device.h"
|
||||
#include "prm2xxx_3xxx.h"
|
||||
#include "pm.h"
|
||||
#include "cm2xxx_3xxx.h"
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
#include <asm/sched_clock.h>
|
||||
|
||||
#include <asm/arch_timer.h>
|
||||
#include <plat/omap_hwmod.h>
|
||||
#include "omap_hwmod.h"
|
||||
#include "omap_device.h"
|
||||
#include <plat/dmtimer.h>
|
||||
#include <plat/omap-pm.h>
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
#include <linux/io.h>
|
||||
#include <linux/err.h>
|
||||
|
||||
#include <plat/omap_hwmod.h>
|
||||
#include "omap_hwmod.h"
|
||||
|
||||
#include "wd_timer.h"
|
||||
#include "common.h"
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
#ifndef __ARCH_ARM_MACH_OMAP2_WD_TIMER_H
|
||||
#define __ARCH_ARM_MACH_OMAP2_WD_TIMER_H
|
||||
|
||||
#include <plat/omap_hwmod.h>
|
||||
#include "omap_hwmod.h"
|
||||
|
||||
extern int omap2_wd_timer_disable(struct omap_hwmod *oh);
|
||||
extern int omap2_wd_timer_reset(struct omap_hwmod *oh);
|
||||
|
|
Loading…
Reference in a new issue