Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

Pull MIPS updates from Ralf Baechle:

 o Add basic support for the Mediatek/Ralink Wireless SoC family.

 o The Qualcomm Atheros platform is extended by support for the new
   QCA955X SoC series as well as a bunch of patches that get the code
   ready for OF support.

 o Lantiq and BCM47XX platform have a few improvements and bug fixes.

 o MIPS has sent a few patches that get the kernel ready for the
   upcoming microMIPS support.

 o The rest of the series is made up of small bug fixes and cleanups
   that relate to various parts of the MIPS code.  The biggy in there is
   a whitespace cleanup.  After I was sent another set of whitespace
   cleanup patches I decided it was the time to clean the whitespace
   "issues" for once and and that touches many files below arch/mips/.

Fix up silly conflicts, mostly due to whitespace cleanups.

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (105 commits)
  MIPS: Quit exporting kernel internel break codes to uapi/asm/break.h
  MIPS: remove broken conditional inside vpe loader code
  MIPS: SMTC: fix implicit declaration of set_vi_handler
  MIPS: early_printk: drop __init annotations
  MIPS: Probe for and report hardware virtualization support.
  MIPS: ath79: add support for the Qualcomm Atheros AP136-010 board
  MIPS: ath79: add USB controller registration code for the QCA955X SoCs
  MIPS: ath79: add PCI controller registration code for the QCA955X SoCs
  MIPS: ath79: add WMAC registration code for the QCA955X SoCs
  MIPS: ath79: register UART for the QCA955X SoCs
  MIPS: ath79: add QCA955X specific glue to ath79_device_reset_{set, clear}
  MIPS: ath79: add GPIO setup code for the QCA955X SoCs
  MIPS: ath79: add IRQ handling code for the QCA955X SoCs
  MIPS: ath79: add clock setup code for the QCA955X SoCs
  MIPS: ath79: add SoC detection code for the QCA955X SoCs
  MIPS: ath79: add early printk support for the QCA955X SoCs
  MIPS: ath79: fix WMAC IRQ resource assignment
  mips: reserve elfcorehdr
  mips: Make sure kernel memory is in iomem
  MIPS: ath79: use dynamically allocated USB platform devices
  ...

8 files changed, 117 insertions, 117 deletions

diff --git a/arch/mips/sni/a20r.c b/arch/mips/sni/a20r.c
index e05ad4da44d9..dd0ab982d77e 100644
--- a/arch/mips/sni/a20r.c
+++ b/arch/mips/sni/a20r.c
@@ -41,17 +41,17 @@ static struct platform_device a20r_serial8250_device = {
 };
 
 static struct resource a20r_ds1216_rsrc[] = {
-        {
-                .start = 0x1c081ffc,
-                .end   = 0x1c081fff,
-                .flags = IORESOURCE_MEM
-        }
+        {
+                .start = 0x1c081ffc,
+                .end   = 0x1c081fff,
+                .flags = IORESOURCE_MEM
+        }
 };
 
 static struct platform_device a20r_ds1216_device = {
-        .name           = "rtc-ds1216",
-        .num_resources  = ARRAY_SIZE(a20r_ds1216_rsrc),
-        .resource       = a20r_ds1216_rsrc
+        .name           = "rtc-ds1216",
+        .num_resources  = ARRAY_SIZE(a20r_ds1216_rsrc),
+        .resource       = a20r_ds1216_rsrc
 };
 
 static struct resource snirm_82596_rsrc[] = {
@@ -76,14 +76,14 @@ static struct resource snirm_82596_rsrc[] = {
                 .flags = IORESOURCE_IRQ
         },
         {
-                .flags = 0x01                /* 16bit mpu port access */
+                .flags = 0x01                /* 16bit mpu port access */
         }
 };
 
 static struct platform_device snirm_82596_pdev = {
-        .name           = "snirm_82596",
-        .num_resources  = ARRAY_SIZE(snirm_82596_rsrc),
-        .resource       = snirm_82596_rsrc
+        .name           = "snirm_82596",
+        .num_resources  = ARRAY_SIZE(snirm_82596_rsrc),
+        .resource       = snirm_82596_rsrc
 };
 
 static struct resource snirm_53c710_rsrc[] = {
@@ -100,9 +100,9 @@ static struct resource snirm_53c710_rsrc[] = {
 };
 
 static struct platform_device snirm_53c710_pdev = {
-        .name           = "snirm_53c710",
-        .num_resources  = ARRAY_SIZE(snirm_53c710_rsrc),
-        .resource       = snirm_53c710_rsrc
+        .name           = "snirm_53c710",
+        .num_resources  = ARRAY_SIZE(snirm_53c710_rsrc),
+        .resource       = snirm_53c710_rsrc
 };
 
 static struct resource sc26xx_rsrc[] = {
@@ -171,7 +171,7 @@ static u32 a20r_ack_hwint(void)
         "       addiu   %1, -1                  \n"
         "       sw      $1, 0(%0)               \n"
         "       sync                            \n"
-                ".set   pop                     \n"
+                ".set   pop                     \n"
         :
         : "Jr" (PCIMT_UCONF), "Jr" (0xbc000000));
         write_c0_status(status);
@@ -236,13 +236,13 @@ static int __init snirm_a20r_setup_devinit(void)
         switch (sni_brd_type) {
         case SNI_BRD_TOWER_OASIC:
         case SNI_BRD_MINITOWER:
-                platform_device_register(&snirm_82596_pdev);
-                platform_device_register(&snirm_53c710_pdev);
-                platform_device_register(&sc26xx_pdev);
-                platform_device_register(&a20r_serial8250_device);
-                platform_device_register(&a20r_ds1216_device);
+                platform_device_register(&snirm_82596_pdev);
+                platform_device_register(&snirm_53c710_pdev);
+                platform_device_register(&sc26xx_pdev);
+                platform_device_register(&a20r_serial8250_device);
+                platform_device_register(&a20r_ds1216_device);
                 sni_eisa_root_init();
-                break;
+                break;
         }
         return 0;
 }
diff --git a/arch/mips/sni/eisa.c b/arch/mips/sni/eisa.c
index 6827feb4de96..179b5d556ad2 100644
--- a/arch/mips/sni/eisa.c
+++ b/arch/mips/sni/eisa.c
@@ -22,7 +22,7 @@ static struct platform_device eisa_root_dev = {
 };
 
 static struct eisa_root_device eisa_bus_root = {
-        .dev           = &eisa_root_dev.dev,
+        .dev           = &eisa_root_dev.dev,
         .bus_base_addr = 0,
         .res           = &ioport_resource,
         .slots         = EISA_MAX_SLOTS,
diff --git a/arch/mips/sni/irq.c b/arch/mips/sni/irq.c
index 5a4ec75382e2..ac61b90bcc66 100644
--- a/arch/mips/sni/irq.c
+++ b/arch/mips/sni/irq.c
@@ -58,25 +58,25 @@ void __init arch_init_irq(void)
         case SNI_BRD_10NEW:
         case SNI_BRD_TOWER_OASIC:
         case SNI_BRD_MINITOWER:
-                sni_a20r_irq_init();
-                break;
+                sni_a20r_irq_init();
+                break;
 
         case SNI_BRD_PCI_TOWER:
-                sni_pcit_irq_init();
-                break;
+                sni_pcit_irq_init();
+                break;
 
         case SNI_BRD_PCI_TOWER_CPLUS:
-                sni_pcit_cplus_irq_init();
-                break;
+                sni_pcit_cplus_irq_init();
+                break;
 
         case SNI_BRD_RM200:
-                sni_rm200_irq_init();
-                break;
+                sni_rm200_irq_init();
+                break;
 
         case SNI_BRD_PCI_MTOWER:
         case SNI_BRD_PCI_DESKTOP:
         case SNI_BRD_PCI_MTOWER_CPLUS:
-                sni_pcimt_irq_init();
-                break;
+                sni_pcimt_irq_init();
+                break;
         }
 }
diff --git a/arch/mips/sni/pcimt.c b/arch/mips/sni/pcimt.c
index cdb1417fba59..cec4b8ca1438 100644
--- a/arch/mips/sni/pcimt.c
+++ b/arch/mips/sni/pcimt.c
@@ -60,7 +60,7 @@ static inline void sni_pcimt_detect(void)
         p += sprintf(p, "%s PCI", (csmsr & 0x80) ? "RM200" : "RM300");
         if ((csmsr & 0x80) == 0)
                 p += sprintf(p, ", board revision %s",
-                             (csmsr & 0x20) ? "D" : "C");
+                             (csmsr & 0x20) ? "D" : "C");
         asic = csmsr & 0x80;
         asic = (csmsr & 0x08) ? asic : !asic;
         p += sprintf(p, ", ASIC PCI Rev %s", asic ? "1.0" : "1.1");
@@ -91,22 +91,22 @@ static struct platform_device pcimt_serial8250_device = {
 };
 
 static struct resource pcimt_cmos_rsrc[] = {
-        {
-                .start = 0x70,
-                .end   = 0x71,
-                .flags = IORESOURCE_IO
-        },
-        {
-                .start = 8,
-                .end   = 8,
-                .flags = IORESOURCE_IRQ
-        }
+        {
+                .start = 0x70,
+                .end   = 0x71,
+                .flags = IORESOURCE_IO
+        },
+        {
+                .start = 8,
+                .end   = 8,
+                .flags = IORESOURCE_IRQ
+        }
 };
 
 static struct platform_device pcimt_cmos_device = {
-        .name           = "rtc_cmos",
-        .num_resources  = ARRAY_SIZE(pcimt_cmos_rsrc),
-        .resource       = pcimt_cmos_rsrc
+        .name           = "rtc_cmos",
+        .num_resources  = ARRAY_SIZE(pcimt_cmos_rsrc),
+        .resource       = pcimt_cmos_rsrc
 };
 
 
@@ -191,7 +191,7 @@ static struct pci_controller sni_controller = {
         .mem_offset     = 0x00000000UL,
         .io_resource    = &sni_io_resource,
         .io_offset      = 0x00000000UL,
-        .io_map_base    = SNI_PORT_BASE
+        .io_map_base    = SNI_PORT_BASE
 };
 
 static void enable_pcimt_irq(struct irq_data *d)
@@ -319,9 +319,9 @@ static int __init snirm_pcimt_setup_devinit(void)
         case SNI_BRD_PCI_MTOWER:
         case SNI_BRD_PCI_DESKTOP:
         case SNI_BRD_PCI_MTOWER_CPLUS:
-                platform_device_register(&pcimt_serial8250_device);
-                platform_device_register(&pcimt_cmos_device);
-                break;
+                platform_device_register(&pcimt_serial8250_device);
+                platform_device_register(&pcimt_cmos_device);
+                break;
         }
 
         return 0;
diff --git a/arch/mips/sni/pcit.c b/arch/mips/sni/pcit.c
index b5246373d16b..7cddd03d1fea 100644
--- a/arch/mips/sni/pcit.c
+++ b/arch/mips/sni/pcit.c
@@ -59,22 +59,22 @@ static struct platform_device pcit_cplus_serial8250_device = {
 };
 
 static struct resource pcit_cmos_rsrc[] = {
-        {
-                .start = 0x70,
-                .end   = 0x71,
-                .flags = IORESOURCE_IO
-        },
-        {
-                .start = 8,
-                .end   = 8,
-                .flags = IORESOURCE_IRQ
-        }
+        {
+                .start = 0x70,
+                .end   = 0x71,
+                .flags = IORESOURCE_IO
+        },
+        {
+                .start = 8,
+                .end   = 8,
+                .flags = IORESOURCE_IRQ
+        }
 };
 
 static struct platform_device pcit_cmos_device = {
-        .name           = "rtc_cmos",
-        .num_resources  = ARRAY_SIZE(pcit_cmos_rsrc),
-        .resource       = pcit_cmos_rsrc
+        .name           = "rtc_cmos",
+        .num_resources  = ARRAY_SIZE(pcit_cmos_rsrc),
+        .resource       = pcit_cmos_rsrc
 };
 
 static struct platform_device pcit_pcspeaker_pdev = {
@@ -153,7 +153,7 @@ static struct pci_controller sni_pcit_controller = {
         .mem_offset     = 0x00000000UL,
         .io_resource    = &sni_io_resource,
         .io_offset      = 0x00000000UL,
-        .io_map_base    = SNI_PORT_BASE
+        .io_map_base    = SNI_PORT_BASE
 };
 
 static void enable_pcit_irq(struct irq_data *d)
@@ -272,16 +272,16 @@ static int __init snirm_pcit_setup_devinit(void)
 {
         switch (sni_brd_type) {
         case SNI_BRD_PCI_TOWER:
-                platform_device_register(&pcit_serial8250_device);
-                platform_device_register(&pcit_cmos_device);
+                platform_device_register(&pcit_serial8250_device);
+                platform_device_register(&pcit_cmos_device);
                 platform_device_register(&pcit_pcspeaker_pdev);
-                break;
+                break;
 
         case SNI_BRD_PCI_TOWER_CPLUS:
-                platform_device_register(&pcit_cplus_serial8250_device);
-                platform_device_register(&pcit_cmos_device);
+                platform_device_register(&pcit_cplus_serial8250_device);
+                platform_device_register(&pcit_cmos_device);
                 platform_device_register(&pcit_pcspeaker_pdev);
-                break;
+                break;
         }
         return 0;
 }
diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c
index 3ab5b5d25b0a..a046b302623e 100644
--- a/arch/mips/sni/rm200.c
+++ b/arch/mips/sni/rm200.c
@@ -48,17 +48,17 @@ static struct platform_device rm200_serial8250_device = {
 };
 
 static struct resource rm200_ds1216_rsrc[] = {
-        {
-                .start = 0x1cd41ffc,
-                .end   = 0x1cd41fff,
-                .flags = IORESOURCE_MEM
-        }
+        {
+                .start = 0x1cd41ffc,
+                .end   = 0x1cd41fff,
+                .flags = IORESOURCE_MEM
+        }
 };
 
 static struct platform_device rm200_ds1216_device = {
-        .name           = "rtc-ds1216",
-        .num_resources  = ARRAY_SIZE(rm200_ds1216_rsrc),
-        .resource       = rm200_ds1216_rsrc
+        .name           = "rtc-ds1216",
+        .num_resources  = ARRAY_SIZE(rm200_ds1216_rsrc),
+        .resource       = rm200_ds1216_rsrc
 };
 
 static struct resource snirm_82596_rm200_rsrc[] = {
@@ -88,9 +88,9 @@ static struct resource snirm_82596_rm200_rsrc[] = {
 };
 
 static struct platform_device snirm_82596_rm200_pdev = {
-        .name           = "snirm_82596",
-        .num_resources  = ARRAY_SIZE(snirm_82596_rm200_rsrc),
-        .resource       = snirm_82596_rm200_rsrc
+        .name           = "snirm_82596",
+        .num_resources  = ARRAY_SIZE(snirm_82596_rm200_rsrc),
+        .resource       = snirm_82596_rm200_rsrc
 };
 
 static struct resource snirm_53c710_rm200_rsrc[] = {
@@ -107,9 +107,9 @@ static struct resource snirm_53c710_rm200_rsrc[] = {
 };
 
 static struct platform_device snirm_53c710_rm200_pdev = {
-        .name           = "snirm_53c710",
-        .num_resources  = ARRAY_SIZE(snirm_53c710_rm200_rsrc),
-        .resource       = snirm_53c710_rm200_rsrc
+        .name           = "snirm_53c710",
+        .num_resources  = ARRAY_SIZE(snirm_53c710_rm200_rsrc),
+        .resource       = snirm_53c710_rm200_rsrc
 };
 
 static int __init snirm_setup_devinit(void)
@@ -134,9 +134,9 @@ device_initcall(snirm_setup_devinit);
  */
 
 static DEFINE_RAW_SPINLOCK(sni_rm200_i8259A_lock);
-#define PIC_CMD    0x00
-#define PIC_IMR    0x01
-#define PIC_ISR    PIC_CMD
+#define PIC_CMD    0x00
+#define PIC_IMR    0x01
+#define PIC_ISR    PIC_CMD
 #define PIC_POLL   PIC_ISR
 #define PIC_OCW3   PIC_ISR
 
@@ -421,8 +421,8 @@ void __init sni_rm200_i8259_irqs(void)
 }
 
 
-#define SNI_RM200_INT_STAT_REG  CKSEG1ADDR(0xbc000000)
-#define SNI_RM200_INT_ENA_REG   CKSEG1ADDR(0xbc080000)
+#define SNI_RM200_INT_STAT_REG  CKSEG1ADDR(0xbc000000)
+#define SNI_RM200_INT_ENA_REG   CKSEG1ADDR(0xbc080000)
 
 #define SNI_RM200_INT_START  24
 #define SNI_RM200_INT_END    28
diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c
index 2e9c283b8e68..5b09b3544edd 100644
--- a/arch/mips/sni/setup.c
+++ b/arch/mips/sni/setup.c
@@ -204,23 +204,23 @@ void __init plat_mem_setup(void)
         case SNI_BRD_10NEW:
         case SNI_BRD_TOWER_OASIC:
         case SNI_BRD_MINITOWER:
-                sni_a20r_init();
-                break;
+                sni_a20r_init();
+                break;
 
         case SNI_BRD_PCI_TOWER:
         case SNI_BRD_PCI_TOWER_CPLUS:
-                sni_pcit_init();
+                sni_pcit_init();
                 break;
 
         case SNI_BRD_RM200:
-                sni_rm200_init();
-                break;
+                sni_rm200_init();
+                break;
 
         case SNI_BRD_PCI_MTOWER:
         case SNI_BRD_PCI_DESKTOP:
         case SNI_BRD_PCI_MTOWER_CPLUS:
-                sni_pcimt_init();
-                break;
+                sni_pcimt_init();
+                break;
         }
 
         _machine_restart = sni_machine_restart;
@@ -247,16 +247,16 @@ static void quirk_cirrus_ram_size(struct pci_dev *dev)
          */
         pci_read_config_word(dev, PCI_COMMAND, &cmd);
         if ((cmd & (PCI_COMMAND_IO|PCI_COMMAND_MEMORY))
-                == (PCI_COMMAND_IO|PCI_COMMAND_MEMORY)) {
-                vga_wseq(NULL, CL_SEQR6, 0x12); /* unlock all extension registers */
+                == (PCI_COMMAND_IO|PCI_COMMAND_MEMORY)) {
+                vga_wseq(NULL, CL_SEQR6, 0x12); /* unlock all extension registers */
                 vga_wseq(NULL, CL_SEQRF, 0x18);
         }
 }
 
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_CIRRUS, PCI_DEVICE_ID_CIRRUS_5434_8,
-                        quirk_cirrus_ram_size);
+                        quirk_cirrus_ram_size);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_CIRRUS, PCI_DEVICE_ID_CIRRUS_5436,
-                        quirk_cirrus_ram_size);
+                        quirk_cirrus_ram_size);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_CIRRUS, PCI_DEVICE_ID_CIRRUS_5446,
-                        quirk_cirrus_ram_size);
+                        quirk_cirrus_ram_size);
 #endif
diff --git a/arch/mips/sni/time.c b/arch/mips/sni/time.c
index 494c9e7847aa..cf8ec568b9df 100644
--- a/arch/mips/sni/time.c
+++ b/arch/mips/sni/time.c
@@ -10,12 +10,12 @@
 #include <asm/time.h>
 #include <asm-generic/rtc.h>
 
-#define SNI_CLOCK_TICK_RATE     3686400
-#define SNI_COUNTER2_DIV        64
-#define SNI_COUNTER0_DIV        ((SNI_CLOCK_TICK_RATE / SNI_COUNTER2_DIV) / HZ)
+#define SNI_CLOCK_TICK_RATE     3686400
+#define SNI_COUNTER2_DIV        64
+#define SNI_COUNTER0_DIV        ((SNI_CLOCK_TICK_RATE / SNI_COUNTER2_DIV) / HZ)
 
 static void a20r_set_mode(enum clock_event_mode mode,
-                          struct clock_event_device *evt)
+                          struct clock_event_device *evt)
 {
         switch (mode) {
         case CLOCK_EVT_MODE_PERIODIC:
@@ -33,14 +33,14 @@ static void a20r_set_mode(enum clock_event_mode mode,
                 *(volatile u8 *)(A20R_PT_CLOCK_BASE +  8) = SNI_COUNTER2_DIV >> 8;
                 wmb();
 
-                break;
-        case CLOCK_EVT_MODE_ONESHOT:
-        case CLOCK_EVT_MODE_UNUSED:
-        case CLOCK_EVT_MODE_SHUTDOWN:
-                break;
-        case CLOCK_EVT_MODE_RESUME:
-                break;
-        }
+                break;
+        case CLOCK_EVT_MODE_ONESHOT:
+        case CLOCK_EVT_MODE_UNUSED:
+        case CLOCK_EVT_MODE_SHUTDOWN:
+                break;
+        case CLOCK_EVT_MODE_RESUME:
+                break;
+        }
 }
 
 static struct clock_event_device a20r_clockevent_device = {
@@ -82,15 +82,15 @@ static void __init sni_a20r_timer_setup(void)
         struct irqaction *action = &a20r_irqaction;
         unsigned int cpu = smp_processor_id();
 
-        cd->cpumask             = cpumask_of(cpu);
+        cd->cpumask             = cpumask_of(cpu);
         clockevents_register_device(cd);
         action->dev_id = cd;
         setup_irq(SNI_A20R_IRQ_TIMER, &a20r_irqaction);
 }
 
-#define SNI_8254_TICK_RATE        1193182UL
+#define SNI_8254_TICK_RATE        1193182UL
 
-#define SNI_8254_TCSAMP_COUNTER   ((SNI_8254_TICK_RATE / HZ) + 255)
+#define SNI_8254_TCSAMP_COUNTER   ((SNI_8254_TICK_RATE / HZ) + 255)
 
 static __init unsigned long dosample(void)
 {