浏览代码

spi: kirkwood_spi.c: Change KW_SPI_BASE to MVEBU_SPI_BASE

This makes is possible to use this SPI driver from other MVEBU SoC's as well.
As the upcoming Armada XP support will do.

Signed-off-by: Stefan Roese <sr@denx.de>
Reviewed-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Tested-by: Luka Perkov <luka@openwrt.org>
Acked-by: Prafulla Wadaskar <prafulla@marvell.com>
Stefan Roese 10 年之前
父节点
当前提交
4fd7717e8e
共有 2 个文件被更改,包括 3 次插入2 次删除
  1. 1 1
      arch/arm/include/asm/arch-kirkwood/soc.h
  2. 2 1
      drivers/spi/kirkwood_spi.c

+ 1 - 1
arch/arm/include/asm/arch-kirkwood/soc.h

@@ -30,7 +30,7 @@
 #define MVEBU_GPIO1_BASE			(KW_REGISTER(0x10140))
 #define MVEBU_GPIO1_BASE			(KW_REGISTER(0x10140))
 #define KW_RTC_BASE			(KW_REGISTER(0x10300))
 #define KW_RTC_BASE			(KW_REGISTER(0x10300))
 #define KW_NANDF_BASE			(KW_REGISTER(0x10418))
 #define KW_NANDF_BASE			(KW_REGISTER(0x10418))
-#define KW_SPI_BASE			(KW_REGISTER(0x10600))
+#define MVEBU_SPI_BASE			(KW_REGISTER(0x10600))
 #define KW_CPU_WIN_BASE			(KW_REGISTER(0x20000))
 #define KW_CPU_WIN_BASE			(KW_REGISTER(0x20000))
 #define KW_CPU_REG_BASE			(KW_REGISTER(0x20100))
 #define KW_CPU_REG_BASE			(KW_REGISTER(0x20100))
 #define MVEBU_TIMER_BASE			(KW_REGISTER(0x20300))
 #define MVEBU_TIMER_BASE			(KW_REGISTER(0x20300))

+ 2 - 1
drivers/spi/kirkwood_spi.c

@@ -18,7 +18,8 @@
 #endif
 #endif
 #include <asm/arch-mvebu/spi.h>
 #include <asm/arch-mvebu/spi.h>
 
 
-static struct kwspi_registers *spireg = (struct kwspi_registers *)KW_SPI_BASE;
+static struct kwspi_registers *spireg =
+	(struct kwspi_registers *)MVEBU_SPI_BASE;
 
 
 #ifdef CONFIG_KIRKWOOD
 #ifdef CONFIG_KIRKWOOD
 static u32 cs_spi_mpp_back[2];
 static u32 cs_spi_mpp_back[2];