Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 278b1c8e authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

i.MX device tree update for 4.19:
 - Add device tree support for i.MX6SLL SoC.
 - New board support: ConnectCore 6UL System-On-Module and SBC Express;
   ZII SCU2 Mezz, SCU3 ESB, SSMB SPU3 and CFU1 board; i.MX6SLL EVK
   board; Engicam i.CoreM6 1.5 Quad/Dual MIPI; LogicPD MX31Lite board;
   i.MX53 HSC/DDC boards from K+P.
 - Remove fake regulator bus container node and enable USB OTG support
   for i.MX6 wandboard and riotboard.
 - Populate RAVE SP EEPROM, backlight, power button and watchdog devices
   for ZII boards.
 - Add cooling-cells for cpufreq cooling device, and add OPP properties
   for all CPUs.
 - A series from Anson Huang to enable LCD panel and backlight support
   for imx6sll-evk board.
 - Make pfuze100 sw4 regulator always-on for for a few Freescale/NXP
   development boards, because the regulator is critical there and
   cannot be turned off.
 - Add more device support for i.MX5: AIPSTZ, SAHARA Crypto, M4IF,
   Tigerp, PMU, CodaHx4 VPU.
 - Enable PMU secure-reg-access for imx51-babbage, imx51-zii-rdu1 and
   imx53-ppd board.
 - Switch more device tree license to use SPDX identifier.
 - Switch to use OF graph to describe the display for imx7d-nitrogen7.
 - Add chosen/stdout-path for more boards, so that earlycon can be
   enabled more easily on kernel cmdline.
 - Convert GPC to new device tree bindings and add Vivante gpu nodes
   for i.MX6SL SoC.
 - Add more device support for imx6dl-mamoj board: parallel display,
   WiFi and USB.
 - A series from Stefan Agner to update i.MX6 apalis/colibri boards on
   various aspects: SD/MMC card detection, regulators, etc.

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

: (96 commits)
  ARM: dts: imx7d: remove "operating-points" property for cpu1
  ARM: dts: vf610-zii-ssmb-spu3: Fix W=1 level warnings
  ARM: dts: vf610: Add ZII CFU1 board
  ARM: dts: imx6dl-mamoj: Add usb host and device support
  ARM: dts: imx6dl-mamoj: Add Wifi support
  ARM: dts: imx6dl-mamoj: Add parallel display support
  ARM: dts: vf610: Add ZII SSMB SPU3 board
  ARM: dts: imx6ul-pico-hobbit: Do not hardcode the memory size
  ARM: dts: imx6sl-evk: make pfuze100 sw4 always on
  ARM: dts: imx6sll-evk: make pfuze100 sw4 always on
  ARM: dts: imx6sx-sdb-reva: make pfuze100 sw4 always on
  ARM: dts: imx6qdl-sabresd: make pfuze100 sw4 always on
  ARM: dts: imx6sl-evk: add missing GPIO iomux setting
  ARM: dts: imx51-zii-scu3-esb: Fix RAVE SP watchdog compatible string
  ARM: dts: imx51-zii-scu3-esb: Add switch IRQ line pinumx config
  ARM: dts: imx6sx-nitrogen6sx: remove obsolete display configuration
  ARM: dts: imx7d-nitrogen7: use OF graph to describe the display
  ARM: dts: imx: Switch Boundary Devices boards to SPDX identifier
  ARM: dts: imx6sl: Add vivante gpu nodes
  ARM: dts: imx6sll-evk: enable SEIKO 43WVF1G lcdif panel
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3c34a845 33a8d5a5

Documentation/devicetree/bindings/arm/freescale/m4if.txt

0 → 100644
+12 −0
Original line number Diff line number Diff line 
* Freescale Multi Master Multi Memory Interface (M4IF) module



Required properties:

- compatible : Should be "fsl,imx51-m4if"

- reg : Address and length of the register set for the device



Example:



m4if: m4if@83fd8000 {

	compatible = "fsl,imx51-m4if";

	reg = <0x83fd8000 0x1000>;

};

Documentation/devicetree/bindings/arm/freescale/tigerp.txt

0 → 100644
+12 −0
Original line number Diff line number Diff line 
* Freescale Tigerp platform module



Required properties:

- compatible : Should be "fsl,imx51-tigerp"

- reg : Address and length of the register set for the device



Example:



tigerp: tigerp@83fa0000 {

	compatible = "fsl,imx51-tigerp";

	reg = <0x83fa0000 0x28>;

};

Documentation/devicetree/bindings/arm/fsl.txt

+4 −0
Original line number Diff line number Diff line
@@ -53,6 +53,10 @@ i.MX6 Quad SABRE Automotive Board 
Required root node properties:

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



i.MX6SLL EVK board

Required root node properties:

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



Generic i.MX boards

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

arch/arm/boot/dts/Makefile

+14 −3
Original line number Diff line number Diff line
@@ -351,7 +351,8 @@ dtb-$(CONFIG_SOC_IMX27) += \ 
	imx27-phytec-phycore-rdk.dtb \

	imx27-phytec-phycard-s-rdk.dtb

dtb-$(CONFIG_SOC_IMX31) += \

	imx31-bug.dtb

	imx31-bug.dtb \

	imx31-lite.dtb

dtb-$(CONFIG_SOC_IMX35) += \

	imx35-eukrea-mbimxsd35-baseboard.dtb \

	imx35-pdk.dtb
@@ -364,10 +365,14 @@ dtb-$(CONFIG_SOC_IMX51) += \ 
	imx51-digi-connectcore-jsk.dtb \

	imx51-eukrea-mbimxsd51-baseboard.dtb \

	imx51-ts4800.dtb \

	imx51-zii-rdu1.dtb

	imx51-zii-rdu1.dtb \

	imx51-zii-scu2-mezz.dtb \

	imx51-zii-scu3-esb.dtb

dtb-$(CONFIG_SOC_IMX53) += \

	imx53-ard.dtb \

	imx53-cx9020.dtb \

	imx53-kp-ddc.dtb \

	imx53-kp-hsc.dtb \

	imx53-m53evk.dtb \

	imx53-mba53.dtb \

	imx53-ppd.dtb \
@@ -406,6 +411,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6dl-hummingboard2-emmc-som-v15.dtb \

	imx6dl-hummingboard2-som-v15.dtb \

	imx6dl-icore.dtb \

	imx6dl-icore-mipi.dtb \

	imx6dl-icore-rqs.dtb \

	imx6dl-mamoj.dtb \

	imx6dl-nit6xlite.dtb \
@@ -527,6 +533,8 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
dtb-$(CONFIG_SOC_IMX6SL) += \

	imx6sl-evk.dtb \

	imx6sl-warp.dtb

dtb-$(CONFIG_SOC_IMX6SLL) += \

	imx6sll-evk.dtb

dtb-$(CONFIG_SOC_IMX6SX) += \

	imx6sx-nitrogen6sx.dtb \

	imx6sx-sabreauto.dtb \
@@ -539,6 +547,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \ 
	imx6sx-udoo-neo-full.dtb

dtb-$(CONFIG_SOC_IMX6UL) += \

	imx6ul-14x14-evk.dtb \

	imx6ul-ccimx6ulsbcexpress.dtb \

	imx6ul-geam.dtb \

	imx6ul-isiot-emmc.dtb \

	imx6ul-isiot-nand.dtb \
@@ -573,8 +582,10 @@ dtb-$(CONFIG_SOC_VF610) += \ 
	vf610-cosmic.dtb \

	vf610m4-cosmic.dtb \

	vf610-twr.dtb \

	vf610-zii-cfu1.dtb \

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

	vf610-zii-dev-rev-c.dtb

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

	vf610-zii-ssmb-spu3.dtb

dtb-$(CONFIG_ARCH_MXS) += \

	imx23-evk.dtb \

	imx23-olinuxino.dtb \

arch/arm/boot/dts/imx31-lite.dts

0 → 100644
+177 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

//

// Copyright (C) 2016-2018 Vladimir Zapolskiy <vz@mleia.com>



/dts-v1/;



#include "imx31.dtsi"



#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/interrupt-controller/irq.h>



/ {

	model = "LogicPD i.MX31 Lite";

	compatible = "logicpd,imx31-lite", "fsl,imx31";



	chosen {

		stdout-path = &uart1;

	};



	memory@80000000 {

		reg = <0x80000000 0x8000000>;

	};



	leds {

		compatible = "gpio-leds";



		led0 {

			gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;

		};



		led1 {

			gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;

		};

	};

};



&ata {

	status = "okay";

};



&nfc {

	nand-bus-width = <8>;

	nand-ecc-mode = "hw";

	nand-on-flash-bbt;

	status = "okay";

};



&sdhci1 {

	bus-width = <4>;

	cd-gpios = <&gpio2 11 GPIO_ACTIVE_HIGH>;

	wp-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;

	status = "okay";

};



&spi2 {

	status = "okay";



	pmic@0 {

		compatible = "fsl,mc13783";

		reg = <0>;

		spi-cs-high;

		spi-max-frequency = <1000000>;

		interrupt-parent = <&gpio1>;

		interrupts = <3 IRQ_TYPE_EDGE_RISING>;



		fsl,mc13xxx-uses-adc;

		fsl,mc13xxx-uses-rtc;



		regulators {

			sw1a {		/* QVCC */

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <1500000>;

				regulator-always-on;

				regulator-boot-on;

			};



			sw1b {		/* QVCC */

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <1500000>;

				regulator-always-on;

				regulator-boot-on;

			};



			sw2a {		/* 1.8V_DDR, NVCC2, NVCC21 and NVCC22 */

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-always-on;

				regulator-boot-on;

			};



			sw2b {		/* NVCC10 */

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-always-on;

				regulator-boot-on;

			};



			violo {		/* NVCC1 and NVCC7 */

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-always-on;

				regulator-boot-on;

			};



			viohi {		/* VIOHI */

				regulator-min-microvolt = <2775000>;

				regulator-max-microvolt = <2775000>;

				regulator-always-on;

				regulator-boot-on;

			};



			vaudio {	/* VAUDIO */

				regulator-min-microvolt = <2775000>;

				regulator-max-microvolt = <2775000>;

			};



			vcam {		/* NVCC4 */

				regulator-min-microvolt = <2800000>;

				regulator-max-microvolt = <2800000>;

			};



			vgen {		/* NVCC5 / NVCC8 and NVCC6 / NVCC9 */

				regulator-min-microvolt = <2775000>;

				regulator-max-microvolt = <2775000>;

				regulator-always-on;

				regulator-boot-on;

			};



			vmmc2 {		/* NVCC3 */

				regulator-min-microvolt = <1600000>;

				regulator-max-microvolt = <3000000>;

				regulator-always-on;

				regulator-boot-on;

			};

		};

	};

};



&uart1 {

	uart-has-rtscts;

	status = "okay";

};



/* Routed to the extension board */

&uart2 {

	uart-has-rtscts;

	status = "okay";

};



/* Routed to the extension board */

&uart3 {

	uart-has-rtscts;

	status = "okay";

};



&weim {

	status = "okay";



	nor@0,0 {

		compatible = "cfi-flash";

		reg = <0 0x0 0x200000>;

		bank-width = <2>;

		linux,mtd-name = "physmap-flash.0";

		fsl,weim-cs-timing = <0x0000cf03 0xa0330d01 0x00220800>;

	};



	ethernet@4,0 {

		compatible = "smsc,lan9117", "smsc,lan9115";

		reg = <4 0x0 0x100>;

		interrupt-parent = <&gpio1>;

		interrupts = <26 IRQ_TYPE_EDGE_FALLING>;

		phy-mode = "mii";

		reg-io-width = <2>;

		smsc,irq-push-pull;

		fsl,weim-cs-timing = <0x00008701 0x04000541 0x00010000>;

	};

};