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

Commit 8dca6010 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull non-critical arm-soc bug fixes from Olof Johansson:
 "These bug fixes were not important enough to have them included in the
  v3.4 release, mostly because they cover harmless warnings or
  unrealistic configurations.  Instead we queue them up to be picked up
  in the next merge window."

Fixed up trivial conflict in arch/arm/mach-omap2/board-omap4panda.c

* tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: spear6xx: remove board selection options
  ARM: OMAP: igep0020: Specify the VPLL2 regulator unconditionally
  ARM: OMAP2+: INTC: fix Kconfig option for TI81XX
  ARM: OMAP2+: remove incorrect irq_chip ack field
  ARM: OMAP4: Adding ID for OMAP4460 ES1.1
  ARM: OMAP4: panda: add statics to remove warnings
  ARM: OMAP2+: Incorrect Register Offsets in OMAP Mailbox
  ARM: OMAP: fix trivial warnings for dspbridge
  arm: davinci: use for_each_set_bit_from
  ARM: OMAP4: hsmmc: check for null pointer
  ARM: OMAP1: fix compilation issue in board-sx1.c
  ARM: disable SUSPEND/ARCH_SUSPEND_POSSIBLE for ARCH_TEGRA
  ARM: davinci: da850-evm: fix section mismatch
  ARM: tegra: add pll_x freq table entry for 750MHz
  ARM: davinci: mark spi_board_info arguments as const
  ARM: davinci: fix incorrect pdctl next bit position
parents 9bc747be 74c43753

arch/arm/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -2253,7 +2253,7 @@ menu "Power management options" 
source "kernel/power/Kconfig"

source "kernel/power/Kconfig"





config ARCH_SUSPEND_POSSIBLE

config ARCH_SUSPEND_POSSIBLE

	depends on !ARCH_S5PC100

	depends on !ARCH_S5PC100 && !ARCH_TEGRA

	depends on CPU_ARM920T || CPU_ARM926T || CPU_SA1100 || \

	depends on CPU_ARM920T || CPU_ARM926T || CPU_SA1100 || \

		CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE

		CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE

	def_bool y

	def_bool y

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

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

	.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_nandflash_device,

	&da850_evm_norflash_device,

	&da850_evm_norflash_device,

};

};

arch/arm/mach-davinci/davinci.h

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

/* DM355 function declarations */

void __init dm355_init(void);

void __init dm355_init(void);

void dm355_init_spi0(unsigned chipselect_mask,

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 __init dm355_init_asp1(u32 evt_enable, struct snd_platform_data *pdata);

void dm355_set_vpfe_config(struct vpfe_config *cfg);

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_ks(struct davinci_ks_platform_data *pdata);

void __init dm365_init_rtc(void);

void __init dm365_init_rtc(void);

void dm365_init_spi0(unsigned chipselect_mask,

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

void dm365_set_vpfe_config(struct vpfe_config *cfg);





/* DM644x function declarations */

/* DM644x function declarations */

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

+1 −1
Original line number Original line 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)

			      unsigned len)

{

{

	int ret;

	int ret;

arch/arm/mach-davinci/dm355.c

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

};





void __init dm355_init_spi0(unsigned chipselect_mask,

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 */

	/* for now, assume we need MISO */

	davinci_cfg_reg(DM355_SPI0_SDI);

	davinci_cfg_reg(DM355_SPI0_SDI);