Commit e99b32e2 authored by Tony Lindgren's avatar Tony Lindgren

ARM: OMAP1: Fix randconfig builds if ARCH_OMAP15XX not selected

With the omap1 SPARSE_IRQ changes mach/irqs.h is no longer
automatically included. Turns out now we rely on ARCH_OMAP15XX
including hardware.h from memory.h, so without ARCH_OMAP15XX
we get build failures.

As we have legacy drivers still relying on these indirect
includes, let's not add more mach includes to the drivers.
Those have to be removed anyways for multiplatform support.

Let's fix up mach-omap1 to include soc.h where cpu_is_omap
checks are done, and common.h for board-*.c files.

But let's keep the indirect memory.h include for now to avoid
unnecessary churn in the drivers.
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 685e2d08
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <linux/i2c/tps65010.h> #include <linux/i2c/tps65010.h>
#include "common.h"
#include "board-h3.h" #include "board-h3.h"
#include "mmc.h" #include "mmc.h"
......
...@@ -36,6 +36,8 @@ ...@@ -36,6 +36,8 @@
#include <mach/irqs.h> #include <mach/irqs.h>
#include "soc.h"
#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850) #if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
void omap7xx_map_io(void); void omap7xx_map_io(void);
#else #else
......
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
#include <mach/irqs.h> #include <mach/irqs.h>
#include "soc.h"
#define OMAP1610_GPIO1_BASE 0xfffbe400 #define OMAP1610_GPIO1_BASE 0xfffbe400
#define OMAP1610_GPIO2_BASE 0xfffbec00 #define OMAP1610_GPIO2_BASE 0xfffbec00
#define OMAP1610_GPIO3_BASE 0xfffbb400 #define OMAP1610_GPIO3_BASE 0xfffbb400
......
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
#include <mach/irqs.h> #include <mach/irqs.h>
#include "soc.h"
#define OMAP7XX_GPIO1_BASE 0xfffbc000 #define OMAP7XX_GPIO1_BASE 0xfffbc000
#define OMAP7XX_GPIO2_BASE 0xfffbc800 #define OMAP7XX_GPIO2_BASE 0xfffbc800
#define OMAP7XX_GPIO3_BASE 0xfffbd000 #define OMAP7XX_GPIO3_BASE 0xfffbd000
......
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
#ifndef __ASM_ARCH_MEMORY_H #ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H #define __ASM_ARCH_MEMORY_H
/* REVISIT: omap1 legacy drivers still rely on this */
#include <mach/soc.h>
/* /*
* Bus address is physical address, except for OMAP-1510 Local Bus. * Bus address is physical address, except for OMAP-1510 Local Bus.
* OMAP-1510 bus address is translated into a Local Bus address if the * OMAP-1510 bus address is translated into a Local Bus address if the
...@@ -14,7 +17,6 @@ ...@@ -14,7 +17,6 @@
* because of the strncmp(). * because of the strncmp().
*/ */
#if defined(CONFIG_ARCH_OMAP15XX) && !defined(__ASSEMBLER__) #if defined(CONFIG_ARCH_OMAP15XX) && !defined(__ASSEMBLER__)
#include <mach/soc.h>
/* /*
* OMAP-1510 Local Bus address offset * OMAP-1510 Local Bus address offset
......
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
#include "iomap.h" #include "iomap.h"
#include "clock.h" #include "clock.h"
#include "pm.h" #include "pm.h"
#include "soc.h"
#include "sram.h" #include "sram.h"
static unsigned int arm_sleep_save[ARM_SLEEP_SAVE_SIZE]; static unsigned int arm_sleep_save[ARM_SLEEP_SAVE_SIZE];
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <mach/mux.h> #include <mach/mux.h>
#include "pm.h" #include "pm.h"
#include "soc.h"
static struct clk * uart1_ck; static struct clk * uart1_ck;
static struct clk * uart2_ck; static struct clk * uart2_ck;
......
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