summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/arch-kirkwood/soc.h
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2015-02-20 17:04:15 +0900
committerTom Rini <trini@ti.com>2015-02-21 08:23:52 -0500
commitea3857230c2d7428e8c22a9d063b4a5b86b34a0c (patch)
tree4f8044d927d627bf11548e9f4393f94d4277fb07 /arch/arm/include/asm/arch-kirkwood/soc.h
parent3d357619a509eb2b39dc5056731ca08bc2b23e62 (diff)
downloadblackbird-obmc-uboot-ea3857230c2d7428e8c22a9d063b4a5b86b34a0c.tar.gz
blackbird-obmc-uboot-ea3857230c2d7428e8c22a9d063b4a5b86b34a0c.zip
ARM: kirkwood: move SoC headers to mach-kirkwood/include/mach
Move arch/arm/include/asm/arch-kirkwood/* -> arch/arm/mach-kirkwood/include/mach/* Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Acked-by: Stefan Roese <sr@denx.de> Cc: Prafulla Wadaskar <prafulla@marvell.com> Cc: Luka Perkov <luka.perkov@sartura.hr>
Diffstat (limited to 'arch/arm/include/asm/arch-kirkwood/soc.h')
-rw-r--r--arch/arm/include/asm/arch-kirkwood/soc.h74
1 files changed, 0 insertions, 74 deletions
diff --git a/arch/arm/include/asm/arch-kirkwood/soc.h b/arch/arm/include/asm/arch-kirkwood/soc.h
deleted file mode 100644
index 58ed71b186..0000000000
--- a/arch/arm/include/asm/arch-kirkwood/soc.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * (C) Copyright 2009
- * Marvell Semiconductor <www.marvell.com>
- * Written-by: Prafulla Wadaskar <prafulla@marvell.com>
- *
- * Header file for the Marvell's Feroceon CPU core.
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#ifndef _ASM_ARCH_KIRKWOOD_H
-#define _ASM_ARCH_KIRKWOOD_H
-
-#if defined (CONFIG_FEROCEON_88FR131) || defined (CONFIG_SHEEVA_88SV131)
-
-/* SOC specific definations */
-#define INTREG_BASE 0xd0000000
-#define KW_REGISTER(x) (KW_REGS_PHY_BASE + x)
-#define KW_OFFSET_REG (INTREG_BASE + 0x20080)
-
-/* undocumented registers */
-#define KW_REG_UNDOC_0x1470 (KW_REGISTER(0x1470))
-#define KW_REG_UNDOC_0x1478 (KW_REGISTER(0x1478))
-
-#define MVEBU_SDRAM_BASE (KW_REGISTER(0x1500))
-#define KW_TWSI_BASE (KW_REGISTER(0x11000))
-#define KW_UART0_BASE (KW_REGISTER(0x12000))
-#define KW_UART1_BASE (KW_REGISTER(0x12100))
-#define KW_MPP_BASE (KW_REGISTER(0x10000))
-#define MVEBU_GPIO0_BASE (KW_REGISTER(0x10100))
-#define MVEBU_GPIO1_BASE (KW_REGISTER(0x10140))
-#define KW_RTC_BASE (KW_REGISTER(0x10300))
-#define KW_NANDF_BASE (KW_REGISTER(0x10418))
-#define MVEBU_SPI_BASE (KW_REGISTER(0x10600))
-#define KW_CPU_WIN_BASE (KW_REGISTER(0x20000))
-#define KW_CPU_REG_BASE (KW_REGISTER(0x20100))
-#define MVEBU_TIMER_BASE (KW_REGISTER(0x20300))
-#define KW_REG_PCIE_BASE (KW_REGISTER(0x40000))
-#define KW_USB20_BASE (KW_REGISTER(0x50000))
-#define KW_EGIGA0_BASE (KW_REGISTER(0x72000))
-#define KW_EGIGA1_BASE (KW_REGISTER(0x76000))
-#define KW_SATA_BASE (KW_REGISTER(0x80000))
-#define KW_SDIO_BASE (KW_REGISTER(0x90000))
-
-/* Kirkwood Sata controller has two ports */
-#define KW_SATA_PORT0_OFFSET 0x2000
-#define KW_SATA_PORT1_OFFSET 0x4000
-
-/* Kirkwood GbE controller has two ports */
-#define MAX_MVGBE_DEVS 2
-#define MVGBE0_BASE KW_EGIGA0_BASE
-#define MVGBE1_BASE KW_EGIGA1_BASE
-
-/* Kirkwood USB Host controller */
-#define MVUSB0_BASE KW_USB20_BASE
-#define MVUSB0_CPU_ATTR_DRAM_CS0 KWCPU_ATTR_DRAM_CS0
-#define MVUSB0_CPU_ATTR_DRAM_CS1 KWCPU_ATTR_DRAM_CS1
-#define MVUSB0_CPU_ATTR_DRAM_CS2 KWCPU_ATTR_DRAM_CS2
-#define MVUSB0_CPU_ATTR_DRAM_CS3 KWCPU_ATTR_DRAM_CS3
-
-/* Kirkwood CPU memory windows */
-#define MVCPU_WIN_CTRL_DATA KWCPU_WIN_CTRL_DATA
-#define MVCPU_WIN_ENABLE KWCPU_WIN_ENABLE
-#define MVCPU_WIN_DISABLE KWCPU_WIN_DISABLE
-
-#if defined (CONFIG_KW88F6281)
-#include <asm/arch/kw88f6281.h>
-#elif defined (CONFIG_KW88F6192)
-#include <asm/arch/kw88f6192.h>
-#else
-#error "SOC Name not defined"
-#endif /* CONFIG_KW88F6281 */
-#endif /* CONFIG_FEROCEON_88FR131 */
-#endif /* _ASM_ARCH_KIRKWOOD_H */
OpenPOWER on IntegriCloud