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

Commit 0b33162e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'late/fixes' into fixes 



This is a series from Arnd that fixes a number of compiler warnings
when building defconfigs on ARM.

* late/fixes:
  ARM: footbridge: nw_gpio_lock is raw_spin_lock
  ARM: mv78xx0: correct addr_map_cfg __initdata annotation
  ARM: footbridge: remove RTC_IRQ definition
  ARM: soc: dependency warnings for errata
  ARM: ks8695: __arch_virt_to_dma type handling
  ARM: rpc: check device_register return code in ecard_probe
  ARM: davinci: don't mark da850_register_cpufreq as __init
  ARM: iop13xx: fix iq81340sc_atux_map_irq prototype
  ARM: iop13xx: mark iop13xx_scan_bus as __devinit
  ARM: mv78xx0: mark mv78xx0_timer_init as __init_refok
  ARM: s3c24xx: fix multiple section mismatch warnings
  ARM: at91: unused variable in at91_pm_verify_clocks
  ARM: at91: skip at91_io_desc definition for NOMMU
  ARM: pxa: work around duplicate definition of GPIO24_SSP1_SFRM
  ARM: pxa: remove sharpsl_fatal_check function
  ARM: pxa: define palmte2_pxa_keys conditionally
  ARM: pxa: Wunused-result warning in viper board file
  ARM: shark: fix shark_pci_init return code

Fixed trivial conflicts in arch/arm/mach-at91/setup.c.

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a4ee7770 45ef6ac6

arch/arm/mach-at91/pm.c

+3 −2
Original line number Diff line number Diff line
@@ -153,7 +153,9 @@ static int at91_pm_verify_clocks(void) 
		}

	}



#ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS

	if (!IS_ENABLED(CONFIG_AT91_PROGRAMMABLE_CLOCKS))

		return 1;



	/* PCK0..PCK3 must be disabled, or configured to use clk32k */

	for (i = 0; i < 4; i++) {

		u32 css;
@@ -167,7 +169,6 @@ static int at91_pm_verify_clocks(void) 
			return 0;

		}

	}

#endif



	return 1;

}

arch/arm/mach-at91/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ void __init at91_init_sram(int bank, unsigned long base, unsigned int length) 
	iotable_init(desc, 1);

}



static struct map_desc at91_io_desc __initdata = {

static struct map_desc at91_io_desc __initdata __maybe_unused = {

	.virtual	= (unsigned long)AT91_VA_BASE_SYS,

	.pfn		= __phys_to_pfn(AT91_BASE_SYS),

	.length		= SZ_16K,

arch/arm/mach-davinci/da850.c

+1 −1
Original line number Diff line number Diff line
@@ -939,7 +939,7 @@ static struct platform_device da850_cpufreq_device = { 


unsigned int da850_max_speed = 300000;



int __init da850_register_cpufreq(char *async_clk)

int da850_register_cpufreq(char *async_clk)

{

	int i;

arch/arm/mach-footbridge/include/mach/irqs.h

+0 −2
Original line number Diff line number Diff line
@@ -89,8 +89,6 @@ 
#define IRQ_NETWINDER_VGA	_ISA_IRQ(11)

#define IRQ_NETWINDER_SOUND	_ISA_IRQ(12)



#undef RTC_IRQ

#define RTC_IRQ		IRQ_ISA_RTC_ALARM

#define I8042_KBD_IRQ	IRQ_ISA_KEYBOARD

#define I8042_AUX_IRQ	(machine_is_netwinder() ? IRQ_NETWINDER_PS2MOUSE : IRQ_ISA_PS2MOUSE)

#define IRQ_FLOPPYDISK	IRQ_ISA_FLOPPY

arch/arm/mach-iop13xx/iq81340sc.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
extern int init_atu;



static int __init

iq81340sc_atux_map_irq(struct pci_dev *dev, u8 idsel, u8 pin)

iq81340sc_atux_map_irq(const struct pci_dev *dev, u8 idsel, u8 pin)

{

	WARN_ON(idsel < 1 || idsel > 2);