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

i.MX arm DTS changes for 5.7:

 - New support for i.MX6/7 based PICO devices and Toradex i.MX7 based
   Aster boards.
 - Add voltage monitor device node for vf610-zii boards.
 - Improve UART pins macro defines for i.MX6SX SoC and switch related
   boards to use the new names.
 - Use generic node name for devices like GPT, KPP, CCM, WDOG, OCOTP and
   IOMUXC in i.MX DTS files.
 - Switch imx6ul-pico device tree to DRM bindings.
 - Use SPDX-License-Identifier for all Toradex i.MX6/7 based boards.
 - Add proper rgmii PHY description for imx6dl-riotboard and
   imx6q-marsboard.
 - Add capture-subsystem device support for i.MX51.
 - Kill off "simple-panel" compatibles which has never been an accepted
   as an upstream compatible string.
 - Random device addition to various boards.

* tag 'imx-dt-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (55 commits)
  ARM: dts: imx6q-marsboard: properly define rgmii PHY
  ARM: dts: imx6dl-riotboard: properly define rgmii PHY
  ARM: dts: imx51-zii-rdu1: set name prefix for TPA6130A2
  ARM: dts: imx6: RDU2: assign video PLL as input to LDB
  ARM: dts: vf: toradex: SPDX tags and copyright cleanup
  ARM: dts: imx7: toradex: use SPDX-License-Identifier
  ARM: dts: imx6: toradex: use SPDX-License-Identifier
  ARM: dts: imx51: add capture-subsystem device
  ARM: dts: imx: add nvmem property for cpu0
  ARM: dts: imx6qdl: Add imx6qdl-pico support
  ARM: dts: imx6ul-pico: Add support for the dwarf baseboard
  ARM: dts: imx7d-pico: Add support for the nymph baseboard
  ARM: dts: imx7d-pico: Add support for the dwarf baseboard
  ARM: dts: imx23: introduce mmc0_sck_cfg
  ARM: dts: imx25-pinfunc: add config for kpp rows 4 to 7
  ARM: dts: imx: align name for crypto node and child nodes
  ARM: dts: imx6qdl-gw5910: add CC1352 UART
  ARM: dts: imx6qdl-sr-som-ti: indicate powering off wifi is safe
  ARM: dts: imx6: phycore-som: add da9062 gpio support
  ARM: dts: imx6: phycore-som: explicit disable pmic watchdog during suspend
  ...

Link: https://lore.kernel.org/r/20200318051918.32579-4-shawnguo@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 2 insertions, 38 deletions

diff --git a/arch/arm/boot/dts/vf610-colibri-eval-v3.dts b/arch/arm/boot/dts/vf610-colibri-eval-v3.dts
index ef9b4d6209f6..fb661e8a2dc6 100644
--- a/arch/arm/boot/dts/vf610-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/vf610-colibri-eval-v3.dts
@@ -1,42 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
 /*
- * Copyright 2014 Toradex AG
- *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPL or the X11 license, at your option. Note that this dual
- * licensing only applies to this file, and not this project as a
- * whole.
- *
- *  a) This file is free software; you can redistribute it and/or
- *     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,
- *     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,
- *
- *  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,
- *     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
- *     conditions:
- *
- *     The above copyright notice and this permission notice shall be
- *     included in all copies or substantial portions of the Software.
- *
- *     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,
- *     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.
+ * Copyright 2014-2020 Toradex
  */
 
 /dts-v1/;