Commit 3dc23f78 authored by Stefan Roese's avatar Stefan Roese Committed by Tom Rini

arm: marvell: Move arch/kirkwood.h to arch/soc.h

This move makes is possible to use this header not only from kirkwood
platforms but from all Marvell mvebu platforms.
Signed-off-by: default avatarStefan Roese <sr@denx.de>
Tested-by: default avatarLuka Perkov <luka@openwrt.org>
Acked-by: default avatarPrafulla Wadaskar <prafulla@marvell.com>
parent d80cca29
......@@ -12,7 +12,7 @@
#include <u-boot/md5.h>
#include <asm/io.h>
#include <asm/arch/cpu.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#include <mvebu_mmc.h>
#define BUFLEN 16
......
......@@ -12,7 +12,7 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/cpu.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#include <asm/arch/mpp.h>
static u32 kirkwood_variant(void)
......
......@@ -23,7 +23,7 @@
#error "SOC Name not defined"
#endif /* CONFIG_KW88F6281 */
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#define CONFIG_ARM926EJS 1 /* Basic Architecture */
#define CONFIG_SYS_CACHELINE_SIZE 32
/* default Dcache Line length for kirkwood */
......
......@@ -10,7 +10,7 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/cpu.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
DECLARE_GLOBAL_DATA_PTR;
......
......@@ -7,7 +7,7 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#define UBOOT_CNTR 0 /* counter to use for uboot timer */
......
......@@ -13,7 +13,7 @@
#include <command.h>
#include <i2c.h>
#include <asm/arch/cpu.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#include <asm/arch/mpp.h>
#include <asm/arch/gpio.h>
......
......@@ -12,7 +12,7 @@
#include <common.h>
#include <command.h>
#include <asm/arch/cpu.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#include <asm/arch/mpp.h>
#include <asm/arch/gpio.h>
......
......@@ -12,7 +12,7 @@
#include <common.h>
#include <command.h>
#include <asm/arch/cpu.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#include <asm/arch/mpp.h>
#include <asm/arch/gpio.h>
......
......@@ -12,7 +12,7 @@
#include <common.h>
#include <miiphy.h>
#include <asm/arch/cpu.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#include <asm/arch/mpp.h>
#include "dreamplug.h"
......
......@@ -9,7 +9,7 @@
#include <common.h>
#include <miiphy.h>
#include <asm/arch/cpu.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#include <asm/arch/mpp.h>
#include "guruplug.h"
......
......@@ -11,7 +11,7 @@
#include <common.h>
#include <netdev.h>
#include <asm/arch/cpu.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#include <asm/arch/mpp.h>
#include "mv88f6281gtw_ge.h"
......
......@@ -14,7 +14,7 @@
#include <common.h>
#include <miiphy.h>
#include <asm/arch/cpu.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#include <asm/arch/mpp.h>
#include "openrd.h"
......
......@@ -10,7 +10,7 @@
#include <miiphy.h>
#include <netdev.h>
#include <asm/arch/cpu.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#include <asm/arch/mpp.h>
#include "rd6281a.h"
......
......@@ -9,7 +9,7 @@
#include <common.h>
#include <miiphy.h>
#include <asm/arch/cpu.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#include <asm/arch/mpp.h>
#include "sheevaplug.h"
......
......@@ -11,7 +11,7 @@
#include <common.h>
#include <miiphy.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#include <asm/arch/mpp.h>
#include <asm/arch/cpu.h>
#include <asm/io.h>
......
......@@ -14,7 +14,7 @@
#include <common.h>
#include <miiphy.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#include <asm/arch/mpp.h>
#include <asm/arch/cpu.h>
#include <asm/io.h>
......
......@@ -15,7 +15,7 @@
#include <miiphy.h>
#include <spi.h>
#include <spi_flash.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#include <asm/arch/cpu.h>
#include <asm/arch/mpp.h>
#include <asm/arch/gpio.h>
......
......@@ -13,7 +13,7 @@
#include <common.h>
#include <miiphy.h>
#include <asm/arch/cpu.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#include <asm/arch/mpp.h>
#include "pogo_e02.h"
......
......@@ -14,7 +14,7 @@
#include <miiphy.h>
#include <netdev.h>
#include <asm/arch/cpu.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#include <asm/arch/mpp.h>
#include <asm/arch/gpio.h>
#include "dns325.h"
......
......@@ -9,7 +9,7 @@
#include <common.h>
#include <miiphy.h>
#include <asm/arch/cpu.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#include <asm/arch/mpp.h>
#include "iconnect.h"
......
......@@ -8,7 +8,7 @@
#include <common.h>
#include <miiphy.h>
#include <asm/arch/cpu.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#include <asm/arch/mpp.h>
#include <asm/io.h>
......
......@@ -20,7 +20,7 @@
#include <spi.h>
#include <asm/io.h>
#include <asm/arch/cpu.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#include <asm/arch/mpp.h>
#include "../common/common.h"
......
......@@ -11,7 +11,7 @@
#include <miiphy.h>
#include <asm/io.h>
#include <asm/arch/cpu.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#include <asm/arch/mpp.h>
#include "ib62x0.h"
......
......@@ -12,7 +12,7 @@
#if defined(CONFIG_ORION5X)
#include <asm/arch/orion5x.h>
#elif defined(CONFIG_KIRKWOOD)
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#endif
/* SATA port registers */
......
......@@ -16,7 +16,7 @@
#include <common.h>
#include <asm/bitops.h>
#include <asm/io.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#include <asm/arch/gpio.h>
static unsigned long gpio_valid_input[BITS_TO_LONGS(GPIO_MAX)];
......
......@@ -21,7 +21,7 @@
#if defined(CONFIG_ORION5X)
#include <asm/arch/orion5x.h>
#elif defined(CONFIG_KIRKWOOD)
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#elif defined(CONFIG_SUNXI)
#include <asm/arch/i2c.h>
#else
......
......@@ -14,7 +14,7 @@
#include <mmc.h>
#include <asm/io.h>
#include <asm/arch/cpu.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#include <mvebu_mmc.h>
DECLARE_GLOBAL_DATA_PTR;
......
......@@ -8,7 +8,7 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#include <nand.h>
/* NAND Flash Soc registers */
......
......@@ -24,7 +24,7 @@
#include <asm/arch/cpu.h>
#if defined(CONFIG_KIRKWOOD)
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#elif defined(CONFIG_ORION5X)
#include <asm/arch/orion5x.h>
#elif defined(CONFIG_DOVE)
......
......@@ -12,7 +12,7 @@
#ifndef _MVRTC_H_
#define _MVRTC_H_
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#include <compiler.h>
/* RTC registers */
......
......@@ -12,7 +12,7 @@
#include <malloc.h>
#include <spi.h>
#include <asm/io.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#include <asm/arch/spi.h>
#include <asm/arch/mpp.h>
......
......@@ -13,7 +13,7 @@
#include <asm/arch/cpu.h>
#if defined(CONFIG_KIRKWOOD)
#include <asm/arch/kirkwood.h>
#include <asm/arch/soc.h>
#elif defined(CONFIG_ORION5X)
#include <asm/arch/orion5x.h>
#endif
......
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