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

i.MX device tree changes for 5.1:
 - New board support: Logic PD i.MX6QD EVM, ZII SSMB DTU, Phytec
   phyBOARD i.MX6UL Segin, Y Soft IOTA Draco, Hydra and Ursa boards.
 - Add regulator control for various sensors on imx6qdl-sabresd board.
 - Add DISPLAY power domain support for i.MX6SX SoC.
 - Add stmpe-adc device node for Toradex iMX6 module.
 - Switch to SPDX identifier for imx6q-tbs2910 board.
 - Add proper ksz9031 clock skew values for imx6qdl-phytec-pfla02 board.
 - Mark I2C recovery GPIOs as open drain and correct and WEIM range
   configuration for apalis/colibri boards.
 - Small and random updates to various devices.

* tag 'imx-dt-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (31 commits)
  ARM: dts: imx: Add support for Logic PD i.MX6QD EVM
  ARM: dts: imx6qdl-sabresd: remove reg_sensors' regulator-always-on
  ARM: dts: imx6qdl-sabresd: add regulators control for mma8451 sensor
  ARM: dts: imx6qdl-sabresd: add regulators control for mag3110 sensor
  ARM: dts: imx6qdl-sabresd: add regulator control for isl29023 sensor
  ARM: dts: vf610: Add ZII SSMB DTU board
  ARM: dts: pfla02: add ksz9031 clock skew values
  ARM: dts: imx6qdl-phytec-pfla02: add missing interrupt-controller property
  ARM: dts: Add stmpe-adc DT node to Toradex iMX6 modules
  ARM: dts: Add devicetree compatibles for LS1021A based boards
  ARM: dts: colibri: use valid range configuration for weim
  ARM: dts: imx6: Add support for Phytec phyBOARD i.MX6UL Segin
  ARM: dts: imx6*-apalis/-colibri: mark I2C recovery GPIOs as open drain
  ARM: dts: vf610-zii-ssmb-spu3: Pass "no-sdio"/"no-sd" properties
  ARM: dts: imx: Add Y Soft IOTA Draco, Hydra and Ursa boards
  ARM: dts: imx7ulp: add sim node
  ARM: dts: imx6ull: change to use new compatible "fsl,imx6ull-usdhc" for usdhc
  ARM: dts: imx6ull: Fix i.MX6ULL/ULZ ocotp compatible
  ARM: dts: imx6sx: Add DISPLAY power domain support
  ARM: dts: i.MX51: digi-connectcore-som: Add support for I2C bus recovery
  ...

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 10 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi
index 97c1e37e9997..114e41e290e9 100644
--- a/arch/arm/boot/dts/ls1021a.dtsi
+++ b/arch/arm/boot/dts/ls1021a.dtsi
@@ -131,6 +131,13 @@
 		interrupt-parent = <&gic>;
 		ranges;
 
+		ddr: memory-controller@1080000 {
+			compatible = "fsl,qoriq-memory-controller";
+			reg = <0x0 0x1080000 0x0 0x1000>;
+			interrupts = <GIC_SPI 176 IRQ_TYPE_LEVEL_HIGH>;
+			big-endian;
+		};
+
 		gic: interrupt-controller@1400000 {
 			compatible = "arm,gic-400", "arm,cortex-a7-gic";
 			#interrupt-cells = <3>;
@@ -817,6 +824,7 @@
 			dr_mode = "host";
 			snps,quirk-frame-length-adjustment = <0x20>;
 			snps,dis_rxdet_inp3_quirk;
+			snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
 		};
 
 		pcie@3400000 {
@@ -830,6 +838,7 @@
 			#size-cells = <2>;
 			device_type = "pci";
 			num-lanes = <4>;
+			num-viewport = <6>;
 			bus-range = <0x0 0xff>;
 			ranges = <0x81000000 0x0 0x00000000 0x40 0x00010000 0x0 0x00010000   /* downstream I/O */
 				  0x82000000 0x0 0x40000000 0x40 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
@@ -854,6 +863,7 @@
 			#size-cells = <2>;
 			device_type = "pci";
 			num-lanes = <4>;
+			num-viewport = <6>;
 			bus-range = <0x0 0xff>;
 			ranges = <0x81000000 0x0 0x00000000 0x48 0x00010000 0x0 0x00010000   /* downstream I/O */
 				  0x82000000 0x0 0x40000000 0x48 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */