--- v13
+++ v9
@@ -1,8 +1,8 @@
-This patchset is prepared for the next 3.12 release for Linux/MIPS. 
-Loongson-3 is a multi-core MIPS family CPU, it is MIPS64R2 compatible
-and has the same IMP field (0x6300) as Loongson-2. These patches make
-Linux kernel support Loongson-3 CPU and Loongson-3 based computers
-(including Laptop, Mini-ITX, All-In-One PC, etc.)
+This patchset is for git repository git://git.linux-mips.org/pub/scm/
+ralf/linux. Loongson-3 is a multi-core MIPS family CPU, it is MIPS64
+compatible and has the same IMP field (0x6300) as Loongson-2. These
+patches make Linux kernel support Loongson-3 CPU and Loongson-3 based
+computers (including Laptop, Mini-ITX, All-In-One PC, etc.)
 
 V1 -> V2:
 1, Split the first patch to two patches, one is constant definition and
@@ -72,28 +72,10 @@
 4, Update the default config file.
 5, Sync the code to upstream.
 
-V9 -> V10:
-1, Rework "Introduce and use cpu_has_coherent_cache feature".
-2, Handle the case that System BIOS doesn't contain a VGA BIOS.
-3, Sync the code to upstream (mostly indentation adjustment).
-
-V10 -> V11:
-1, Remove normal labels and useless nops in inline assembler.
-2, Sync the code to upstream (Prepared for 3.12).
-
-V11 -> V12:
-1, Delete __cpuinit usage;
-2, Remove the third patch since it is contentious;
-3, Sync the code to upstream (Prepared for 3.13).
-
-V12 -> V13:
-1, Rework addrspace.h and spaces.h;
-2, Move the modification of Platform from patch 1 to patch 12;
-3, Sync the code to upstream (the mips-for-linux-next branch, for 3.13).
-
-Huacai Chen(12):
+Huacai Chen(13):
  MIPS: Loongson: Add basic Loongson-3 definition.
  MIPS: Loongson: Add basic Loongson-3 CPU support.
+ MIPS: Loongson: Introduce and use cpu_has_coherent_cache feature.
  MIPS: Loongson 3: Add Lemote-3A machtypes definition.
  MIPS: Loongson: Add UEFI-like firmware interface support.
  MIPS: Loongson 3: Add HT-linked PCI support.
@@ -109,20 +91,22 @@
 Signed-off-by: Hongliang Tao <taohl@lemote.com>
 Signed-off-by: Hua Yan <yanh@lemote.com>
 ---
- arch/mips/Kconfig                                  |   30 ++
- arch/mips/configs/loongson3_defconfig              |  338 +++++++++++++++
- arch/mips/include/asm/addrspace.h                  |    2 +
+ arch/mips/Kconfig                                  |   29 ++
+ arch/mips/configs/loongson3_defconfig              |  329 ++++++++++++++
+ arch/mips/include/asm/addrspace.h                  |    6 +
  arch/mips/include/asm/bootinfo.h                   |   24 +-
- arch/mips/include/asm/cpu-type.h                   |    4 +
+ arch/mips/include/asm/cacheflush.h                 |    6 +
+ arch/mips/include/asm/cpu-features.h               |    3 +
  arch/mips/include/asm/cpu.h                        |    5 +-
  arch/mips/include/asm/dma-mapping.h                |    5 +
  arch/mips/include/asm/mach-loongson/boot_param.h   |  151 +++++++
+ .../asm/mach-loongson/cpu-feature-overrides.h      |    6 +
  .../mips/include/asm/mach-loongson/dma-coherence.h |   23 +
  arch/mips/include/asm/mach-loongson/irq.h          |   24 +
  arch/mips/include/asm/mach-loongson/loongson.h     |   26 +-
  arch/mips/include/asm/mach-loongson/machine.h      |    6 +
  arch/mips/include/asm/mach-loongson/pci.h          |    5 +
- arch/mips/include/asm/mach-loongson/spaces.h       |   19 +
+ arch/mips/include/asm/mach-loongson/spaces.h       |   15 +
  arch/mips/include/asm/module.h                     |    2 +
  arch/mips/include/asm/pgtable-bits.h               |    7 +
  arch/mips/include/asm/smp.h                        |    1 +
@@ -134,7 +118,7 @@
  arch/mips/loongson/common/dma-swiotlb.c            |  163 +++++++
  arch/mips/loongson/common/env.c                    |   67 +++-
  arch/mips/loongson/common/init.c                   |   14 +-
- arch/mips/loongson/common/machtype.c               |    4 +
+ arch/mips/loongson/common/machtype.c               |   20 +-
  arch/mips/loongson/common/mem.c                    |   42 ++
  arch/mips/loongson/common/pci.c                    |    6 +-
  arch/mips/loongson/common/reset.c                  |   16 +
@@ -143,15 +127,15 @@
  arch/mips/loongson/common/uart_base.c              |    9 +-
  arch/mips/loongson/loongson-3/Makefile             |    6 +
  arch/mips/loongson/loongson-3/irq.c                |   97 +++++
- arch/mips/loongson/loongson-3/smp.c                |  444 ++++++++++++++++++++
+ arch/mips/loongson/loongson-3/smp.c                |  452 ++++++++++++++++++++
  arch/mips/loongson/loongson-3/smp.h                |   24 +
- arch/mips/mm/c-r4k.c                               |   56 +++
- arch/mips/mm/tlb-r4k.c                             |    3 +-
+ arch/mips/mm/c-r4k.c                               |   83 ++++-
+ arch/mips/mm/tlb-r4k.c                             |    2 +-
  arch/mips/mm/tlbex.c                               |    1 +
  arch/mips/pci/Makefile                             |    1 +
- arch/mips/pci/fixup-loongson3.c                    |   68 +++
+ arch/mips/pci/fixup-loongson3.c                    |   65 +++
  arch/mips/pci/ops-loongson3.c                      |  104 +++++
- 42 files changed, 1853 insertions(+), 56 deletions(-)
+ 44 files changed, 1890 insertions(+), 67 deletions(-)
  create mode 100644 arch/mips/configs/loongson3_defconfig
  create mode 100644 arch/mips/include/asm/mach-loongson/boot_param.h
  create mode 100644 arch/mips/include/asm/mach-loongson/irq.h