i.MX fixes for 5.10, round 5:
- Fix a regression on SoC revision detection with ANATOP, that is introduced by commit4a4fb66119
("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. -----BEGIN PGP SIGNATURE----- iQFIBAABCgAyFiEEFmJXigPl4LoGSz08UFdYWoewfM4FAl/GCSwUHHNoYXduZ3Vv QGtlcm5lbC5vcmcACgkQUFdYWoewfM4zjAgAgeqquV6/Xiz9aMDIilZD2YmCSzo6 bxOCEIIf9rcvX1rTkyrZ6XXZtLXVeTDHxrlDH9ZhbUS0yCu3bSf0geYLYqdp8Qp4 Ka5NsnxDo5roDek9hp2TCkg274nCdp7gx3iks9Lq85LiFYQMwQAq2ZzGXk09xCat 2vFzZiaNJk7DG/YP7rbaHOOO8GZLVk2jcdt4kFF3rftZ+h1xJPIknGEFaNeeTiUE mOBfhU0nI3zGqX1YzDPCutvJqAxTJMAJm9WSA3jLcmP/TSF4L+PhQLLO+knhO6r+ vwTlBWjYFLt8RLIuxrRDOcGu7ZvoHjZnjoMRMDqcibnW0YBW1bhwOzTVNA== =OPza -----END PGP SIGNATURE----- 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 commit4a4fb66119
("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>
This commit is contained in:
commit
5e2e740247
|
@ -551,7 +551,7 @@
|
||||||
|
|
||||||
pinctrl_i2c3: i2c3grp {
|
pinctrl_i2c3: i2c3grp {
|
||||||
fsl,pins = <
|
fsl,pins = <
|
||||||
MX6QDL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1
|
MX6QDL_PAD_GPIO_5__I2C3_SCL 0x4001b8b1
|
||||||
MX6QDL_PAD_GPIO_16__I2C3_SDA 0x4001b8b1
|
MX6QDL_PAD_GPIO_16__I2C3_SDA 0x4001b8b1
|
||||||
>;
|
>;
|
||||||
};
|
};
|
||||||
|
|
|
@ -166,7 +166,6 @@
|
||||||
MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b030
|
MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b030
|
||||||
MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b030
|
MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b030
|
||||||
MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b030
|
MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b030
|
||||||
MX6QDL_PAD_GPIO_6__ENET_IRQ 0x000b1
|
|
||||||
>;
|
>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -136,7 +136,7 @@ void __init imx_init_revision_from_anatop(void)
|
||||||
|
|
||||||
src_np = of_find_compatible_node(NULL, NULL,
|
src_np = of_find_compatible_node(NULL, NULL,
|
||||||
"fsl,imx6ul-src");
|
"fsl,imx6ul-src");
|
||||||
src_base = of_iomap(np, 0);
|
src_base = of_iomap(src_np, 0);
|
||||||
of_node_put(src_np);
|
of_node_put(src_np);
|
||||||
WARN_ON(!src_base);
|
WARN_ON(!src_base);
|
||||||
sbmr2 = readl_relaxed(src_base + SRC_SBMR2);
|
sbmr2 = readl_relaxed(src_base + SRC_SBMR2);
|
||||||
|
|
Loading…
Reference in New Issue