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

i.MX device tree update for 4.21:
 - New boards support: emtrion emCON-MX6, imx6ul-pico-pi, imx7d-sdb-reva
   and vf610 based Liebherr's BK4 device, ZII SCU4 AIB board.
 - Add flexcan support for i.MX6UL SoC, turn on stop mode wakeup feature
   for flexcan, and enable devices on a few i.MX6 NXP boards.
 - Enable AUO G101EVN010 lcd panel and Goodix touch support for
   imx6ul-ccimx6ulsbcpro board.
 - Enable sensors support for imx6qdl-sabresd board: egalax touch, light,
   magnetometer and accelerometer sensor.
 - Switch more boards to use SPDX identifier.
 - Fix memory node duplication in i.MX device tree sources.
 - Correct GIC PPI interrupts mask for i.MX6UL and i.MX7 SoCs.
 - Drop 'snps,dw-pcie' compatible from LS1021A PCIe device to avoid
   incorrect device matching.
 - Add the gpu nodes for the adreno 200 GPU on iMX51 and iMX53, which
   are now supported by the freedreno driver.
 - Add DCP device support for i.MX6ULL, which requires explicit clock
   enabling.
 - Add '#thermal-sensor-cells' for thermal device and '#cooling-cells'
   for cooling devices.
 - Add missing clock information for EPIT on i.MX25 SoC.
 - Add PWM and qdma devices for LS1021A SoC.
 - Update cooling maps of LS1021A SoC to include all devices affected by
   individual trip points.
 - Random device addition and cleanup on various boards.

* tag 'imx-dt-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (82 commits)
  ARM: dts: imx51-zii-rdu1: Do not specify "power-gpio" for hpa1
  ARM: dts: imx6ul: Remove extra space between node name and brace
  ARM: dts: imx6qdl-sabresd: Use GPIO_ACTIVE_HIGH for regulators
  ARM: dts: imx6ul: add flexcan support
  ARM: dts: imx5: add gpu nodes
  ARM: dts: imx6qdl-sabresd: add accelerometer sensor support
  ARM: dts: imx6qdl-sabresd: add magnetometer sensor support
  ARM: dts: imx6qdl-sabresd: add light sensor support
  ARM: dts: imx6qdl-sabresd: Move regulators outside of "simple-bus"
  ARM: dts: imx6qdl: Fix memory node duplication
  ARM: dts: imx6dl-mamoj: Add a memory node
  ARM: dts: imx53-voipac-dmm-668: Fix memory node duplication
  ARM: dts: vf610-zii-scu4-aib: Add HI8435 support
  ARM: dts: imx6qdl-sabresd: add egalax touch screen support on i2c2 bus
  ARM: dts: imx7s: Add flexcan stop mode wakeup support
  ARM: dts: imx6ul: Add flexcan stop mode wakeup support
  ARM: dts: imx6qdl: Add flexcan stop mode wakeup support
  ARM: dts: imx6sx: Add flexcan stop mode wakeup support
  ARM: dts: imx6ul-pico: Add the imx6ul-pico-pi variant
  ARM: dts: imx6ul-pico-hobbit: Extend peripherals support
  ...

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

2 files changed, 16 insertions, 3 deletions

diff --git a/Documentation/devicetree/bindings/arm/emtrion.txt b/Documentation/devicetree/bindings/arm/emtrion.txt
new file mode 100644
index 000000000000..83329aefc483
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/emtrion.txt
@@ -0,0 +1,12 @@
+Emtrion Devicetree Bindings
+===========================
+
+emCON Series:
+-------------
+
+Required root node properties
+	- compatible:
+	- "emtrion,emcon-mx6", "fsl,imx6q"; 		: emCON-MX6D or emCON-MX6Q SoM
+	- "emtrion,emcon-mx6-avari", "fsl,imx6q";	: emCON-MX6D or emCON-MX6Q SoM on Avari Base
+	- "emtrion,emcon-mx6", "fsl,imx6dl"; 		: emCON-MX6S or emCON-MX6DL SoM
+	- "emtrion,emcon-mx6-avari", "fsl,imx6dl";	: emCON-MX6S or emCON-MX6DL SoM on Avari Base
diff --git a/Documentation/devicetree/bindings/pci/layerscape-pci.txt b/Documentation/devicetree/bindings/pci/layerscape-pci.txt
index 66df1e81e0b8..9b2b8d66d1f4 100644
--- a/Documentation/devicetree/bindings/pci/layerscape-pci.txt
+++ b/Documentation/devicetree/bindings/pci/layerscape-pci.txt
@@ -13,11 +13,12 @@ information.
 
 Required properties:
 - compatible: should contain the platform identifier such as:
-        "fsl,ls1021a-pcie", "snps,dw-pcie"
-        "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", "snps,dw-pcie"
+        "fsl,ls1021a-pcie"
+        "fsl,ls2080a-pcie", "fsl,ls2085a-pcie"
         "fsl,ls2088a-pcie"
         "fsl,ls1088a-pcie"
         "fsl,ls1046a-pcie"
+        "fsl,ls1043a-pcie"
         "fsl,ls1012a-pcie"
 - reg: base addresses and lengths of the PCIe controller register blocks.
 - interrupts: A list of interrupt outputs of the controller. Must contain an
@@ -35,7 +36,7 @@ Required properties:
 Example:
 
 	pcie@3400000 {
-		compatible = "fsl,ls1021a-pcie", "snps,dw-pcie";
+		compatible = "fsl,ls1021a-pcie";
 		reg = <0x00 0x03400000 0x0 0x00010000   /* controller registers */
 		       0x40 0x00000000 0x0 0x00002000>; /* configuration space */
 		reg-names = "regs", "config";