Commit 5e2e7402 authored Dec 07, 2020 by Arnd Bergmann

Merge tag 'imx-fixes-5.10-5' of...

Merge tag 'imx-fixes-5.10-5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes

i.MX fixes for 5.10, round 5:

- Fix a regression on SoC revision detection with ANATOP, that is
  introduced by commit  4a4fb661 ("ARM: imx: Add missing
  of_node_put()").
- Drop PAD_GPIO_6 from imx6qdl-wandboard ENET pin group, as the pin is
  used by camera sensor now.
- Fix I2C3_SCL pinmux on imx6qdl-kontron-samx6i board, so that SoM EEPROM
  can be accessed.

* tag 'imx-fixes-5.10-5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx6qdl-kontron-samx6i: fix I2C_PM scl pin
  ARM: dts: imx6qdl-wandboard-revd1: Remove PAD_GPIO_6 from enetgrp
  ARM: imx: Use correct SRC base address

Link: https://lore.kernel.org/r/20201201091820.GW4072@dragon


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

parents b11ddaac 19ba8fb8

arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -551,7 +551,7 @@

		pinctrl_i2c3: i2c3grp {
		fsl,pins = <
		MX6QDL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1
		MX6QDL_PAD_GPIO_5__I2C3_SCL 0x4001b8b1
		MX6QDL_PAD_GPIO_16__I2C3_SDA 0x4001b8b1
		>;
		};

arch/arm/boot/dts/imx6qdl-wandboard-revd1.dtsi

+0 −1

Original line number	Diff line number	Diff line
		@@ -166,7 +166,6 @@
		MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b030
		MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b030
		MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b030
		MX6QDL_PAD_GPIO_6__ENET_IRQ 0x000b1
		>;
		};

arch/arm/mach-imx/anatop.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -136,7 +136,7 @@ void __init imx_init_revision_from_anatop(void)

		src_np = of_find_compatible_node(NULL, NULL,
		"fsl,imx6ul-src");
		src_base = of_iomap(np, 0);
		src_base = of_iomap(src_np, 0);
		of_node_put(src_np);
		WARN_ON(!src_base);
		sbmr2 = readl_relaxed(src_base + SRC_SBMR2);

Admin message