Commit 476ca77f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX device tree update for 4.20:
 - New board support: Engicam's i.Core MX6 CPU module v1.5; ConnectCore
   6UL Single Board Computer (SBC) Pro; i.MX6 ULZ based EVK board.
 - Add Add SFF interface support for vf610-zii board.
 - Disable unneeded devices like VPU and internal watchdog for imx51-zii
   boards.
 - Add 'no-sdio' and 'no-sd' property for vf610-zii-cfu1 board.
 - Improve i.MX6 SLL GPIO support by adding gpio-ranges property and
   clocks information.
 - Update iomux header for i.MX7 Solo and i.MX6 ULL.
 - Enable GPIO buttons as wakeup source for imx7d-sdb and imx6sx-sdb.
 - Add GPIO keys and egalax touch screen support for imx6qdl-sabreauto.
 - Switch to use SPDX-License-Identifier for more boards - vf610-twr,
   imx7s-warp, Engicam boards.
 - Add device tree bindings of 'fsl,pmic-stby-poweroff' property and add
   the support for i.MX6 RIoTboard.
 - DTC has new checks for SPI buses which will be landed on 4.20.
   A patch from Rob to fix those 100+ warnings on i.MX boards. (Thanks!)
 - Switch i.MX7 device tree to use updated coresight binding for
   hardware ports.
 - Misc small or random update and cleanup.

* tag 'imx-dt-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

: (50 commits)
  ARM: dts: imx: add i.mx6ulz and i.mx6ulz 14x14 evk support
  dt-bindings: arm: add compatible for i.MX6ULZ 14x14 EVK board
  ARM: dts: imx53-ppd: Remove 'num-chipselects' property
  ARM: dts: vf610-twr: Switch to SPDX identifier
  ARM: dts: vf: Switch to SPDX identifier
  ARM: dts: imx6qdl-zii-rdu2: Disable the internal RTC
  ARM: dts: imx51-zii-rdu1: Fix the rtc compatible string
  ARM: dts: imx6ul: use nvmem-cells for cpu speed grading
  ARM: dts: imx: Fix SPI bus warnings
  ARM: dts: imx7: Update coresight binding for hardware ports
  ARM: dts: vf610-zii-cfu1: Pass the 'no-sd' property
  ARM: dts: vf610-zii-cfu1: Pass the 'no-sdio' property
  ARM: dts: imx51-zii-scu2-mezz: Disable the internal watchdog
  ARM: dts: imx51-zii-scu2-mezz: Disable VPU
  ARM: dts: imx51-zii-scu3-esb: Disable VPU
  ARM: dts: imx51: Add label for VPU node
  ARM: dts: imx6ull: update vdd_soc voltage for 900MHz operating point
  ARM: dts: imx6ul: Add DTS for ConnectCore 6UL SBC Pro
  ARM: dts: imx6: RIoTboard provide standby on power off option
  dt-bindings: imx6q-clock: add new fsl,pmic-stby-poweroff property
  ...

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 55dc9723 04007fe4

Documentation/devicetree/bindings/arm/fsl.txt

+44 −0
Original line number Original line Diff line number Diff line
@@ -57,6 +57,50 @@ i.MX6SLL EVK board 
Required root node properties:

Required root node properties:

    - compatible = "fsl,imx6sll-evk", "fsl,imx6sll";

    - compatible = "fsl,imx6sll-evk", "fsl,imx6sll";





i.MX6 Quad Plus SABRE Smart Device Board

Required root node properties:

    - compatible = "fsl,imx6qp-sabresd", "fsl,imx6qp";



i.MX6 Quad Plus SABRE Automotive Board

Required root node properties:

    - compatible = "fsl,imx6qp-sabreauto", "fsl,imx6qp";



i.MX6 DualLite SABRE Smart Device Board

Required root node properties:

    - compatible = "fsl,imx6dl-sabresd", "fsl,imx6dl";



i.MX6 DualLite/Solo SABRE Automotive Board

Required root node properties:

    - compatible = "fsl,imx6dl-sabreauto", "fsl,imx6dl";



i.MX6 SoloLite EVK Board

Required root node properties:

    - compatible = "fsl,imx6sl-evk", "fsl,imx6sl";



i.MX6 UltraLite 14x14 EVK Board

Required root node properties:

    - compatible = "fsl,imx6ul-14x14-evk", "fsl,imx6ul";



i.MX6 UltraLiteLite 14x14 EVK Board

Required root node properties:

    - compatible = "fsl,imx6ull-14x14-evk", "fsl,imx6ull";



i.MX6 ULZ 14x14 EVK Board

Required root node properties:

    - compatible = "fsl,imx6ulz-14x14-evk", "fsl,imx6ull", "fsl,imx6ulz";



i.MX6 SoloX SDB Board

Required root node properties:

    - compatible = "fsl,imx6sx-sdb", "fsl,imx6sx";



i.MX6 SoloX Sabre Auto Board

Required root node properties:

    - compatible = "fsl,imx6sx-sabreauto", "fsl,imx6sx";



i.MX7 SabreSD Board

Required root node properties:

    - compatible = "fsl,imx7d-sdb", "fsl,imx7d";



Generic i.MX boards

Generic i.MX boards

-------------------

-------------------

Documentation/devicetree/bindings/clock/imx6q-clock.txt

+8 −0
Original line number Original line Diff line number Diff line
@@ -6,6 +6,14 @@ Required properties: 
- interrupts: Should contain CCM interrupt

- interrupts: Should contain CCM interrupt

- #clock-cells: Should be <1>

- #clock-cells: Should be <1>





Optional properties:

- fsl,pmic-stby-poweroff: Configure CCM to assert PMIC_STBY_REQ signal

  on power off.

  Use this property if the SoC should be powered off by external power

  management IC (PMIC) triggered via PMIC_STBY_REQ signal.

  Boards that are designed to initiate poweroff on PMIC_ON_REQ signal should

  be using "syscon-poweroff" driver instead.



The clock consumer should specify the desired clock by having the clock

The clock consumer should specify the desired clock by having the clock

ID in its "clocks" phandle cell.  See include/dt-bindings/clock/imx6qdl-clock.h

ID in its "clocks" phandle cell.  See include/dt-bindings/clock/imx6qdl-clock.h

for the full list of i.MX6 Quad and DualLite clock IDs.

for the full list of i.MX6 Quad and DualLite clock IDs.

arch/arm/boot/dts/Makefile

+3 −1
Original line number Original line Diff line number Diff line
@@ -550,6 +550,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \ 
dtb-$(CONFIG_SOC_IMX6UL) += \

dtb-$(CONFIG_SOC_IMX6UL) += \

	imx6ul-14x14-evk.dtb \

	imx6ul-14x14-evk.dtb \

	imx6ul-ccimx6ulsbcexpress.dtb \

	imx6ul-ccimx6ulsbcexpress.dtb \

	imx6ul-ccimx6ulsbcpro.dtb \

	imx6ul-geam.dtb \

	imx6ul-geam.dtb \

	imx6ul-isiot-emmc.dtb \

	imx6ul-isiot-emmc.dtb \

	imx6ul-isiot-nand.dtb \

	imx6ul-isiot-nand.dtb \
@@ -561,7 +562,8 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ 
	imx6ul-tx6ul-mainboard.dtb \

	imx6ul-tx6ul-mainboard.dtb \

	imx6ull-14x14-evk.dtb \

	imx6ull-14x14-evk.dtb \

	imx6ull-colibri-eval-v3.dtb \

	imx6ull-colibri-eval-v3.dtb \

	imx6ull-colibri-wifi-eval-v3.dtb

	imx6ull-colibri-wifi-eval-v3.dtb \

	imx6ulz-14x14-evk.dtb

dtb-$(CONFIG_SOC_IMX7D) += \

dtb-$(CONFIG_SOC_IMX7D) += \

	imx7d-cl-som-imx7.dtb \

	imx7d-cl-som-imx7.dtb \

	imx7d-colibri-emmc-eval-v3.dtb \

	imx7d-colibri-emmc-eval-v3.dtb \

arch/arm/boot/dts/imx1.dtsi

+2 −2
Original line number Original line Diff line number Diff line
@@ -164,7 +164,7 @@ 
			reg = <0x00210000 0x10000>;

			reg = <0x00210000 0x10000>;

			ranges;

			ranges;





			cspi1: cspi@213000 {

			cspi1: spi@213000 {

				#address-cells = <1>;

				#address-cells = <1>;

				#size-cells = <0>;

				#size-cells = <0>;

				compatible = "fsl,imx1-cspi";

				compatible = "fsl,imx1-cspi";
@@ -186,7 +186,7 @@ 
				status = "disabled";

				status = "disabled";

			};

			};





			cspi2: cspi@219000 {

			cspi2: spi@219000 {

				#address-cells = <1>;

				#address-cells = <1>;

				#size-cells = <0>;

				#size-cells = <0>;

				compatible = "fsl,imx1-cspi";

				compatible = "fsl,imx1-cspi";

arch/arm/boot/dts/imx23-evk.dts

+1 −1
Original line number Original line Diff line number Diff line
@@ -58,7 +58,7 @@ 
				status = "okay";

				status = "okay";

			};

			};





			ssp0: ssp@80010000 {

			ssp0: spi@80010000 {

				compatible = "fsl,imx23-mmc";

				compatible = "fsl,imx23-mmc";

				pinctrl-names = "default";

				pinctrl-names = "default";

				pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>;

				pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>;