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

Pull MIPS updates from Ralf Baechle:
 "This is the main pull request for MIPS for 4.5 plus some 4.4 fixes.

  The executive summary:

   - ATH79 platform improvments, use DT bindings for the ATH79 USB PHY.
   - Avoid useless rebuilds for zboot.
   - jz4780: Add NEMC, BCH and NAND device tree nodes
   - Initial support for the MicroChip's DT platform.  As all the device
     drivers are missing this is still of limited use.
   - Some Loongson3 cleanups.
   - The unavoidable whitespace polishing.
   - Reduce clock skew when synchronizing the CPU cycle counters on CPU
     startup.
   - Add MIPS R6 fixes.
   - Lots of cleanups across arch/mips as fallout from KVM.
   - Lots of minor fixes and changes for IEEE 754-2008 support to the
     FPU emulator / fp-assist software.
   - Minor Ralink, BCM47xx and bcm963xx platform support improvments.
   - Support SMP on BCM63168"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (84 commits)
  MIPS: zboot: Add support for serial debug using the PROM
  MIPS: zboot: Avoid useless rebuilds
  MIPS: BMIPS: Enable ARCH_WANT_OPTIONAL_GPIOLIB
  MIPS: bcm63xx: nvram: Remove unused bcm63xx_nvram_get_psi_size() function
  MIPS: bcm963xx: Update bcm_tag field image_sequence
  MIPS: bcm963xx: Move extended flash address to bcm_tag header file
  MIPS: bcm963xx: Move Broadcom BCM963xx image tag data structure
  MIPS: bcm63xx: nvram: Use nvram structure definition from header file
  MIPS: bcm963xx: Add Broadcom BCM963xx board nvram data structure
  MAINTAINERS: Add KVM for MIPS entry
  MIPS: KVM: Add missing newline to kvm_err()
  MIPS: Move KVM specific opcodes into asm/inst.h
  MIPS: KVM: Use cacheops.h definitions
  MIPS: Break down cacheops.h definitions
  MIPS: Use EXCCODE_ constants with set_except_vector()
  MIPS: Update trap codes
  MIPS: Move Cause.ExcCode trap codes to mipsregs.h
  MIPS: KVM: Make kvm_mips_{init,exit}() static
  MIPS: KVM: Refactor added offsetof()s
  MIPS: KVM: Convert EXPORT_SYMBOL to _GPL
  ...

1 files changed, 64 insertions, 0 deletions

diff --git a/arch/mips/boot/dts/ingenic/ci20.dts b/arch/mips/boot/dts/ingenic/ci20.dts
index 9fcb9e7d1f57..1652d8d60b1e 100644
--- a/arch/mips/boot/dts/ingenic/ci20.dts
+++ b/arch/mips/boot/dts/ingenic/ci20.dts
@@ -42,3 +42,67 @@
 &uart4 {
         status = "okay";
 };
+
+&nemc {
+        status = "okay";
+
+        nandc: nand-controller@1 {
+                compatible = "ingenic,jz4780-nand";
+                reg = <1 0 0x1000000>;
+
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                ingenic,bch-controller = <&bch>;
+
+                ingenic,nemc-tAS = <10>;
+                ingenic,nemc-tAH = <5>;
+                ingenic,nemc-tBP = <10>;
+                ingenic,nemc-tAW = <15>;
+                ingenic,nemc-tSTRV = <100>;
+
+                nand@1 {
+                        reg = <1>;
+
+                        nand-ecc-step-size = <1024>;
+                        nand-ecc-strength = <24>;
+                        nand-ecc-mode = "hw";
+                        nand-on-flash-bbt;
+
+                        partitions {
+                                compatible = "fixed-partitions";
+                                #address-cells = <2>;
+                                #size-cells = <2>;
+
+                                partition@0 {
+                                        label = "u-boot-spl";
+                                        reg = <0x0 0x0 0x0 0x800000>;
+                                };
+
+                                partition@0x800000 {
+                                        label = "u-boot";
+                                        reg = <0x0 0x800000 0x0 0x200000>;
+                                };
+
+                                partition@0xa00000 {
+                                        label = "u-boot-env";
+                                        reg = <0x0 0xa00000 0x0 0x200000>;
+                                };
+
+                                partition@0xc00000 {
+                                        label = "boot";
+                                        reg = <0x0 0xc00000 0x0 0x4000000>;
+                                };
+
+                                partition@0x8c00000 {
+                                        label = "system";
+                                        reg = <0x0 0x4c00000 0x1 0xfb400000>;
+                                };
+                        };
+                };
+        };
+};
+
+&bch {
+        status = "okay";
+};