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

Commit b6d35979 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v3.5-fixes-and-cleanups' of... 

Merge tag 'v3.5-fixes-and-cleanups' of git://gitorious.org/linux-davinci/linux-davinci into next/fixes

DaVinci fixes and cleanups for v3.5

This pull request:

1) improves code readability by using for_each_set_bit_from in DMA driver.
2) fixes incorrect bit position being used in power domain switching code
3) fixes not marking some variables as const when they could be const
4) fixes section mismatch warning in da850 evm code

By Uwe Kleine-König (2) and others
via Sekhar Nori
* tag 'v3.5-fixes-and-cleanups' of git://gitorious.org/linux-davinci/linux-davinci

:
  arm: davinci: use for_each_set_bit_from
  ARM: davinci: da850-evm: fix section mismatch
  ARM: davinci: mark spi_board_info arguments as const
  ARM: davinci: fix incorrect pdctl next bit position

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents bdbaaf1a 98e3b339

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

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static struct platform_device da850_evm_nandflash_device = { 
	.resource	= da850_evm_nandflash_resource,

};



static struct platform_device *da850_evm_devices[] __initdata = {

static struct platform_device *da850_evm_devices[] = {

	&da850_evm_nandflash_device,

	&da850_evm_norflash_device,

};

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);