Unverified Commit 9b35ab1e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

i.MX arm32 device tree changes for 5.15:

- A series from Christoph Niedermaier to clean up i.MX6 DHCOM support.
- New board support: DHCOM based PicoITX, DHSOM based DRC02, SolidRun
  SolidSense, SKOV i.MX6 boards.
- Add WiFi support for i.MX7D base reMkarkable2 device.
- Add FTM devices for i.MX7 to have Flex Timers support.
- Configure ENET_REF clock to 125MHz for imx6qp-prtwd3 to support RGMII
  PHY mode.
- Drop unneeded #address-cells and #size-cells from vf610-zii SPI EEPROM
  device node.
- Add missing USB OTG OC pinmux and Crypto device for i.MX6QDL Gateworks
  boards.

* tag 'imx-dt-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (23 commits)
  ARM: dts: imx6qp-prtwd3: configure ENET_REF clock to 125MHz
  ARM: dts: vf610-zii-dev-rev-b: Remove #address-cells and #size-cells property from at93c46d dt node
  ARM: dts: add SKOV imx6q and imx6dl based boards
  ARM: dts: imx7: add ftm nodes for Flex Timers
  ARM: dts: imx6qdl-dhcom: Add DHSOM based DRC02 board
  ARM: dts: imx6qdl-dhcom: Add DHCOM based PicoITX board
  ARM: dts: imx6qdl-dhcom: Split SoC-independent parts of DHCOM SOM and PDK2
  ARM: dts: imx6q-dhcom: Cleanup of the devicetrees
  ARM: dts: imx6q-dhcom: Rearrange of iomux
  ARM: dts: imx6q-dhcom: Rework of the DHCOM GPIO pinctrls
  ARM: dts: imx6q-dhcom: Use 1G ethernet on the PDK2 board
  ARM: dts: imx6q-dhcom: Set minimum memory size of all DHCOM i.MX6 variants
  ARM: dts: imx6q-dhcom: Remove ddc-i2c-bus property
  ARM: dts: imx6q-dhcom: Add keys and leds to the PDK2 board
  ARM: dts: imx6q-dhcom: Align stdout-path with other DHCOM SoMs
  ARM: dts: imx6q-dhcom: Adding Wake pin to the PCIe pinctrl
  ARM: dts: imx6q-dhcom: Fill GPIO line names on DHCOM SoM
  ARM: dts: imx6q-dhcom: Add interrupt and compatible to the ethernet PHY
  ARM: dts: imx6q-dhcom: Add the parallel system bus
  ARM: dts: imx7d-remarkable2: Add WiFi support
  ...

Link: https://lore.kernel.org/r/20210814133853.9981-2-shawnguo@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 6d640913 87a8c716

arch/arm/boot/dts/Makefile

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

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

	imx6dl-dfi-fs700-m60.dtb \

	imx6dl-dhcom-picoitx.dtb \

	imx6dl-eckelmann-ci4x10.dtb \

	imx6dl-emcon-avari.dtb \

	imx6dl-gw51xx.dtb \
@@ -489,6 +490,9 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6dl-sabrelite.dtb \

	imx6dl-sabresd.dtb \

	imx6dl-savageboard.dtb \

	imx6dl-skov-revc-lt2.dtb \

	imx6dl-skov-revc-lt6.dtb \

	imx6dl-solidsense.dtb \

	imx6dl-ts4900.dtb \

	imx6dl-ts7970.dtb \

	imx6dl-tx6dl-comtft.dtb \
@@ -589,6 +593,10 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6q-sabresd.dtb \

	imx6q-savageboard.dtb \

	imx6q-sbc6x.dtb \

	imx6q-skov-revc-lt2.dtb \

	imx6q-skov-revc-lt6.dtb \

	imx6q-skov-reve-mi1010ait-1cp1.dtb \

	imx6q-solidsense.dtb \

	imx6q-tbs2910.dtb \

	imx6q-ts4900.dtb \

	imx6q-ts7970.dtb \
@@ -621,7 +629,8 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6qp-tx6qp-8137-mb7.dtb \

	imx6qp-vicutp.dtb \

	imx6qp-wandboard-revd1.dtb \

	imx6qp-zii-rdu2.dtb

	imx6qp-zii-rdu2.dtb \

	imx6s-dhcom-drc02.dtb

dtb-$(CONFIG_SOC_IMX6SL) += \

	imx6sl-evk.dtb \

	imx6sl-tolino-shine2hd.dtb \

arch/arm/boot/dts/imx6dl-dhcom-picoitx.dts

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

/*

 * Copyright (C) 2021 DH electronics GmbH

 *

 * DHCOM iMX6 variant:

 * DHCM-iMX6DL-C0800-R102-F0819-E-SD-RTC-T-HS-I-01D2

 * DHCOM PCB number: 493-300 or newer

 * PicoITX PCB number: 487-600 or newer

 */

/dts-v1/;



#include "imx6dl.dtsi"

#include "imx6qdl-dhcom-som.dtsi"

#include "imx6qdl-dhcom-picoitx.dtsi"



/ {

	model = "DH electronics i.MX6DL DHCOM on PicoITX";

	compatible = "dh,imx6dl-dhcom-picoitx", "dh,imx6dl-dhcom-som",

		     "fsl,imx6dl";

};

arch/arm/boot/dts/imx6dl-skov-revc-lt2.dts

0 → 100644
+13 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0 OR MIT)

//

// Copyright (C) 2020 Pengutronix, Ulrich Oelmann <kernel@pengutronix.de>



/dts-v1/;

#include "imx6dl.dtsi"

#include "imx6qdl-skov-cpu.dtsi"

#include "imx6qdl-skov-cpu-revc.dtsi"



/ {

	model = "SKOV IMX6 CPU SoloCore";

	compatible = "skov,imx6dl-skov-revc-lt2", "fsl,imx6dl";

};

arch/arm/boot/dts/imx6dl-skov-revc-lt6.dts

0 → 100644
+106 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0 OR MIT)

//

// Copyright (C) 2020 Pengutronix, Ulrich Oelmann <kernel@pengutronix.de>



/dts-v1/;

#include "imx6dl.dtsi"

#include "imx6qdl-skov-cpu.dtsi"

#include "imx6qdl-skov-cpu-revc.dtsi"



/ {

	model = "SKOV IMX6 CPU SoloCore";

	compatible = "skov,imx6dl-skov-revc-lt6", "fsl,imx6dl";



	backlight: backlight {

		compatible = "pwm-backlight";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_backlight>;

		enable-gpios = <&gpio6 23 GPIO_ACTIVE_LOW>;

		pwms = <&pwm2 0 20000 0>;

		brightness-levels = <0 255>;

		num-interpolated-steps = <17>;

		default-brightness-level = <8>;

		power-supply = <&reg_24v0>;

	};



	display {

		compatible = "fsl,imx-parallel-display";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_ipu1>;

		#address-cells = <1>;

		#size-cells = <0>;



		port@0 {

			reg = <0>;



			display0_in: endpoint {

				remote-endpoint = <&ipu1_di0_disp0>;

			};

		};



		port@1 {

			reg = <1>;



			display0_out: endpoint {

				remote-endpoint = <&panel_in>;

			};

		};

	};



	panel {

		compatible = "logictechno,lttd800480070-l6wh-rt";

		backlight = <&backlight>;

		power-supply = <&reg_3v3>;



		port {

			panel_in: endpoint {

				remote-endpoint = <&display0_out>;

			};

		};

	};

};



&ipu1_di0_disp0 {

	remote-endpoint = <&display0_in>;

};



&iomuxc {

	pinctrl_backlight: backlightgrp {

		fsl,pins = <

			MX6QDL_PAD_RGMII_TD3__GPIO6_IO23		0x58

		>;

	};



	pinctrl_ipu1: ipu1grp {

		fsl,pins = <

			MX6QDL_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK	0x10

			MX6QDL_PAD_DI0_PIN15__IPU1_DI0_PIN15		0x10

			MX6QDL_PAD_DI0_PIN2__IPU1_DI0_PIN02		0x10

			MX6QDL_PAD_DI0_PIN3__IPU1_DI0_PIN03		0x10

			MX6QDL_PAD_DISP0_DAT0__IPU1_DISP0_DATA00	0x10

			MX6QDL_PAD_DISP0_DAT1__IPU1_DISP0_DATA01	0x10

			MX6QDL_PAD_DISP0_DAT2__IPU1_DISP0_DATA02	0x10

			MX6QDL_PAD_DISP0_DAT3__IPU1_DISP0_DATA03	0x10

			MX6QDL_PAD_DISP0_DAT4__IPU1_DISP0_DATA04	0x10

			MX6QDL_PAD_DISP0_DAT5__IPU1_DISP0_DATA05	0x10

			MX6QDL_PAD_DISP0_DAT6__IPU1_DISP0_DATA06	0x10

			MX6QDL_PAD_DISP0_DAT7__IPU1_DISP0_DATA07	0x10

			MX6QDL_PAD_DISP0_DAT8__IPU1_DISP0_DATA08	0x10

			MX6QDL_PAD_DISP0_DAT9__IPU1_DISP0_DATA09	0x10

			MX6QDL_PAD_DISP0_DAT10__IPU1_DISP0_DATA10	0x10

			MX6QDL_PAD_DISP0_DAT11__IPU1_DISP0_DATA11	0x10

			MX6QDL_PAD_DISP0_DAT12__IPU1_DISP0_DATA12	0x10

			MX6QDL_PAD_DISP0_DAT13__IPU1_DISP0_DATA13	0x10

			MX6QDL_PAD_DISP0_DAT14__IPU1_DISP0_DATA14	0x10

			MX6QDL_PAD_DISP0_DAT15__IPU1_DISP0_DATA15	0x10

			MX6QDL_PAD_DISP0_DAT16__IPU1_DISP0_DATA16	0x10

			MX6QDL_PAD_DISP0_DAT17__IPU1_DISP0_DATA17	0x10

			MX6QDL_PAD_DISP0_DAT18__IPU1_DISP0_DATA18	0x10

			MX6QDL_PAD_DISP0_DAT19__IPU1_DISP0_DATA19	0x10

			MX6QDL_PAD_DISP0_DAT20__IPU1_DISP0_DATA20	0x10

			MX6QDL_PAD_DISP0_DAT21__IPU1_DISP0_DATA21	0x10

			MX6QDL_PAD_DISP0_DAT22__IPU1_DISP0_DATA22	0x10

			MX6QDL_PAD_DISP0_DAT23__IPU1_DISP0_DATA23	0x10

		>;

	};

};

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

0 → 100644
+54 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2015 Rabeeh Khoury <rabeeh@solid-run.com>

 * Based on dt work by Russell King

 *

 * This file is dual-licensed: you can use it either under the terms

 * of the GPL or the X11 license, at your option. Note that this dual

 * licensing only applies to this file, and not this project as a

 * whole.

 *

 *  a) This file is free software; you can redistribute it and/or

 *     modify it under the terms of the GNU General Public License

 *     version 2 as published by the Free Software Foundation.

 *

 *     This file is distributed in the hope that it will be useful,

 *     but WITHOUT ANY WARRANTY; without even the implied warranty of

 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *     GNU General Public License for more details.

 *

 * Or, alternatively,

 *

 *  b) Permission is hereby granted, free of charge, to any person

 *     obtaining a copy of this software and associated documentation

 *     files (the "Software"), to deal in the Software without

 *     restriction, including without limitation the rights to use,

 *     copy, modify, merge, publish, distribute, sublicense, and/or

 *     sell copies of the Software, and to permit persons to whom the

 *     Software is furnished to do so, subject to the following

 *     conditions:

 *

 *     The above copyright notice and this permission notice shall be

 *     included in all copies or substantial portions of the Software.

 *

 *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

 *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

 *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

 *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 *     OTHER DEALINGS IN THE SOFTWARE.

 */

/dts-v1/;



#include "imx6dl.dtsi"

#include "imx6qdl-sr-som.dtsi"

#include "imx6qdl-sr-som-emmc.dtsi"

#include "imx6qdl-sr-som-ti.dtsi"

#include "imx6qdl-hummingboard2.dtsi"

#include "imx6qdl-solidsense.dtsi"



/ {

	model = "SolidRun SolidSense Solo/DualLite (1.5som+emmc)";

	compatible = "solidrun,solidsense/dl", "fsl,imx6dl";

};