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

1 files changed, 106 insertions, 0 deletions

diff --git a/arch/mips/ralink/dts/rt3050.dtsi b/arch/mips/ralink/dts/rt3050.dtsi
new file mode 100644
index 000000000000..069d0660e1dd
--- /dev/null
+++ b/arch/mips/ralink/dts/rt3050.dtsi
@@ -0,0 +1,106 @@
+/ {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        compatible = "ralink,rt3050-soc", "ralink,rt3052-soc";
+
+        cpus {
+                cpu@0 {
+                        compatible = "mips,mips24KEc";
+                };
+        };
+
+        chosen {
+                bootargs = "console=ttyS0,57600 init=/init";
+        };
+
+        cpuintc: cpuintc@0 {
+                #address-cells = <0>;
+                #interrupt-cells = <1>;
+                interrupt-controller;
+                compatible = "mti,cpu-interrupt-controller";
+        };
+
+        palmbus@10000000 {
+                compatible = "palmbus";
+                reg = <0x10000000 0x200000>;
+                ranges = <0x0 0x10000000 0x1FFFFF>;
+
+                #address-cells = <1>;
+                #size-cells = <1>;
+
+                sysc@0 {
+                        compatible = "ralink,rt3052-sysc", "ralink,rt3050-sysc";
+                        reg = <0x0 0x100>;
+                };
+
+                timer@100 {
+                        compatible = "ralink,rt3052-wdt", "ralink,rt2880-wdt";
+                        reg = <0x100 0x100>;
+                };
+
+                intc: intc@200 {
+                        compatible = "ralink,rt3052-intc", "ralink,rt2880-intc";
+                        reg = <0x200 0x100>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+
+                        interrupt-parent = <&cpuintc>;
+                        interrupts = <2>;
+                };
+
+                memc@300 {
+                        compatible = "ralink,rt3052-memc", "ralink,rt3050-memc";
+                        reg = <0x300 0x100>;
+                };
+
+                gpio0: gpio@600 {
+                        compatible = "ralink,rt3052-gpio", "ralink,rt2880-gpio";
+                        reg = <0x600 0x34>;
+
+                        gpio-controller;
+                        #gpio-cells = <2>;
+
+                        ralink,ngpio = <24>;
+                        ralink,regs = [ 00 04 08 0c
+                                        20 24 28 2c
+                                        30 34 ];
+                };
+
+                gpio1: gpio@638 {
+                        compatible = "ralink,rt3052-gpio", "ralink,rt2880-gpio";
+                        reg = <0x638 0x24>;
+
+                        gpio-controller;
+                        #gpio-cells = <2>;
+
+                        ralink,ngpio = <16>;
+                        ralink,regs = [ 00 04 08 0c
+                                        10 14 18 1c
+                                        20 24 ];
+                };
+
+                gpio2: gpio@660 {
+                        compatible = "ralink,rt3052-gpio", "ralink,rt2880-gpio";
+                        reg = <0x660 0x24>;
+
+                        gpio-controller;
+                        #gpio-cells = <2>;
+
+                        ralink,ngpio = <12>;
+                        ralink,regs = [ 00 04 08 0c
+                                        10 14 18 1c
+                                        20 24 ];
+                };
+
+                uartlite@c00 {
+                        compatible = "ralink,rt3052-uart", "ralink,rt2880-uart", "ns16550a";
+                        reg = <0xc00 0x100>;
+
+                        interrupt-parent = <&intc>;
+                        interrupts = <12>;
+
+                        reg-shift = <2>;
+                };
+        };
+};