Unverified Commit 8bd8822c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

i.MX device tree changes for 5.16:

- New board support: Kobo Libra H2O, Tolino Vision 5, SKOV LT2 and
  Colibri i.MX6ULL eMMC variants.
- A series from Fabio Estevam to correct SPI chipselect polarity for
  various i.MX6/7 boards.
- A couple of patches from Krzysztof Kozlowski to clean up unsupported
  properties from imx6dl-b1x5v2 and imx6dl-prtrvt boards.
- A series from Li Yang to clean up LS1021a based boards and add missing
  device nodes.
- A series from Matthias Schiffer to fix typo, add SPI-NOR flash and
  partition layout for imx7-tqma7/mba7 boards.
- Fix the schema check errors in i.MX PCIe device nodes.
- Other random and small fix-up and device additions.

* tag 'imx-dt-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (42 commits)
  ARM: dts: ls1021a-tsn: use generic "jedec,spi-nor" compatible for flash
  ARM: dts: ls1021a: move thermal-zones node out of soc/
  ARM: dts: ls1021a-tsn: remove undocumented property "position" from mma8452 node
  ARM: dts: ls1021a-qds: change fpga to simple-mfd device
  ARM: dts: ls1021a: add #power-domain-cells for power-controller node
  ARM: dts: ls1021a: add #dma-cells to qdma node
  ARM: dts: ls1021a: fix memory node for schema check
  ARM: dts: ls1021a: remove regulators simple-bus
  ARM: dts: ls1021a: disable ifc node by default
  ARM: dts: ls1021a: breakup long values in thermal node
  ARM: dts: ls1021a: fix board compatible to follow binding schema
  ARM: dts: ls1021a: update pcie nodes for dt-schema check
  ARM: dts: ls1021a-qds: Add node for QSPI flash
  ARM: dts: ls1021a: change to use SPDX identifiers
  ARM: dts: ls1021a: change dma channels order to match schema
  ARM: dts: ls1021a: remove clock-names property for i2c nodes
  ARM: dts: imx6dl-prtrvt: drop undocumented TRF7970A NFC properties
  ARM: dts: imx6: phytec: Add gpio pinctrl for i2c bus recovery
  ARM: dts: imx6: skov: provide panel support for lt2 variants
  ARM: dts: imx6qdl-apalis: Fix typo in ADC comment
  ...

Link: https://lore.kernel.org/r/20211016140138.1603-3-shawnguo@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 353bbb3d 05e63b48

arch/arm/boot/dts/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -645,10 +645,12 @@ dtb-$(CONFIG_SOC_IMX6SL) += \ 
	imx6sl-evk.dtb \

	imx6sl-tolino-shine2hd.dtb \

	imx6sl-tolino-shine3.dtb \

	imx6sl-tolino-vision5.dtb \

	imx6sl-warp.dtb

dtb-$(CONFIG_SOC_IMX6SLL) += \

	imx6sll-evk.dtb \

	imx6sll-kobo-clarahd.dtb

	imx6sll-kobo-clarahd.dtb \

	imx6sll-kobo-librah2o.dtb

dtb-$(CONFIG_SOC_IMX6SX) += \

	imx6sx-nitrogen6sx.dtb \

	imx6sx-sabreauto.dtb \
@@ -681,6 +683,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ 
	imx6ul-tx6ul-0011.dtb \

	imx6ul-tx6ul-mainboard.dtb \

	imx6ull-14x14-evk.dtb \

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

	imx6ull-colibri-eval-v3.dtb \

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

	imx6ull-myir-mys-6ulx-eval.dtb \

arch/arm/boot/dts/e60k02.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ cover { 
	leds: leds {

		compatible = "gpio-leds";



		on {

		led {

			label = "e60k02:white:on";

			gpios = <&gpio5 7 GPIO_ACTIVE_LOW>;

			linux,default-trigger = "timer";

arch/arm/boot/dts/e70k02.dtsi

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

/*

 * Copyright 2021 Andreas Kemnade

 * based on works

 * Copyright 2016 Freescale Semiconductor, Inc.

 * and

 * Copyright (C) 2014 Ricoh Electronic Devices Co., Ltd

 *

 * Netronix E70K02 board common.

 * This board is equipped with different SoCs and

 * found in ebook-readers like the Kobo Clara HD (with i.MX6SLL) and

 * the Tolino Shine 3 (with i.MX6SL)

 */

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



/ {

	aliases {

		mmc0 = &usdhc1;

		mmc1 = &usdhc3;

	};



	chosen {

		stdout-path = &uart1;

	};



	gpio_keys: gpio-keys {

		compatible = "gpio-keys";



		power {

			label = "Power";

			gpios = <&gpio4 25 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

			wakeup-source;

		};



		cover {

			label = "Cover";

			gpios = <&gpio4 23 GPIO_ACTIVE_LOW>;

			linux,code = <SW_LID>;

			linux,input-type = <EV_SW>;

			wakeup-source;

		};



		pageup {

			label = "PageUp";

			gpios = <&gpio4 0 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_PAGEUP>;

		};



		pagedown {

			label = "PageDown";

			gpios = <&gpio4 2 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_PAGEDOWN>;

		};

	};



	leds: leds {

		compatible = "gpio-leds";



		led {

			label = "e70k02:white:on";

			gpios = <&gpio4 17 GPIO_ACTIVE_LOW>;

			linux,default-trigger = "timer";

		};

	};



	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x20000000>;

	};



	reg_wifi: regulator-wifi {

		compatible = "regulator-fixed";

		regulator-name = "SD3_SPWR";

		regulator-min-microvolt = <3000000>;

		regulator-max-microvolt = <3000000>;

		gpio = <&gpio4 29 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};



	wifi_pwrseq: wifi-pwrseq {

		compatible = "mmc-pwrseq-simple";

		post-power-on-delay-ms = <20>;

		reset-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;

	};

};



&i2c1 {

	clock-frequency = <100000>;

	status = "okay";



	lm3630a: backlight@36 {

		reg = <0x36>;

		compatible = "ti,lm3630a";

		enable-gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>;



		#address-cells = <1>;

		#size-cells = <0>;



		led@0 {

			reg = <0>;

			led-sources = <0>;

			label = "backlight_warm";

			default-brightness = <0>;

			max-brightness = <255>;

		};



		led@1 {

			reg = <1>;

			led-sources = <1>;

			label = "backlight_cold";

			default-brightness = <0>;

			max-brightness = <255>;

		};

	};



	/* TODO: KX122 acceleration sensor a 0x1e */



};



&i2c2 {

	clock-frequency = <100000>;

	status = "okay";



	/* TODO: CYTTSP5 touch controller at 0x24 */



	/* TODO: SY7636 PMIC for E Ink at 0x62 */



};



&i2c3 {

	clock-frequency = <100000>;

	status = "okay";



	ricoh619: pmic@32 {

		compatible = "ricoh,rc5t619";

		reg = <0x32>;

		interrupt-parent = <&gpio4>;

		interrupts = <19 IRQ_TYPE_EDGE_FALLING>;

		system-power-controller;



		regulators {

			dcdc1_reg: DCDC1 {

				regulator-name = "DCDC1";

				regulator-min-microvolt = <300000>;

				regulator-max-microvolt = <1875000>;

				regulator-always-on;

				regulator-boot-on;



				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-max-microvolt = <900000>;

					regulator-suspend-min-microvolt = <900000>;

				};

			};



			/* Core3_3V3 */

			dcdc2_reg: DCDC2 {

				regulator-name = "DCDC2";

				regulator-always-on;

				regulator-boot-on;



				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-max-microvolt = <3300000>;

					regulator-suspend-min-microvolt = <3300000>;

				};

			};



			dcdc3_reg: DCDC3 {

				regulator-name = "DCDC3";

				regulator-min-microvolt = <300000>;

				regulator-max-microvolt = <1875000>;

				regulator-always-on;

				regulator-boot-on;



				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-max-microvolt = <1140000>;

					regulator-suspend-min-microvolt = <1140000>;

				};

			};



			/* Core4_1V2 */

			dcdc4_reg: DCDC4 {

				regulator-name = "DCDC4";

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <1200000>;

				regulator-always-on;

				regulator-boot-on;



				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-max-microvolt = <1140000>;

					regulator-suspend-min-microvolt = <1140000>;

				};

			};



			/* Core4_1V8 */

			dcdc5_reg: DCDC5 {

				regulator-name = "DCDC5";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-always-on;

				regulator-boot-on;



				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-max-microvolt = <1700000>;

					regulator-suspend-min-microvolt = <1700000>;

				};

			};



			ldo1_reg: LDO1  {

				regulator-name = "LDO1";

				regulator-boot-on;

			};



			/* Core1_3V3 */

			ldo2_reg: LDO2  {

				regulator-name = "LDO2";

				regulator-always-on;

				regulator-boot-on;



				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-max-microvolt = <3000000>;

					regulator-suspend-min-microvolt = <3000000>;

				};

			};



			/* Core5_1V2 */

			ldo3_reg: LDO3  {

				regulator-name = "LDO3";

				regulator-always-on;

				regulator-boot-on;

			};



			ldo4_reg: LDO4 {

				regulator-name = "LDO4";

				regulator-boot-on;

			};



			/* SPD_3V3 */

			ldo5_reg: LDO5 {

				regulator-name = "LDO5";

				regulator-always-on;

				regulator-boot-on;

			};



			/* DDR_0V6 */

			ldo6_reg: LDO6 {

				regulator-name = "LDO6";

				regulator-always-on;

				regulator-boot-on;

			};



			/* VDD_PWM */

			ldo7_reg: LDO7 {

				regulator-name = "LDO7";

				regulator-boot-on;

			};



			/* ldo_1v8 */

			ldo8_reg: LDO8 {

				regulator-name = "LDO8";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-boot-on;

			};



			ldo9_reg: LDO9 {

				regulator-name = "LDO9";

				regulator-boot-on;

			};



			ldo10_reg: LDO10 {

				regulator-name = "LDO10";

				regulator-boot-on;

			};



			ldortc1_reg: LDORTC1  {

				regulator-name = "LDORTC1";

				regulator-boot-on;

			};

		};

	};

};



&snvs_rtc {

	/* we are using the rtc in the pmic, not disabled in imx6sll.dtsi */

	status = "disabled";

};



&uart1 {

	status = "okay";

};



&usdhc1 {

	non-removable;

	no-1-8-v;

	status = "okay";

};



&usdhc3 {

	vmmc-supply = <&reg_wifi>;

	mmc-pwrseq = <&wifi_pwrseq>;

	cap-power-off-card;

	non-removable;

	status = "okay";

};



&usbotg1 {

	pinctrl-names = "default";

	disable-over-current;

	srp-disable;

	hnp-disable;

	adp-disable;

	status = "okay";

};

arch/arm/boot/dts/imx6dl-alti6p.dts

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ &can1 { 
};



&ecspi1 {

	cs-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>;

	cs-gpios = <&gpio3 19 GPIO_ACTIVE_LOW>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_ecspi1>;

	status = "okay";

arch/arm/boot/dts/imx6dl-b1x5v2.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ &i2c5 { 
	mpl3115a2: pressure-sensor@60 {

		compatible = "fsl,mpl3115";

		reg = <0x60>;

		vcc-supply = <&reg_3v3_acm>;



		/*

		 * The MPL3115 interrupts are connected to pin 22 and 23