Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f7d63f9 authored by Mike Frysinger's avatar Mike Frysinger
Browse files

Blackfin: boards: clean up redundant/dead spi resources 



The default for the Blackfin SPI driver is 8 bits and dma disabled,
so many of the bfin5xx_spi_chip resources are redundant.  So punt
those parts.

Further, drivers should themselves be declaring 16 bit transfers,
so for those that do, and for the ones which no longer do 16 bit
transfers, drop the bfin5xx_spi_chip resources.

Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent 9be8631b

arch/blackfin/mach-bf518/boards/ezbrd.c

+0 −59
Original line number Diff line number Diff line
@@ -187,43 +187,16 @@ static struct flash_platform_data bfin_spi_flash_data = { 
/* SPI flash chip (m25p64) */

static struct bfin5xx_spi_chip spi_flash_chip_info = {

	.enable_dma = 0,         /* use dma transfer with this chip*/

	.bits_per_word = 8,

};

#endif



#if defined(CONFIG_BFIN_SPI_ADC) \

	|| defined(CONFIG_BFIN_SPI_ADC_MODULE)

/* SPI ADC chip */

static struct bfin5xx_spi_chip spi_adc_chip_info = {

	.enable_dma = 1,         /* use dma transfer with this chip*/

	.bits_per_word = 16,

};

#endif



#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)

#if defined(CONFIG_NET_DSA_KSZ8893M) \

	|| defined(CONFIG_NET_DSA_KSZ8893M_MODULE)

/* SPI SWITCH CHIP */

static struct bfin5xx_spi_chip spi_switch_info = {

	.enable_dma = 0,

	.bits_per_word = 8,

};

#endif

#endif



#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)

static struct bfin5xx_spi_chip mmc_spi_chip_info = {

	.enable_dma = 0,

	.bits_per_word = 8,

};

#endif



#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)

static struct bfin5xx_spi_chip spi_ad7877_chip_info = {

	.enable_dma = 0,

	.bits_per_word = 16,

};



static const struct ad7877_platform_data bfin_ad7877_ts_info = {

	.model			= 7877,

	.vref_delay_usecs	= 50,	/* internal, no capacitor */
@@ -239,21 +212,6 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = { 
};

#endif



#if defined(CONFIG_SND_SOC_WM8731) || defined(CONFIG_SND_SOC_WM8731_MODULE) \

	 && defined(CONFIG_SND_SOC_WM8731_SPI)

static struct bfin5xx_spi_chip spi_wm8731_chip_info = {

	.enable_dma = 0,

	.bits_per_word = 16,

};

#endif



#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)

static struct bfin5xx_spi_chip spidev_chip_info = {

	.enable_dma = 0,

	.bits_per_word = 8,

};

#endif



static struct spi_board_info bfin_spi_board_info[] __initdata = {

#if defined(CONFIG_MTD_M25P80) \

	|| defined(CONFIG_MTD_M25P80_MODULE)
@@ -269,18 +227,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
	},

#endif



#if defined(CONFIG_BFIN_SPI_ADC) \

	|| defined(CONFIG_BFIN_SPI_ADC_MODULE)

	{

		.modalias = "bfin_spi_adc", /* Name of spi_driver for this device */

		.max_speed_hz = 6250000,     /* max spi clock (SCK) speed in HZ */

		.bus_num = 0, /* Framework bus number */

		.chip_select = 1, /* Framework chip select. */

		.platform_data = NULL, /* No spi_driver specific config */

		.controller_data = &spi_adc_chip_info,

	},

#endif



#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)

#if defined(CONFIG_NET_DSA_KSZ8893M) \

	|| defined(CONFIG_NET_DSA_KSZ8893M_MODULE)
@@ -290,7 +236,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
		.bus_num = 0,

		.chip_select = 1,

		.platform_data = NULL,

		.controller_data = &spi_switch_info,

		.mode = SPI_MODE_3,

	},

#endif
@@ -314,7 +259,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
		.max_speed_hz	= 12500000,     /* max spi clock (SCK) speed in HZ */

		.bus_num	= 0,

		.chip_select  = 2,

		.controller_data = &spi_ad7877_chip_info,

	},

#endif

#if defined(CONFIG_SND_SOC_WM8731) || defined(CONFIG_SND_SOC_WM8731_MODULE) \
@@ -324,7 +268,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
		.max_speed_hz	= 3125000,     /* max spi clock (SCK) speed in HZ */

		.bus_num	= 0,

		.chip_select    = 5,

		.controller_data = &spi_wm8731_chip_info,

		.mode = SPI_MODE_0,

	},

#endif
@@ -334,7 +277,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
		.max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */

		.bus_num = 0,

		.chip_select = 1,

		.controller_data = &spidev_chip_info,

	},

#endif

#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)
@@ -343,7 +285,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
		.max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */

		.bus_num = 0,

		.chip_select = 1,

		.controller_data = &lq035q1_spi_chip_info,

		.mode = SPI_CPHA | SPI_CPOL,

	},

#endif

arch/blackfin/mach-bf518/boards/tcm-bf518.c

+0 −47
Original line number Diff line number Diff line
@@ -138,32 +138,16 @@ static struct flash_platform_data bfin_spi_flash_data = { 
/* SPI flash chip (m25p64) */

static struct bfin5xx_spi_chip spi_flash_chip_info = {

	.enable_dma = 0,         /* use dma transfer with this chip*/

	.bits_per_word = 8,

};

#endif



#if defined(CONFIG_BFIN_SPI_ADC) \

	|| defined(CONFIG_BFIN_SPI_ADC_MODULE)

/* SPI ADC chip */

static struct bfin5xx_spi_chip spi_adc_chip_info = {

	.enable_dma = 1,         /* use dma transfer with this chip*/

	.bits_per_word = 16,

};

#endif



#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)

static struct bfin5xx_spi_chip mmc_spi_chip_info = {

	.enable_dma = 0,

	.bits_per_word = 8,

};

#endif



#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)

static struct bfin5xx_spi_chip spi_ad7877_chip_info = {

	.enable_dma = 0,

	.bits_per_word = 16,

};



static const struct ad7877_platform_data bfin_ad7877_ts_info = {

	.model			= 7877,

	.vref_delay_usecs	= 50,	/* internal, no capacitor */
@@ -179,21 +163,6 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = { 
};

#endif



#if defined(CONFIG_SND_SOC_WM8731) || defined(CONFIG_SND_SOC_WM8731_MODULE) \

	 && defined(CONFIG_SND_SOC_WM8731_SPI)

static struct bfin5xx_spi_chip spi_wm8731_chip_info = {

	.enable_dma = 0,

	.bits_per_word = 16,

};

#endif



#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)

static struct bfin5xx_spi_chip spidev_chip_info = {

	.enable_dma = 0,

	.bits_per_word = 8,

};

#endif



static struct spi_board_info bfin_spi_board_info[] __initdata = {

#if defined(CONFIG_MTD_M25P80) \

	|| defined(CONFIG_MTD_M25P80_MODULE)
@@ -209,18 +178,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
	},

#endif



#if defined(CONFIG_BFIN_SPI_ADC) \

	|| defined(CONFIG_BFIN_SPI_ADC_MODULE)

	{

		.modalias = "bfin_spi_adc", /* Name of spi_driver for this device */

		.max_speed_hz = 6250000,     /* max spi clock (SCK) speed in HZ */

		.bus_num = 0, /* Framework bus number */

		.chip_select = 1, /* Framework chip select. */

		.platform_data = NULL, /* No spi_driver specific config */

		.controller_data = &spi_adc_chip_info,

	},

#endif



#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)

	{

		.modalias = "mmc_spi",
@@ -239,7 +196,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
		.max_speed_hz	= 12500000,     /* max spi clock (SCK) speed in HZ */

		.bus_num	= 0,

		.chip_select  = 2,

		.controller_data = &spi_ad7877_chip_info,

	},

#endif

#if defined(CONFIG_SND_SOC_WM8731) || defined(CONFIG_SND_SOC_WM8731_MODULE) \
@@ -249,7 +205,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
		.max_speed_hz	= 3125000,     /* max spi clock (SCK) speed in HZ */

		.bus_num	= 0,

		.chip_select    = 5,

		.controller_data = &spi_wm8731_chip_info,

		.mode = SPI_MODE_0,

	},

#endif
@@ -259,7 +214,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
		.max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */

		.bus_num = 0,

		.chip_select = 1,

		.controller_data = &spidev_chip_info,

	},

#endif

#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)
@@ -268,7 +222,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
		.max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */

		.bus_num = 0,

		.chip_select = 1,

		.controller_data = &lq035q1_spi_chip_info,

		.mode = SPI_CPHA | SPI_CPOL,

	},

#endif

arch/blackfin/mach-bf527/boards/ad7160eval.c

+0 −19
Original line number Diff line number Diff line
@@ -265,29 +265,12 @@ static struct flash_platform_data bfin_spi_flash_data = { 
/* SPI flash chip (m25p64) */

static struct bfin5xx_spi_chip spi_flash_chip_info = {

	.enable_dma = 0,         /* use dma transfer with this chip*/

	.bits_per_word = 8,

};

#endif



#if defined(CONFIG_SND_BF5XX_SOC_AD183X) \

	|| defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)

static struct bfin5xx_spi_chip ad1836_spi_chip_info = {

	.enable_dma = 0,

	.bits_per_word = 16,

};

#endif



#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)

static struct bfin5xx_spi_chip  mmc_spi_chip_info = {

	.enable_dma = 0,

	.bits_per_word = 8,

};

#endif



#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)

static struct bfin5xx_spi_chip spidev_chip_info = {

	.enable_dma = 0,

	.bits_per_word = 8,

};

#endif
@@ -328,7 +311,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
		.max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */

		.bus_num = 0,

		.chip_select = 4,

		.controller_data = &ad1836_spi_chip_info,

	},

#endif

#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
@@ -347,7 +329,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
		.max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */

		.bus_num = 0,

		.chip_select = 1,

		.controller_data = &spidev_chip_info,

	},

#endif

};

arch/blackfin/mach-bf527/boards/cm_bf527.c

+0 −55
Original line number Diff line number Diff line
@@ -354,40 +354,16 @@ static struct flash_platform_data bfin_spi_flash_data = { 
/* SPI flash chip (m25p64) */

static struct bfin5xx_spi_chip spi_flash_chip_info = {

	.enable_dma = 0,         /* use dma transfer with this chip*/

	.bits_per_word = 8,

};

#endif



#if defined(CONFIG_BFIN_SPI_ADC) \

	|| defined(CONFIG_BFIN_SPI_ADC_MODULE)

/* SPI ADC chip */

static struct bfin5xx_spi_chip spi_adc_chip_info = {

	.enable_dma = 1,         /* use dma transfer with this chip*/

	.bits_per_word = 16,

};

#endif



#if defined(CONFIG_SND_BF5XX_SOC_AD183X) \

	|| defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)

static struct bfin5xx_spi_chip ad1836_spi_chip_info = {

	.enable_dma = 0,

	.bits_per_word = 16,

};

#endif



#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)

static struct bfin5xx_spi_chip  mmc_spi_chip_info = {

	.enable_dma = 0,

	.bits_per_word = 8,

};

#endif



#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)

static struct bfin5xx_spi_chip spi_ad7877_chip_info = {

	.enable_dma = 0,

	.bits_per_word = 16,

};



static const struct ad7877_platform_data bfin_ad7877_ts_info = {

	.model			= 7877,

	.vref_delay_usecs	= 50,	/* internal, no capacitor */
@@ -403,21 +379,6 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = { 
};

#endif



#if defined(CONFIG_SND_SOC_WM8731) || defined(CONFIG_SND_SOC_WM8731_MODULE) \

	 && defined(CONFIG_SND_SOC_WM8731_SPI)

static struct bfin5xx_spi_chip spi_wm8731_chip_info = {

	.enable_dma = 0,

	.bits_per_word = 16,

};

#endif



#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)

static struct bfin5xx_spi_chip spidev_chip_info = {

	.enable_dma = 0,

	.bits_per_word = 8,

};

#endif



static struct spi_board_info bfin_spi_board_info[] __initdata = {

#if defined(CONFIG_MTD_M25P80) \

	|| defined(CONFIG_MTD_M25P80_MODULE)
@@ -433,18 +394,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
	},

#endif



#if defined(CONFIG_BFIN_SPI_ADC) \

	|| defined(CONFIG_BFIN_SPI_ADC_MODULE)

	{

		.modalias = "bfin_spi_adc", /* Name of spi_driver for this device */

		.max_speed_hz = 6250000,     /* max spi clock (SCK) speed in HZ */

		.bus_num = 0, /* Framework bus number */

		.chip_select = 1, /* Framework chip select. */

		.platform_data = NULL, /* No spi_driver specific config */

		.controller_data = &spi_adc_chip_info,

	},

#endif



#if defined(CONFIG_SND_BF5XX_SOC_AD183X) \

	|| defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)

	{
@@ -452,7 +401,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
		.max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */

		.bus_num = 0,

		.chip_select = 4,

		.controller_data = &ad1836_spi_chip_info,

	},

#endif

#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
@@ -473,7 +421,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
		.max_speed_hz	= 12500000,     /* max spi clock (SCK) speed in HZ */

		.bus_num	= 0,

		.chip_select  = 2,

		.controller_data = &spi_ad7877_chip_info,

	},

#endif

#if defined(CONFIG_SND_SOC_WM8731) || defined(CONFIG_SND_SOC_WM8731_MODULE) \
@@ -483,7 +430,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
		.max_speed_hz	= 3125000,     /* max spi clock (SCK) speed in HZ */

		.bus_num	= 0,

		.chip_select    = 5,

		.controller_data = &spi_wm8731_chip_info,

		.mode = SPI_MODE_0,

	},

#endif
@@ -493,7 +439,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
		.max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */

		.bus_num = 0,

		.chip_select = 1,

		.controller_data = &spidev_chip_info,

	},

#endif

};

arch/blackfin/mach-bf527/boards/ezbrd.c

+0 −62
Original line number Diff line number Diff line
@@ -253,32 +253,16 @@ static struct flash_platform_data bfin_spi_flash_data = { 
/* SPI flash chip (sst25wf040) */

static struct bfin5xx_spi_chip spi_flash_chip_info = {

	.enable_dma = 0,         /* use dma transfer with this chip*/

	.bits_per_word = 8,

};

#endif



#if defined(CONFIG_BFIN_SPI_ADC) \

	|| defined(CONFIG_BFIN_SPI_ADC_MODULE)

/* SPI ADC chip */

static struct bfin5xx_spi_chip spi_adc_chip_info = {

	.enable_dma = 1,         /* use dma transfer with this chip*/

	.bits_per_word = 16,

};

#endif



#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)

static struct bfin5xx_spi_chip mmc_spi_chip_info = {

	.enable_dma = 0,

	.bits_per_word = 8,

};

#endif



#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)

static struct bfin5xx_spi_chip spi_ad7877_chip_info = {

	.enable_dma = 0,

	.bits_per_word = 16,

};



static const struct ad7877_platform_data bfin_ad7877_ts_info = {

	.model			= 7877,

	.vref_delay_usecs	= 50,	/* internal, no capacitor */
@@ -311,35 +295,6 @@ static const struct ad7879_platform_data bfin_ad7879_ts_info = { 
};

#endif



#if defined(CONFIG_TOUCHSCREEN_AD7879_SPI) || defined(CONFIG_TOUCHSCREEN_AD7879_SPI_MODULE)

static struct bfin5xx_spi_chip spi_ad7879_chip_info = {

	.enable_dma = 0,

	.bits_per_word = 16,

};

#endif



#if defined(CONFIG_SND_SOC_WM8731) || defined(CONFIG_SND_SOC_WM8731_MODULE) \

	 && defined(CONFIG_SND_SOC_WM8731_SPI)

static struct bfin5xx_spi_chip spi_wm8731_chip_info = {

	.enable_dma = 0,

	.bits_per_word = 16,

};

#endif



#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)

static struct bfin5xx_spi_chip spidev_chip_info = {

	.enable_dma = 0,

	.bits_per_word = 8,

};

#endif



#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)

static struct bfin5xx_spi_chip lq035q1_spi_chip_info = {

	.enable_dma = 0,

	.bits_per_word = 8,

};

#endif



static struct spi_board_info bfin_spi_board_info[] __initdata = {

#if defined(CONFIG_MTD_M25P80) \

	|| defined(CONFIG_MTD_M25P80_MODULE)
@@ -355,18 +310,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
	},

#endif



#if defined(CONFIG_BFIN_SPI_ADC) \

	|| defined(CONFIG_BFIN_SPI_ADC_MODULE)

	{

		.modalias = "bfin_spi_adc", /* Name of spi_driver for this device */

		.max_speed_hz = 6250000,     /* max spi clock (SCK) speed in HZ */

		.bus_num = 0, /* Framework bus number */

		.chip_select = 1, /* Framework chip select. */

		.platform_data = NULL, /* No spi_driver specific config */

		.controller_data = &spi_adc_chip_info,

	},

#endif



#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)

	{

		.modalias = "mmc_spi",
@@ -385,7 +328,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
		.max_speed_hz	= 12500000,     /* max spi clock (SCK) speed in HZ */

		.bus_num	= 0,

		.chip_select  = 2,

		.controller_data = &spi_ad7877_chip_info,

	},

#endif

#if defined(CONFIG_TOUCHSCREEN_AD7879_SPI) || defined(CONFIG_TOUCHSCREEN_AD7879_SPI_MODULE)
@@ -396,7 +338,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
		.max_speed_hz = 5000000,     /* max spi clock (SCK) speed in HZ */

		.bus_num = 0,

		.chip_select = 5,

		.controller_data = &spi_ad7879_chip_info,

		.mode = SPI_CPHA | SPI_CPOL,

	},

#endif
@@ -407,7 +348,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
		.max_speed_hz	= 3125000,     /* max spi clock (SCK) speed in HZ */

		.bus_num	= 0,

		.chip_select    = 5,

		.controller_data = &spi_wm8731_chip_info,

		.mode = SPI_MODE_0,

	},

#endif
@@ -417,7 +357,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
		.max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */

		.bus_num = 0,

		.chip_select = 1,

		.controller_data = &spidev_chip_info,

	},

#endif

#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)
@@ -426,7 +365,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
		.max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */

		.bus_num = 0,

		.chip_select = 1,

		.controller_data = &lq035q1_spi_chip_info,

		.mode = SPI_CPHA | SPI_CPOL,

	},

#endif