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, 5 insertions, 8 deletions

diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
index 26d060484728..70772ebadd4d 100644
--- a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
@@ -12,17 +12,17 @@
  *     modify it under the terms of the GNU General Public License
  *     version 2 as published by the Free Software Foundation.
  *
- *     This file is distributed in the hope that it will be useful
+ *     This file is distributed in the hope that it will be useful,
  *     but WITHOUT ANY WARRANTY; without even the implied warranty of
  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *     GNU General Public License for more details.
  *
- * Or, alternatively
+ * Or, alternatively,
  *
  *  b) Permission is hereby granted, free of charge, to any person
  *     obtaining a copy of this software and associated documentation
  *     files (the "Software"), to deal in the Software without
- *     restriction, including without limitation the rights to use
+ *     restriction, including without limitation the rights to use,
  *     copy, modify, merge, publish, distribute, sublicense, and/or
  *     sell copies of the Software, and to permit persons to whom the
  *     Software is furnished to do so, subject to the following
@@ -31,11 +31,11 @@
  *     The above copyright notice and this permission notice shall be
  *     included in all copies or substantial portions of the Software.
  *
- *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  *     OTHER DEALINGS IN THE SOFTWARE.
@@ -255,7 +255,6 @@
 };
 
 &ecspi1 {
-	fsl,spi-num-chipselects = <1>;
 	cs-gpios = <&gpio3 19 0>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_ecspi1>;
@@ -579,8 +578,6 @@
 	status = "okay";
 
 	lvds-channel@0 {
-		fsl,data-mapping = "spwg";
-		fsl,data-width = <18>;
 		status = "okay";
 
 		port@4 {