The TQMa6UL uses a downstream device tree, but there also appeared device trees for it upstream. Use the upstream device trees and add support for reading the board EEPROM to pick the right device tree for a particular board type. Sascha Hauer (8): board: tq: add missing select board: tq: fix format specifier board: tq: add support for 16bit eeprom ARM: i.MX6: add i2c4 base address ARM: tqma6ul: add pr_fmt string ARM: tqma6ul: enable enet_ref_125m clk net: phy: fix miibus parent device of_node not matching phy node ARM: tqma6ul: use upstream device trees arch/arm/boards/tqma6ulx/board.c | 16 +- arch/arm/boards/tqma6ulx/lowlevel.c | 46 ++- arch/arm/boards/tqma93xx/lowlevel.c | 2 +- arch/arm/dts/Makefile | 5 +- arch/arm/dts/imx6ul-mba6ulx.dtsi | 333 ------------------ ...mba6ulx.dts => imx6ul-tqma6ul-common.dtsi} | 5 - arch/arm/dts/imx6ul-tqma6ul2-mba6ulx.dts | 4 + arch/arm/dts/imx6ul-tqma6ul2l-mba6ulx.dts | 4 + arch/arm/dts/imx6ull-tqma6ull2-mba6ulx.dts | 4 + arch/arm/dts/imx6ull-tqma6ull2l-mba6ulx.dts | 4 + arch/arm/dts/tqma6ul-common.dtsi | 191 ---------- arch/arm/dts/tqma6ulx-common.dtsi | 28 -- arch/arm/mach-imx/Kconfig | 3 + common/boards/Kconfig | 1 + common/boards/tq/tq_eeprom.c | 6 +- drivers/net/phy/mdio_bus.c | 10 +- drivers/net/phy/phy.c | 2 +- include/boards/tq/tq_eeprom.h | 2 +- include/mach/imx/imx6-regs.h | 1 + 19 files changed, 93 insertions(+), 574 deletions(-) delete mode 100644 arch/arm/dts/imx6ul-mba6ulx.dtsi rename arch/arm/dts/{imx6ul-mba6ulx.dts => imx6ul-tqma6ul-common.dtsi} (96%) create mode 100644 arch/arm/dts/imx6ul-tqma6ul2-mba6ulx.dts create mode 100644 arch/arm/dts/imx6ul-tqma6ul2l-mba6ulx.dts create mode 100644 arch/arm/dts/imx6ull-tqma6ull2-mba6ulx.dts create mode 100644 arch/arm/dts/imx6ull-tqma6ull2l-mba6ulx.dts delete mode 100644 arch/arm/dts/tqma6ul-common.dtsi delete mode 100644 arch/arm/dts/tqma6ulx-common.dtsi -- 2.39.2