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

Commit 0273612c authored by Vivien Didelot's avatar Vivien Didelot Committed by Sekhar Nori
Browse files

ARM: davinci: da8xx_register_spi() should not register SPI board info 



Without this patch, da8xx_register_spi() registers the SPI board info,
the SPI controller, and sets its number of chipselect to the size of the
static spi_board_info array. This is bad because a SPI board info may
declare devices for different SPI buses, and because other code can also
call spi_register_board_info() (e.g. a daughter board might provide
additional SPI devices).

This patch removes the spi_register_board_info() call from
da8xx_register_spi(), renames this last one to da8xx_register_spi_bus()
to be more explicit, takes the number of chipselect as a function
parameter, and updates the impacted board-da8{3,5}0-evm.c, and
board-mityomapl138.c files accordingly. It also sets the SPI platform
data static, as it doesn't need to be exported.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
[nsekhar@ti.com: fixed conflicts with v3.7-rc7, converted to use pr_warn(),
modified print messages to use __func__]
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent d1c3ed66

arch/arm/mach-davinci/board-da830-evm.c

+7 −2
Original line number Diff line number Diff line
@@ -652,8 +652,13 @@ static __init void da830_evm_init(void) 
	if (ret)

		pr_warning("da830_evm_init: rtc setup failed: %d\n", ret);



	ret = da8xx_register_spi(0, da830evm_spi_info,

	ret = spi_register_board_info(da830evm_spi_info,

				      ARRAY_SIZE(da830evm_spi_info));

	if (ret)

		pr_warn("%s: spi info registration failed: %d\n", __func__,

			ret);



	ret = da8xx_register_spi_bus(0, ARRAY_SIZE(da830evm_spi_info));

	if (ret)

		pr_warning("da830_evm_init: spi 0 registration failed: %d\n",

			   ret);

arch/arm/mach-davinci/board-da850-evm.c

+7 −2
Original line number Diff line number Diff line
@@ -1565,8 +1565,13 @@ static __init void da850_evm_init(void) 


	da850_vpif_init();



	ret = da8xx_register_spi(1, da850evm_spi_info,

	ret = spi_register_board_info(da850evm_spi_info,

				      ARRAY_SIZE(da850evm_spi_info));

	if (ret)

		pr_warn("%s: spi info registration failed: %d\n", __func__,

			ret);



	ret = da8xx_register_spi_bus(1, ARRAY_SIZE(da850evm_spi_info));

	if (ret)

		pr_warning("da850_evm_init: spi 1 registration failed: %d\n",

				ret);

arch/arm/mach-davinci/board-mityomapl138.c

+7 −2
Original line number Diff line number Diff line
@@ -529,7 +529,12 @@ static void __init mityomapl138_init(void) 


	mityomapl138_setup_nand();



	ret = da8xx_register_spi(1, mityomapl138_spi_flash_info,

	ret = spi_register_board_info(mityomapl138_spi_flash_info,

				      ARRAY_SIZE(mityomapl138_spi_flash_info));

	if (ret)

		pr_warn("spi info registration failed: %d\n", ret);



	ret = da8xx_register_spi_bus(1,

				     ARRAY_SIZE(mityomapl138_spi_flash_info));

	if (ret)

		pr_warning("spi 1 registration failed: %d\n", ret);

arch/arm/mach-davinci/devices-da8xx.c

+3 −11
Original line number Diff line number Diff line
@@ -832,7 +832,7 @@ static struct resource da8xx_spi1_resources[] = { 
	},

};



struct davinci_spi_platform_data da8xx_spi_pdata[] = {

static struct davinci_spi_platform_data da8xx_spi_pdata[] = {

	[0] = {

		.version	= SPI_VERSION_2,

		.intr_line	= 1,
@@ -866,20 +866,12 @@ static struct platform_device da8xx_spi_device[] = { 
	},

};



int __init da8xx_register_spi(int instance, const struct spi_board_info *info,

			      unsigned len)

int __init da8xx_register_spi_bus(int instance, unsigned num_chipselect)

{

	int ret;



	if (instance < 0 || instance > 1)

		return -EINVAL;



	ret = spi_register_board_info(info, len);

	if (ret)

		pr_warning("%s: failed to register board info for spi %d :"

			   " %d\n", __func__, instance, ret);



	da8xx_spi_pdata[instance].num_chipselect = len;

	da8xx_spi_pdata[instance].num_chipselect = num_chipselect;



	if (instance == 1 && cpu_is_davinci_da850()) {

		da8xx_spi1_resources[0].start = DA850_SPI1_BASE;

arch/arm/mach-davinci/include/mach/da8xx.h

+1 −3
Original line number Diff line number Diff line
@@ -82,8 +82,7 @@ void __init da850_init(void); 
int da830_register_edma(struct edma_rsv_info *rsv);

int da850_register_edma(struct edma_rsv_info *rsv[2]);

int da8xx_register_i2c(int instance, struct davinci_i2c_platform_data *pdata);

int da8xx_register_spi(int instance,

		const struct spi_board_info *info, unsigned len);

int da8xx_register_spi_bus(int instance, unsigned num_chipselect);

int da8xx_register_watchdog(void);

int da8xx_register_usb20(unsigned mA, unsigned potpgt);

int da8xx_register_usb11(struct da8xx_ohci_root_hub *pdata);
@@ -110,7 +109,6 @@ extern struct platform_device da8xx_serial_device; 
extern struct emac_platform_data da8xx_emac_pdata;

extern struct da8xx_lcdc_platform_data sharp_lcd035q3dg01_pdata;

extern struct da8xx_lcdc_platform_data sharp_lk043t1dg01_pdata;

extern struct davinci_spi_platform_data da8xx_spi_pdata[];



extern struct platform_device da8xx_wdt_device;