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

Commit d65566e5 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Sekhar Nori
Browse files

ARM: davinci: mark spi_board_info arguments as const 



spi_board_info is not modified in any of the spi registeration
functions and passed along as-is to the generic SPI layer.

Mark spi_board_info arguments as const to signal this.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
[nsekhar@ti.com: extended for dm365 and dm355]
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent 4a6e6a5e

arch/arm/mach-davinci/davinci.h

+2 −2
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ void davinci_map_sysmod(void); 
/* DM355 function declarations */

void __init dm355_init(void);

void dm355_init_spi0(unsigned chipselect_mask,

		struct spi_board_info *info, unsigned len);

		const struct spi_board_info *info, unsigned len);

void __init dm355_init_asp1(u32 evt_enable, struct snd_platform_data *pdata);

void dm355_set_vpfe_config(struct vpfe_config *cfg);
@@ -83,7 +83,7 @@ void __init dm365_init_vc(struct snd_platform_data *pdata); 
void __init dm365_init_ks(struct davinci_ks_platform_data *pdata);

void __init dm365_init_rtc(void);

void dm365_init_spi0(unsigned chipselect_mask,

			struct spi_board_info *info, unsigned len);

			const struct spi_board_info *info, unsigned len);

void dm365_set_vpfe_config(struct vpfe_config *cfg);



/* DM644x function declarations */

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

+1 −1
Original line number Diff line number Diff line
@@ -831,7 +831,7 @@ static struct platform_device da8xx_spi_device[] = { 
	},

};



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

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

			      unsigned len)

{

	int ret;

arch/arm/mach-davinci/dm355.c

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ static struct platform_device dm355_spi0_device = { 
};



void __init dm355_init_spi0(unsigned chipselect_mask,

		struct spi_board_info *info, unsigned len)

		const struct spi_board_info *info, unsigned len)

{

	/* for now, assume we need MISO */

	davinci_cfg_reg(DM355_SPI0_SDI);

arch/arm/mach-davinci/dm365.c

+1 −1
Original line number Diff line number Diff line
@@ -676,7 +676,7 @@ static struct platform_device dm365_spi0_device = { 
};



void __init dm365_init_spi0(unsigned chipselect_mask,

		struct spi_board_info *info, unsigned len)

		const struct spi_board_info *info, unsigned len)

{

	davinci_cfg_reg(DM365_SPI0_SCLK);

	davinci_cfg_reg(DM365_SPI0_SDI);

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

+2 −1
Original line number Diff line number Diff line
@@ -76,7 +76,8 @@ 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, struct spi_board_info *info, unsigned len);

int da8xx_register_spi(int instance,

		const struct spi_board_info *info, unsigned len);

int da8xx_register_watchdog(void);

int da8xx_register_usb20(unsigned mA, unsigned potpgt);

int da8xx_register_usb11(struct da8xx_ohci_root_hub *pdata);