Commit 782cd9ee authored by Olof Johansson's avatar Olof Johansson

Merge branch 'fixes2' into fixes

Three more warnings fixes from Arnd Bergmann:

* fixes2:
  ARM: integrator: use __iomem pointers for MMIO, part 2
  ARM: assabet: fix bogus warning in get_assabet_scr (again)
  ARM: shmobile: mark shmobile_init_late as __init
parents 6e3a78d9 21c8715f
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
*/ */
void cm_control(u32, u32); void cm_control(u32, u32);
#define CM_CTRL IO_ADDRESS(INTEGRATOR_HDR_CTRL) #define CM_CTRL __io_address(INTEGRATOR_HDR_CTRL)
#define CM_CTRL_LED (1 << 0) #define CM_CTRL_LED (1 << 0)
#define CM_CTRL_nMBDET (1 << 1) #define CM_CTRL_nMBDET (1 << 1)
......
...@@ -324,9 +324,9 @@ ...@@ -324,9 +324,9 @@
*/ */
#define PHYS_PCI_V3_BASE 0x62000000 #define PHYS_PCI_V3_BASE 0x62000000
#define PCI_MEMORY_VADDR 0xe8000000 #define PCI_MEMORY_VADDR IOMEM(0xe8000000)
#define PCI_CONFIG_VADDR 0xec000000 #define PCI_CONFIG_VADDR IOMEM(0xec000000)
#define PCI_V3_VADDR 0xed000000 #define PCI_V3_VADDR IOMEM(0xed000000)
/* ------------------------------------------------------------------------ /* ------------------------------------------------------------------------
* Integrator Interrupt Controllers * Integrator Interrupt Controllers
......
...@@ -157,7 +157,7 @@ static struct map_desc ap_io_desc[] __initdata = { ...@@ -157,7 +157,7 @@ static struct map_desc ap_io_desc[] __initdata = {
static void __init ap_map_io(void) static void __init ap_map_io(void)
{ {
iotable_init(ap_io_desc, ARRAY_SIZE(ap_io_desc)); iotable_init(ap_io_desc, ARRAY_SIZE(ap_io_desc));
vga_base = PCI_MEMORY_VADDR; vga_base = (unsigned long)PCI_MEMORY_VADDR;
pci_map_io_early(__phys_to_pfn(PHYS_PCI_IO_BASE)); pci_map_io_early(__phys_to_pfn(PHYS_PCI_IO_BASE));
} }
......
...@@ -388,7 +388,7 @@ static void __init map_sa1100_gpio_regs( void ) ...@@ -388,7 +388,7 @@ static void __init map_sa1100_gpio_regs( void )
*/ */
static void __init get_assabet_scr(void) static void __init get_assabet_scr(void)
{ {
unsigned long scr, i; unsigned long uninitialized_var(scr), i;
GPDR |= 0x3fc; /* Configure GPIO 9:2 as outputs */ GPDR |= 0x3fc; /* Configure GPIO 9:2 as outputs */
GPSR = 0x3fc; /* Write 0xFF to GPIO 9:2 */ GPSR = 0x3fc; /* Write 0xFF to GPIO 9:2 */
......
...@@ -100,7 +100,7 @@ static inline int shmobile_cpu_is_dead(unsigned int cpu) { return 1; } ...@@ -100,7 +100,7 @@ static inline int shmobile_cpu_is_dead(unsigned int cpu) { return 1; }
extern void shmobile_smp_init_cpus(unsigned int ncores); extern void shmobile_smp_init_cpus(unsigned int ncores);
static inline void shmobile_init_late(void) static inline void __init shmobile_init_late(void)
{ {
shmobile_suspend_init(); shmobile_suspend_init();
shmobile_cpuidle_init(); shmobile_cpuidle_init();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment