| Message ID | 1407222612-1048-14-git-send-email-sr@denx.de |
|---|---|
| State | Superseded |
| Delegated to: | Prafulla Wadaskar |
| Headers | show |
On Tue, Aug 5, 2014 at 12:39 PM, Stefan Roese <sr@denx.de> wrote: > 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> > Cc: Jagannadha Sutradharudu Teki <jaganna@xilinx.com> > --- > > Changes in v2: None > > arch/arm/include/asm/arch-kirkwood/soc.h | 2 +- > drivers/spi/kirkwood_spi.c | 3 ++- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/include/asm/arch-kirkwood/soc.h b/arch/arm/include/asm/arch-kirkwood/soc.h > index 37cbae9..379ce13 100644 > --- a/arch/arm/include/asm/arch-kirkwood/soc.h > +++ b/arch/arm/include/asm/arch-kirkwood/soc.h > @@ -30,7 +30,7 @@ > #define MVEBU_GPIO1_BASE (KW_REGISTER(0x10140)) > #define KW_RTC_BASE (KW_REGISTER(0x10300)) > #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_REG_BASE (KW_REGISTER(0x20100)) > #define MVEBU_TIMER_BASE (KW_REGISTER(0x20300)) > diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c > index ce2ba96..e7b0982 100644 > --- a/drivers/spi/kirkwood_spi.c > +++ b/drivers/spi/kirkwood_spi.c > @@ -18,7 +18,8 @@ > #endif > #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 > static u32 cs_spi_mpp_back[2]; > -- Reviewed-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com> thanks!
diff --git a/arch/arm/include/asm/arch-kirkwood/soc.h b/arch/arm/include/asm/arch-kirkwood/soc.h index 37cbae9..379ce13 100644 --- a/arch/arm/include/asm/arch-kirkwood/soc.h +++ b/arch/arm/include/asm/arch-kirkwood/soc.h @@ -30,7 +30,7 @@ #define MVEBU_GPIO1_BASE (KW_REGISTER(0x10140)) #define KW_RTC_BASE (KW_REGISTER(0x10300)) #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_REG_BASE (KW_REGISTER(0x20100)) #define MVEBU_TIMER_BASE (KW_REGISTER(0x20300)) diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c index ce2ba96..e7b0982 100644 --- a/drivers/spi/kirkwood_spi.c +++ b/drivers/spi/kirkwood_spi.c @@ -18,7 +18,8 @@ #endif #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 static u32 cs_spi_mpp_back[2];
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> Cc: Jagannadha Sutradharudu Teki <jaganna@xilinx.com> --- Changes in v2: None arch/arm/include/asm/arch-kirkwood/soc.h | 2 +- drivers/spi/kirkwood_spi.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)