Unverified Commit dbd68eb5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

i.MX device tree change for 5.20:

- A series from Alexander Stein to fix some i.MX6UL dt_binding_check
  warnings.
- Replace deprecated 'enable-sdio-wakeup' property with 'wakeup-source'
  for a couple of boards.
- A set of imx7-colibri device tree updates from Marcel Ziswiler to
  improve devices Display, Touch, Ethernet and SD/MMC, and also adds
  Toradex Iris carrier board.
- A few improvements on imx6qdl-colibri board, correct SGTL5000 MCLK
  handling, simplify handling of inverted PWM backlight.
- A series from Max Krummenacher (and Oleksandr Suvorov) to improve the
  existing i.MX6 Apalis carrier board device trees and adds a new device
  tree for the Ixora V1.2 carrier board.
- Add USB dual-role switching using extcon for imx7-colibri board.
- Add SFP node for TA 2.1 devices for LayerScape SoCs.
- Other small and random updates on various boards.

* tag 'imx-dt-5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (61 commits)
  ARM: dts: layerscape: Add SFP node for TA 2.1 devices
  ARM: dts: imx6qdl-prti6q.dtsi: Add applicable properties to usdhc3
  ARM: dts: imx6q-bosch-acc: Replace 'enable-sdio-wakeup'
  ARM: dts: imx7d-smegw01: Replace 'enable-sdio-wakeup'
  ARM: dts: imx6q-apalis: Cleanup
  ARM: dts: imx6q-apalis: backlight pwm: Adapt brightness steps
  ARM: dts: imx6q-apalis: backlight pwm: Simplify inverted backlight
  ARM: dts: imx6q-apalis: Add support for Toradex Ixora V1.2 carrier boards
  ARM: dts: imx6q-apalis: Clean-up sd card support
  ARM: dts: imx6q-apalis: Add adv7280 video input
  ARM: dts: imx6q-apalis: Add ov5640 mipi csi camera
  ARM: dts: imx6q-apalis: Disable stmpe touchscreen
  ARM: dts: imx6q-apalis: Disable HDMI
  ARM: dts: imx6q-apalis: Add LVDS panel support
  ARM: dts: imx6q-apalis: move gpio-keys to SoM dtsi
  ARM: dts: imx6q-apalis: Move Atmel MXT touch ctrl to SoM dtsi
  ARM: dts: imx6q-apalis: Move pinmux groups to SoM dtsi
  ARM: dts: imx6q-apalis: Move parallel rgb interface to SoM dtsi
  ARM: dts: imx6q-apalis: Command pmic to standby for poweroff
  ARM: dts: imx6q-apalis: Add gpio-line-names
  ...

Link: https://lore.kernel.org/r/20220709082951.15123-4-shawnguo@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 8128bfe3 04069a86

arch/arm/boot/dts/Makefile

+7 −0
Original line number Diff line number Diff line
@@ -550,6 +550,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6q-apalis-eval.dtb \

	imx6q-apalis-ixora.dtb \

	imx6q-apalis-ixora-v1.1.dtb \

	imx6q-apalis-ixora-v1.2.dtb \

	imx6q-apf6dev.dtb \

	imx6q-arm2.dtb \

	imx6q-b450v3.dtb \
@@ -741,8 +742,12 @@ dtb-$(CONFIG_SOC_IMX7D) += \ 
	imx7d-cl-som-imx7.dtb \

	imx7d-colibri-aster.dtb \

	imx7d-colibri-emmc-aster.dtb \

	imx7d-colibri-emmc-iris.dtb \

	imx7d-colibri-emmc-iris-v2.dtb \

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

	imx7d-colibri-eval-v3.dtb \

	imx7d-colibri-iris.dtb \

	imx7d-colibri-iris-v2.dtb \

	imx7d-flex-concentrator.dtb \

	imx7d-flex-concentrator-mfg.dtb \

	imx7d-mba7.dtb \
@@ -762,6 +767,8 @@ dtb-$(CONFIG_SOC_IMX7D) += \ 
	imx7d-zii-rpu2.dtb \

	imx7s-colibri-aster.dtb \

	imx7s-colibri-eval-v3.dtb \

	imx7s-colibri-iris.dtb \

	imx7s-colibri-iris-v2.dtb \

	imx7s-mba7.dtb \

	imx7s-warp.dtb

dtb-$(CONFIG_SOC_IMX7ULP) += \

arch/arm/boot/dts/e60k02.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -22,14 +22,14 @@ chosen { 
	gpio_keys: gpio-keys {

		compatible = "gpio-keys";



		power {

		key-power {

			label = "Power";

			gpios = <&gpio5 8 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

			wakeup-source;

		};



		cover {

		key-cover {

			label = "Cover";

			gpios = <&gpio5 12 GPIO_ACTIVE_LOW>;

			linux,code = <SW_LID>;

arch/arm/boot/dts/e70k02.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -26,14 +26,14 @@ chosen { 
	gpio_keys: gpio-keys {

		compatible = "gpio-keys";



		power {

		key-power {

			label = "Power";

			gpios = <&gpio4 25 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

			wakeup-source;

		};



		cover {

		key-cover {

			label = "Cover";

			gpios = <&gpio4 23 GPIO_ACTIVE_LOW>;

			linux,code = <SW_LID>;
@@ -41,13 +41,13 @@ cover { 
			wakeup-source;

		};



		pageup {

		key-pageup {

			label = "PageUp";

			gpios = <&gpio4 0 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_PAGEUP>;

		};



		pagedown {

		key-pagedown {

			label = "PageDown";

			gpios = <&gpio4 2 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_PAGEDOWN>;

arch/arm/boot/dts/imx25.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ osc { 
		};

	};



	soc {

	soc: soc {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "simple-bus";

arch/arm/boot/dts/imx27.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -74,14 +74,14 @@ cpu: cpu@0 { 
		};

	};



	soc {

	soc: soc {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "simple-bus";

		interrupt-parent = <&aitc>;

		ranges;



		aipi@10000000 { /* AIPI1 */

		aipi1: aipi@10000000 { /* AIPI1 */

			compatible = "fsl,aipi-bus", "simple-bus";

			#address-cells = <1>;

			#size-cells = <1>;
@@ -453,7 +453,7 @@ gpt6: timer@1001f000 { 
			};

		};



		aipi@10020000 { /* AIPI2 */

		aipi2: aipi@10020000 { /* AIPI2 */

			compatible = "fsl,aipi-bus", "simple-bus";

			#address-cells = <1>;

			#size-cells = <1>;