Commit 4f662ba2 authored Apr 01, 2021 by Arnd Bergmann

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

i.MX device tree change for 5.13:

- New board support: i.MX7D based reMarkable2.
- Clean up imx6ql-pfla02 hog group by moving pins into corresponded
  client groups.
- Add Netronix embedded controller for imx50-kobo-aura.
- A series from Sebastian Reichel to improve GE Bx50v3 device trees.
- Support I2C bus recovery for imx6qdl-wandboard by adding SCL/SDA
  GPIOs.
- Remove unnecessary #address-cells/#size-cells from imx6qdl-gw boards.
- Various small and random device tree update.

* tag 'imx-dt-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (21 commits)
  ARM: dts: imx6: pbab01: Set USB OTG port to peripheral
  ARM: dts: imx6: pfla02: Fix USB vbus enable pinmuxing
  ARM: imx7d-remarkable2: Initial device tree for reMarkable2
  ARM: dts: imx7d-mba7: Remove unsupported PCI properties
  ARM: dts: imx6qdl-gw*: Remove unnecessary #address-cells/#size-cells
  ARM: dts: imx6dl-plybas: Fix gpio-keys W=1 warnings
  ARM: dts: imx: bx50v3: Define GPIO line names
  ARM: dts: imx: bx50v3: i2c GPIOs are open drain
  ARM: dts: imx6q-ba16: improve PHY information
  ARM: dts: imx6q-ba16: add USB OTG VBUS enable GPIO
  ARM: dts: ls1021a: mark crypto engine dma coherent
  ARM: dts: colibri-imx6ull: Change drive strength for usdhc2
  ARM: dts: imx6ql-pfla02: Move "hog" pins into corresponded pin groups
  ARM: dts: imx6qdl-phytec-pbab01: Select synchronous mode for AUDMUX
  ARM: dts: imx6qdl-ts7970: Drop redundant "fsl,mode" option
  ARM: dts: imx53-qsb: Describe the esdhc1 card detect pin
  ARM: dts: ls1021a: Harmonize DWC USB3 DT nodes name
  ARM: dts: imx6qdl-wandboard: add scl/sda gpios definitions for i2c bus recovery
  ARM: dts: imx: Mark IIM as syscon on i.MX51/i.MX53
  ARM: dts: imx6sl-tolino-shine2hd: Add Netronix embedded controller
  ...

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


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 2771bc0d 45b78dd3

arch/arm/boot/dts/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -660,6 +660,7 @@ dtb-$(CONFIG_SOC_IMX7D) += \
		imx7d-pico-hobbit.dtb \
		imx7d-pico-nymph.dtb \
		imx7d-pico-pi.dtb \
		imx7d-remarkable2.dtb \
		imx7d-sbc-imx7.dtb \
		imx7d-sdb.dtb \
		imx7d-sdb-reva.dtb \

arch/arm/boot/dts/imx50-kobo-aura.dts

+15 −1

Original line number	Diff line number	Diff line
		@@ -143,10 +143,24 @@ &i2c3 {
		pinctrl-0 = <&pinctrl_i2c3>;
		status = "okay";

		/* TODO: embedded controller at 0x43 */
		embedded-controller@43 {
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_ec>;
		compatible = "netronix,ntxec";
		reg = <0x43>;
		system-power-controller;
		interrupts-extended = <&gpio4 11 IRQ_TYPE_EDGE_FALLING>;
		#pwm-cells = <2>;
		};
		};

		&iomuxc {
		pinctrl_ec: ecgrp {
		fsl,pins = <
		MX50_PAD_CSPI_SS0__GPIO4_11 0x0 /* INT */
		>;
		};

		pinctrl_gpiokeys: gpiokeysgrp {
		fsl,pins = <
		MX50_PAD_CSPI_MISO__GPIO4_10 0x0

arch/arm/boot/dts/imx51.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -467,7 +467,7 @@ aipstz2: bridge@83f00000 {
		};

		iim: efuse@83f98000 {
		compatible = "fsl,imx51-iim", "fsl,imx27-iim";
		compatible = "fsl,imx51-iim", "fsl,imx27-iim", "syscon";
		reg = <0x83f98000 0x4000>;
		interrupts = <69>;
		clocks = <&clks IMX5_CLK_IIM_GATE>;

arch/arm/boot/dts/imx53-qsb-common.dtsi

+2 −0

Original line number	Diff line number	Diff line
		@@ -142,6 +142,7 @@ &cpu0 {
		&esdhc1 {
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_esdhc1>;
		cd-gpios = <&gpio3 13 GPIO_ACTIVE_LOW>;
		status = "okay";
		};

		@@ -209,6 +210,7 @@ MX53_PAD_SD1_DATA2__ESDHC1_DAT2 0x1d5
		MX53_PAD_SD1_DATA3__ESDHC1_DAT3 0x1d5
		MX53_PAD_SD1_CMD__ESDHC1_CMD 0x1d5
		MX53_PAD_SD1_CLK__ESDHC1_CLK 0x1d5
		MX53_PAD_EIM_DA13__GPIO3_13 0xe4
		>;
		};

arch/arm/boot/dts/imx53.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -668,7 +668,7 @@ aipstz2: bridge@63f00000 {
		};

		iim: efuse@63f98000 {
		compatible = "fsl,imx53-iim", "fsl,imx27-iim";
		compatible = "fsl,imx53-iim", "fsl,imx27-iim", "syscon";
		reg = <0x63f98000 0x4000>;
		interrupts = <69>;
		clocks = <&clks IMX5_CLK_IIM_GATE>;