Commit 80b451cd authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-dt-4.21' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents 457a728d 79da07de

Documentation/devicetree/bindings/arm/emtrion.txt

0 → 100644
+12 −0
Original line number Diff line number Diff line 
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

Documentation/devicetree/bindings/pci/layerscape-pci.txt

+4 −3
Original line number Diff line number Diff line
@@ -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";

arch/arm/boot/dts/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -397,6 +397,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6dl-cubox-i-emmc-som-v15.dtb \

	imx6dl-cubox-i-som-v15.dtb \

	imx6dl-dfi-fs700-m60.dtb \

	imx6dl-emcon-avari.dtb \

	imx6dl-gw51xx.dtb \

	imx6dl-gw52xx.dtb \

	imx6dl-gw53xx.dtb \
@@ -461,6 +462,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6q-display5-tianma-tm070-1280x768.dtb \

	imx6q-dmo-edmqmx6.dtb \

	imx6q-dms-ba16.dtb \

	imx6q-emcon-avari.dtb \

	imx6q-evi.dtb \

	imx6q-gk802.dtb \

	imx6q-gw51xx.dtb \
@@ -558,6 +560,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ 
	imx6ul-liteboard.dtb \

	imx6ul-opos6uldev.dtb \

	imx6ul-pico-hobbit.dtb \

	imx6ul-pico-pi.dtb \

	imx6ul-tx6ul-0010.dtb \

	imx6ul-tx6ul-0011.dtb \

	imx6ul-tx6ul-mainboard.dtb \
@@ -573,6 +576,7 @@ dtb-$(CONFIG_SOC_IMX7D) += \ 
	imx7d-pico-pi.dtb \

	imx7d-sbc-imx7.dtb \

	imx7d-sdb.dtb \

	imx7d-sdb-reva.dtb \

	imx7d-sdb-sht11.dtb \

	imx7s-colibri-eval-v3.dtb \

	imx7s-warp.dtb
@@ -582,6 +586,7 @@ dtb-$(CONFIG_SOC_LS1021A) += \ 
	ls1021a-twr.dtb

dtb-$(CONFIG_SOC_VF610) += \

	vf500-colibri-eval-v3.dtb \

	vf610-bk4.dtb \

	vf610-colibri-eval-v3.dtb \

	vf610m4-colibri.dtb \

	vf610-cosmic.dtb \
@@ -590,6 +595,7 @@ dtb-$(CONFIG_SOC_VF610) += \ 
	vf610-zii-cfu1.dtb \

	vf610-zii-dev-rev-b.dtb \

	vf610-zii-dev-rev-c.dtb \

	vf610-zii-scu4-aib.dtb \

	vf610-zii-ssmb-spu3.dtb

dtb-$(CONFIG_ARCH_MXS) += \

	imx23-evk.dtb \

arch/arm/boot/dts/imx1-ads.dts

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
	};



	memory@8000000 {

		device_type = "memory";

		reg = <0x08000000 0x04000000>;

	};

};

arch/arm/boot/dts/imx1-apf9328.dts

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
	};



	memory@8000000 {

		device_type = "memory";

		reg = <0x08000000 0x00800000>;

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE