From: Marek Vasut Date: Wed, 22 Oct 2014 19:56:04 +0000 (+0200) Subject: spi: altera: Move the config options to the top X-Git-Tag: v2015.01-rc1~68^2~2 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cdcdad851f7abc4e3328bae3f675349f3f5cda4a;p=u-boot spi: altera: Move the config options to the top Just move the configuration options scattered all over the driver to the top of the source file. No functional change. Signed-off-by: Marek Vasut Cc: Chin Liang See Cc: Dinh Nguyen Cc: Albert Aribaud Cc: Pavel Machek Acked-by: Pavel Machek Reviewed-by: Jagannadha Sutradharudu Teki --- diff --git a/drivers/spi/altera_spi.c b/drivers/spi/altera_spi.c index c08969d8c9..a4d03d97cf 100644 --- a/drivers/spi/altera_spi.c +++ b/drivers/spi/altera_spi.c @@ -12,6 +12,14 @@ #include #include +#ifndef CONFIG_ALTERA_SPI_IDLE_VAL +#define CONFIG_ALTERA_SPI_IDLE_VAL 0xff +#endif + +#ifndef CONFIG_SYS_ALTERA_SPI_LIST +#define CONFIG_SYS_ALTERA_SPI_LIST { CONFIG_SYS_SPI_BASE } +#endif + struct altera_spi_regs { u32 rxdata; u32 txdata; @@ -35,10 +43,6 @@ struct altera_spi_regs { #define ALTERA_SPI_CONTROL_IE_MSK (1 << 8) #define ALTERA_SPI_CONTROL_SSO_MSK (1 << 10) -#ifndef CONFIG_SYS_ALTERA_SPI_LIST -#define CONFIG_SYS_ALTERA_SPI_LIST { CONFIG_SYS_SPI_BASE } -#endif - static ulong altera_spi_base_list[] = CONFIG_SYS_ALTERA_SPI_LIST; struct altera_spi_slave { @@ -117,10 +121,6 @@ void spi_release_bus(struct spi_slave *slave) writel(0, &altspi->regs->slave_sel); } -#ifndef CONFIG_ALTERA_SPI_IDLE_VAL -# define CONFIG_ALTERA_SPI_IDLE_VAL 0xff -#endif - int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout, void *din, unsigned long flags) {