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

14 files changed, 27 insertions, 28 deletions

diff --git a/arch/mips/math-emu/Makefile b/arch/mips/math-emu/Makefile
index 96607230d9ea..121a848a3594 100644
--- a/arch/mips/math-emu/Makefile
+++ b/arch/mips/math-emu/Makefile
@@ -9,4 +9,3 @@ obj-y	:= cp1emu.o ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \
            sp_div.o sp_mul.o sp_sub.o sp_add.o sp_fdp.o sp_cmp.o sp_logb.o \
            sp_scalb.o sp_simple.o sp_tint.o sp_fint.o sp_tlong.o sp_flong.o \
            dp_sqrt.o sp_sqrt.o kernel_linkage.o dsemul.o
-
diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c
index 47c77e7ffbf8..afb5a0bcf7a5 100644
--- a/arch/mips/math-emu/cp1emu.c
+++ b/arch/mips/math-emu/cp1emu.c
@@ -169,7 +169,7 @@ static int isBranchInstr(mips_instruction * i)
 
 /*
  * In the Linux kernel, we support selection of FPR format on the
- * basis of the Status.FR bit.  If an FPU is not present, the FR bit
+ * basis of the Status.FR bit.  If an FPU is not present, the FR bit
  * is hardwired to zero, which would imply a 32-bit FPU even for
  * 64-bit CPUs so we rather look at TIF_32BIT_REGS.
  * FPU emu is slow and bulky and optimizing this function offers fairly
@@ -234,7 +234,7 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
         if (xcp->cp0_cause & CAUSEF_BD) {
                 /*
                  * The instruction to be emulated is in a branch delay slot
-                 * which means that we have to  emulate the branch instruction
+                 * which means that we have to  emulate the branch instruction
                  * BEFORE we do the cop1 instruction.
                  *
                  * This branch could be a COP1 branch, but in that case we
@@ -1335,8 +1335,8 @@ int fpu_emulator_cop1Handler(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
                 else {
                         /*
                          * The 'ieee754_csr' is an alias of
-                         * ctx->fcr31.  No need to copy ctx->fcr31 to
-                         * ieee754_csr.  But ieee754_csr.rm is ieee
+                         * ctx->fcr31.  No need to copy ctx->fcr31 to
+                         * ieee754_csr.  But ieee754_csr.rm is ieee
                          * library modes. (not mips rounding mode)
                          */
                         /* convert to ieee library modes */
diff --git a/arch/mips/math-emu/dp_add.c b/arch/mips/math-emu/dp_add.c
index b422fcad852a..c57c8adc42c4 100644
--- a/arch/mips/math-emu/dp_add.c
+++ b/arch/mips/math-emu/dp_add.c
@@ -153,7 +153,7 @@ ieee754dp ieee754dp_add(ieee754dp x, ieee754dp y)
                 xe = xe;
                 xs = xs;
 
-                if (xm >> (DP_MBITS + 1 + 3)) { /* carry out */
+                if (xm >> (DP_MBITS + 1 + 3)) { /* carry out */
                         xm = XDPSRS1(xm);
                         xe++;
                 }
diff --git a/arch/mips/math-emu/dp_sqrt.c b/arch/mips/math-emu/dp_sqrt.c
index a2a51b87ae8f..b874d60a942b 100644
--- a/arch/mips/math-emu/dp_sqrt.c
+++ b/arch/mips/math-emu/dp_sqrt.c
@@ -87,7 +87,7 @@ ieee754dp ieee754dp_sqrt(ieee754dp x)
         if (xe > 512) {         /* x > 2**-512? */
                 xe -= 512;      /* x = x / 2**512 */
                 scalx += 256;
-        } else if (xe < -512) { /* x < 2**-512? */
+        } else if (xe < -512) { /* x < 2**-512? */
                 xe += 512;      /* x = x * 2**512 */
                 scalx -= 256;
         }
@@ -108,13 +108,13 @@ ieee754dp ieee754dp_sqrt(ieee754dp x)
         y.bits &= 0xffffffff00000000LL;
 
         /* triple to almost 56 sig. bits: y ~= sqrt(x) to within 1 ulp */
-        /* t=y*y; z=t;  pt[n0]+=0x00100000; t+=z; z=(x-z)*y; */
+        /* t=y*y; z=t;  pt[n0]+=0x00100000; t+=z; z=(x-z)*y; */
         z = t = ieee754dp_mul(y, y);
         t.parts.bexp += 0x001;
         t = ieee754dp_add(t, z);
         z = ieee754dp_mul(ieee754dp_sub(x, z), y);
 
-        /* t=z/(t+x) ;  pt[n0]+=0x00100000; y+=t; */
+        /* t=z/(t+x) ;  pt[n0]+=0x00100000; y+=t; */
         t = ieee754dp_div(z, ieee754dp_add(t, x));
         t.parts.bexp += 0x001;
         y = ieee754dp_add(y, t);
diff --git a/arch/mips/math-emu/dp_sub.c b/arch/mips/math-emu/dp_sub.c
index 0de098cbc77b..91e0a4b5cbc7 100644
--- a/arch/mips/math-emu/dp_sub.c
+++ b/arch/mips/math-emu/dp_sub.c
@@ -158,7 +158,7 @@ ieee754dp ieee754dp_sub(ieee754dp x, ieee754dp y)
                 xe = xe;
                 xs = xs;
 
-                if (xm >> (DP_MBITS + 1 + 3)) { /* carry out */
+                if (xm >> (DP_MBITS + 1 + 3)) { /* carry out */
                         xm = XDPSRS1(xm);       /* shift preserving sticky */
                         xe++;
                 }
diff --git a/arch/mips/math-emu/ieee754.c b/arch/mips/math-emu/ieee754.c
index 30554e1c67b4..0015cf1989da 100644
--- a/arch/mips/math-emu/ieee754.c
+++ b/arch/mips/math-emu/ieee754.c
@@ -56,21 +56,21 @@
 #endif
 
 const struct ieee754dp_konst __ieee754dp_spcvals[] = {
-        DPSTR(0, DP_EMIN - 1 + DP_EBIAS, 0, 0), /* + zero   */
-        DPSTR(1, DP_EMIN - 1 + DP_EBIAS, 0, 0), /* - zero   */
+        DPSTR(0, DP_EMIN - 1 + DP_EBIAS, 0, 0), /* + zero   */
+        DPSTR(1, DP_EMIN - 1 + DP_EBIAS, 0, 0), /* - zero   */
         DPSTR(0, DP_EBIAS, 0, 0),       /* + 1.0   */
         DPSTR(1, DP_EBIAS, 0, 0),       /* - 1.0   */
         DPSTR(0, 3 + DP_EBIAS, 0x40000, 0),     /* + 10.0   */
         DPSTR(1, 3 + DP_EBIAS, 0x40000, 0),     /* - 10.0   */
-        DPSTR(0, DP_EMAX + 1 + DP_EBIAS, 0, 0), /* + infinity */
-        DPSTR(1, DP_EMAX + 1 + DP_EBIAS, 0, 0), /* - infinity */
+        DPSTR(0, DP_EMAX + 1 + DP_EBIAS, 0, 0), /* + infinity */
+        DPSTR(1, DP_EMAX + 1 + DP_EBIAS, 0, 0), /* - infinity */
         DPSTR(0, DP_EMAX+1+DP_EBIAS, 0x7FFFF, 0xFFFFFFFF), /* + indef quiet Nan */
         DPSTR(0, DP_EMAX + DP_EBIAS, 0xFFFFF, 0xFFFFFFFF),      /* + max */
         DPSTR(1, DP_EMAX + DP_EBIAS, 0xFFFFF, 0xFFFFFFFF),      /* - max */
         DPSTR(0, DP_EMIN + DP_EBIAS, 0, 0),     /* + min normal */
         DPSTR(1, DP_EMIN + DP_EBIAS, 0, 0),     /* - min normal */
-        DPSTR(0, DP_EMIN - 1 + DP_EBIAS, 0, 1), /* + min denormal */
-        DPSTR(1, DP_EMIN - 1 + DP_EBIAS, 0, 1), /* - min denormal */
+        DPSTR(0, DP_EMIN - 1 + DP_EBIAS, 0, 1), /* + min denormal */
+        DPSTR(1, DP_EMIN - 1 + DP_EBIAS, 0, 1), /* - min denormal */
         DPSTR(0, 31 + DP_EBIAS, 0, 0),  /* + 1.0e31 */
         DPSTR(0, 63 + DP_EBIAS, 0, 0),  /* + 1.0e63 */
 };
@@ -84,9 +84,9 @@ const struct ieee754sp_konst __ieee754sp_spcvals[] = {
         SPSTR(1, 3 + SP_EBIAS, 0x200000),       /* - 10.0   */
         SPSTR(0, SP_EMAX + 1 + SP_EBIAS, 0),    /* + infinity */
         SPSTR(1, SP_EMAX + 1 + SP_EBIAS, 0),    /* - infinity */
-        SPSTR(0, SP_EMAX+1+SP_EBIAS, 0x3FFFFF),     /* + indef quiet Nan  */
-        SPSTR(0, SP_EMAX + SP_EBIAS, 0x7FFFFF), /* + max normal */
-        SPSTR(1, SP_EMAX + SP_EBIAS, 0x7FFFFF), /* - max normal */
+        SPSTR(0, SP_EMAX+1+SP_EBIAS, 0x3FFFFF),     /* + indef quiet Nan  */
+        SPSTR(0, SP_EMAX + SP_EBIAS, 0x7FFFFF), /* + max normal */
+        SPSTR(1, SP_EMAX + SP_EBIAS, 0x7FFFFF), /* - max normal */
         SPSTR(0, SP_EMIN + SP_EBIAS, 0),        /* + min normal */
         SPSTR(1, SP_EMIN + SP_EBIAS, 0),        /* - min normal */
         SPSTR(0, SP_EMIN - 1 + SP_EBIAS, 1),    /* + min denormal */
diff --git a/arch/mips/math-emu/ieee754dp.c b/arch/mips/math-emu/ieee754dp.c
index 080b5ca03fc6..068e56be8de9 100644
--- a/arch/mips/math-emu/ieee754dp.c
+++ b/arch/mips/math-emu/ieee754dp.c
@@ -116,7 +116,7 @@ static u64 get_rounding(int sn, u64 xm)
                                 xm += 0x8;
                         break;
                 case IEEE754_RD:        /* toward -Infinity */
-                        if (sn) /* ?? */
+                        if (sn) /* ?? */
                                 xm += 0x8;
                         break;
                 }
diff --git a/arch/mips/math-emu/ieee754int.h b/arch/mips/math-emu/ieee754int.h
index 2a7d43f4f161..4b6c6fb35304 100644
--- a/arch/mips/math-emu/ieee754int.h
+++ b/arch/mips/math-emu/ieee754int.h
@@ -56,7 +56,7 @@
 
 #define CLPAIR(x, y)    ((x)*6+(y))
 
-#define CLEARCX \
+#define CLEARCX \
   (ieee754_csr.cx = 0)
 
 #define SETCX(x) \
diff --git a/arch/mips/math-emu/ieee754sp.c b/arch/mips/math-emu/ieee754sp.c
index 271d00d6113a..15d1e36cfe64 100644
--- a/arch/mips/math-emu/ieee754sp.c
+++ b/arch/mips/math-emu/ieee754sp.c
@@ -117,7 +117,7 @@ static unsigned get_rounding(int sn, unsigned xm)
                                 xm += 0x8;
                         break;
                 case IEEE754_RD:        /* toward -Infinity */
-                        if (sn) /* ?? */
+                        if (sn) /* ?? */
                                 xm += 0x8;
                         break;
                 }
diff --git a/arch/mips/math-emu/ieee754xcpt.c b/arch/mips/math-emu/ieee754xcpt.c
index b99a693c05af..967167116ae8 100644
--- a/arch/mips/math-emu/ieee754xcpt.c
+++ b/arch/mips/math-emu/ieee754xcpt.c
@@ -25,7 +25,7 @@
  *  Added preprocessor hacks to map to Linux kernel diagnostics.
  *
  *  Kevin D. Kissell, kevink@mips.com and Carsten Langgaard, carstenl@mips.com
- *  Copyright (C) 2000 MIPS Technologies, Inc.  All rights reserved.
+ *  Copyright (C) 2000 MIPS Technologies, Inc.  All rights reserved.
  *************************************************************************/
 
 #include <linux/kernel.h>
diff --git a/arch/mips/math-emu/kernel_linkage.c b/arch/mips/math-emu/kernel_linkage.c
index 52e6c58c8de1..1c586575fe17 100644
--- a/arch/mips/math-emu/kernel_linkage.c
+++ b/arch/mips/math-emu/kernel_linkage.c
@@ -1,6 +1,6 @@
 /*
  *  Kevin D. Kissell, kevink@mips and Carsten Langgaard, carstenl@mips.com
- *  Copyright (C) 2000 MIPS Technologies, Inc.  All rights reserved.
+ *  Copyright (C) 2000 MIPS Technologies, Inc.  All rights reserved.
  *
  *  This program is free software; you can distribute it and/or modify it
  *  under the terms of the GNU General Public License (Version 2) as
diff --git a/arch/mips/math-emu/sp_add.c b/arch/mips/math-emu/sp_add.c
index ae1a327ccac0..c446e64637e2 100644
--- a/arch/mips/math-emu/sp_add.c
+++ b/arch/mips/math-emu/sp_add.c
@@ -148,7 +148,7 @@ ieee754sp ieee754sp_add(ieee754sp x, ieee754sp y)
                 xe = xe;
                 xs = xs;
 
-                if (xm >> (SP_MBITS + 1 + 3)) { /* carry out */
+                if (xm >> (SP_MBITS + 1 + 3)) { /* carry out */
                         SPXSRSX1();
                 }
         } else {
diff --git a/arch/mips/math-emu/sp_mul.c b/arch/mips/math-emu/sp_mul.c
index 2722a2570ea4..fa4675cf2aad 100644
--- a/arch/mips/math-emu/sp_mul.c
+++ b/arch/mips/math-emu/sp_mul.c
@@ -131,7 +131,7 @@ ieee754sp ieee754sp_mul(ieee754sp x, ieee754sp y)
                         hrm = hxm * hym;        /* 16 * 16 => 32 */
 
                         {
-                                unsigned t = lxm * hym; /* 16 * 16 => 32 */
+                                unsigned t = lxm * hym; /* 16 * 16 => 32 */
                                 {
                                         unsigned at = lrm + (t << 16);
                                         hrm += at < lrm;
@@ -141,7 +141,7 @@ ieee754sp ieee754sp_mul(ieee754sp x, ieee754sp y)
                         }
 
                         {
-                                unsigned t = hxm * lym; /* 16 * 16 => 32 */
+                                unsigned t = hxm * lym; /* 16 * 16 => 32 */
                                 {
                                         unsigned at = lrm + (t << 16);
                                         hrm += at < lrm;
diff --git a/arch/mips/math-emu/sp_sub.c b/arch/mips/math-emu/sp_sub.c
index 886ed5bcfefb..e595c6f3d0bb 100644
--- a/arch/mips/math-emu/sp_sub.c
+++ b/arch/mips/math-emu/sp_sub.c
@@ -153,7 +153,7 @@ ieee754sp ieee754sp_sub(ieee754sp x, ieee754sp y)
                 xe = xe;
                 xs = xs;
 
-                if (xm >> (SP_MBITS + 1 + 3)) { /* carry out */
+                if (xm >> (SP_MBITS + 1 + 3)) { /* carry out */
                         SPXSRSX1();     /* shift preserving sticky */
                 }
         } else {