Merge tag 'imx-dt-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt

i.MX device tree updates for 4.11:
 - New board support: vf610-zii-dev-rev-c, imx6ul-opos6uldev,
   imx6ul-isiot, imx6qdl-savageboard, imx6q-mccmon6.
 - A patch from Alexandre to correct the mangled license text which
   has been copied & pasted all over the i.MX device tree files.
 - Update cpu nodes of some i.MX SoCs to make them consistent and match
   ePAPR spec.
 - Add OCOTP device for i.MX6UL SoC.
 - Add security violation interrupt for i.MX25 DryIce.
 - Enable USB OTG, WIFI and Bluetooth support for i.MX6SX Udoo Neo
   board.
 - Enable S/PDIF and 2nd display pipeline support for CompuLab board..
 - Add SPI and LTC3676 PMIC support for Gateworks Ventana boards.
 - A few random device addition for various boards: TVE DAC regulators
   for imx53-qsb, EEPROM for vf610-zii-dev, eMMC and NAND support for
   i.MX6UL Engicam boards.
 - Cleanups on obsoleted or unused properties.

* tag 'imx-dt-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (32 commits)
  ARM: dts: udoo_neo: Add Bluetooth support
  ARM: dts: udoo_neo: Add Wifi support
  ARM: dts: udoo_neo: Add UDOO Neo USB OTG1 and OTG2 support
  ARM: dts: imx6ul: Add Engicam Is.IoT MX6UL NAND initial support
  ARM: dts: imx6ul: Add Engicam Is.IoT MX6UL eMMC initial support
  ARM: dts: imx6qdl: Fix "ERROR: code indent should use tabs where possible"
  ARM: dts: vf610-zii-dev: add EEPROM entry to Rev C
  ARM: dts: add Armadeus Systems OPOS6UL and OPOS6ULDEV support
  ARM: dts: imx6q-utilite-pro: enable 2nd display pipeline
  ARM: dts: vf610-zii-dev: Add .dts file for rev. C
  ARM: dts: vf610-zii-dev-rev-b: Remove leftover PWM pingroup
  ARM: dts: imx6: Support Savageboard quad
  ARM: dts: imx6: Support Savageboard dual
  ARM: dts: imx6: Add Savageboard common file
  ARM: dts: imx53-qsb: Provide the TVE DAC regulators
  ARM: dts: imx6q: Add mccmon6 board support
  Doc: devicetree: bindings: Add vendor prefix entry - lwn
  ARM: dts: imx/vf: Correct license text
  ARM: dts: imx25.dtsi: DryIce security violation interrupt
  ARM: dts: imx: Add ocotp node for imx6ul
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 3 insertions, 2 deletions

diff --git a/arch/arm/boot/dts/imx31.dtsi b/arch/arm/boot/dts/imx31.dtsi
index 85cd8be22f71..c0a5d5f90434 100644
--- a/arch/arm/boot/dts/imx31.dtsi
+++ b/arch/arm/boot/dts/imx31.dtsi
@@ -22,12 +22,13 @@
 	};
 
 	cpus {
-		#address-cells = <0>;
+		#address-cells = <1>;
 		#size-cells = <0>;
 
-		cpu {
+		cpu@0 {
 			compatible = "arm,arm1136jf-s";
 			device_type = "cpu";
+			reg = <0>;
 		};
 	};