Commit ebea60be authored by Stephen Boyd's avatar Stephen Boyd Committed by David Brown

ARM: msm: Move mach/board.h contents to common.h

The contents of mach/board.h are only used by files within
mach-msm so there is no need to export this file outside of the
mach-msm directory. Move the contents of the file to common.h to
allow us to compile MSM in the multi-platform kernel.

Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Acked-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: default avatarDavid Brown <davidb@codeaurora.org>
parent c602520f
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/board.h>
#include "common.h" #include "common.h"
static void __init msm8x60_init_late(void) static void __init msm8x60_init_late(void)
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include <asm/setup.h> #include <asm/setup.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/board.h>
#include <mach/msm_iomap.h> #include <mach/msm_iomap.h>
#include <linux/mtd/nand.h> #include <linux/mtd/nand.h>
......
...@@ -28,12 +28,12 @@ ...@@ -28,12 +28,12 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <mach/board.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include "board-mahimahi.h" #include "board-mahimahi.h"
#include "devices.h" #include "devices.h"
#include "proc_comm.h" #include "proc_comm.h"
#include "common.h"
static uint debug_uart; static uint debug_uart;
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include <asm/memory.h> #include <asm/memory.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <mach/board.h>
#include <mach/msm_iomap.h> #include <mach/msm_iomap.h>
#include <mach/dma.h> #include <mach/dma.h>
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <mach/board.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/sirc.h> #include <mach/sirc.h>
#include <mach/vreg.h> #include <mach/vreg.h>
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <mach/vreg.h> #include <mach/vreg.h>
#include <mach/board.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/delay.h> #include <asm/delay.h>
...@@ -41,6 +40,7 @@ ...@@ -41,6 +40,7 @@
#include "board-sapphire.h" #include "board-sapphire.h"
#include "proc_comm.h" #include "proc_comm.h"
#include "devices.h" #include "devices.h"
#include "common.h"
void msm_init_irq(void); void msm_init_irq(void);
void msm_init_gpio(void); void msm_init_gpio(void);
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <mach/board.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/msm_iomap.h> #include <mach/msm_iomap.h>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#ifndef __ARCH_ARM_MACH_MSM_BOARD_TROUT_H #ifndef __ARCH_ARM_MACH_MSM_BOARD_TROUT_H
#define __ARCH_ARM_MACH_MSM_BOARD_TROUT_H #define __ARCH_ARM_MACH_MSM_BOARD_TROUT_H
#include <mach/board.h> #include "common.h"
#define MSM_SMI_BASE 0x00000000 #define MSM_SMI_BASE 0x00000000
#define MSM_SMI_SIZE 0x00800000 #define MSM_SMI_SIZE 0x00800000
......
...@@ -26,4 +26,19 @@ extern void __iomem *__msm_ioremap_caller(phys_addr_t phys_addr, size_t size, ...@@ -26,4 +26,19 @@ extern void __iomem *__msm_ioremap_caller(phys_addr_t phys_addr, size_t size,
extern struct smp_operations msm_smp_ops; extern struct smp_operations msm_smp_ops;
extern void msm_cpu_die(unsigned int cpu); extern void msm_cpu_die(unsigned int cpu);
struct msm_mmc_platform_data;
extern void msm_add_devices(void);
extern void msm_init_irq(void);
extern void msm_init_gpio(void);
extern int msm_add_sdcc(unsigned int controller,
struct msm_mmc_platform_data *plat,
unsigned int stat_irq, unsigned long stat_irq_flags);
#if defined(CONFIG_MSM_SMD) && defined(CONFIG_DEBUG_FS)
extern int smd_debugfs_init(void);
#else
static inline int smd_debugfs_init(void) { return 0; }
#endif
#endif #endif
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/msm_iomap.h> #include <mach/msm_iomap.h>
#include <mach/dma.h> #include <mach/dma.h>
#include <mach/board.h>
#include "devices.h" #include "devices.h"
#include "smd_private.h" #include "smd_private.h"
#include "common.h"
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
......
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/msm_iomap.h> #include <mach/msm_iomap.h>
#include <mach/dma.h> #include <mach/dma.h>
#include <mach/board.h>
#include "devices.h" #include "devices.h"
#include "common.h"
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
......
/* arch/arm/mach-msm/include/mach/board.h
*
* Copyright (C) 2007 Google, Inc.
* Author: Brian Swetland <swetland@google.com>
*
* This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and
* may be copied, distributed, and modified under those terms.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#ifndef __ASM_ARCH_MSM_BOARD_H
#define __ASM_ARCH_MSM_BOARD_H
#include <linux/types.h>
#include <linux/platform_data/mmc-msm_sdcc.h>
/* common init routines for use by arch/arm/mach-msm/board-*.c */
void __init msm_add_devices(void);
void __init msm_init_irq(void);
void __init msm_init_gpio(void);
int __init msm_add_sdcc(unsigned int controller,
struct msm_mmc_platform_data *plat,
unsigned int stat_irq, unsigned long stat_irq_flags);
#if defined(CONFIG_MSM_SMD) && defined(CONFIG_DEBUG_FS)
int smd_debugfs_init(void);
#else
static inline int smd_debugfs_init(void) { return 0; }
#endif
#endif
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/bug.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/export.h> #include <linux/export.h>
...@@ -27,8 +28,6 @@ ...@@ -27,8 +28,6 @@
#include <mach/msm_iomap.h> #include <mach/msm_iomap.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/board.h>
#include "common.h" #include "common.h"
#define MSM_CHIP_DEVICE_TYPE(name, chip, mem_type) { \ #define MSM_CHIP_DEVICE_TYPE(name, chip, mem_type) { \
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/platform_data/video-msm_fb.h> #include <linux/platform_data/video-msm_fb.h>
#include <mach/board.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/debugfs.h> #include <linux/debugfs.h>
......
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