* [PATCH 1/8] board: tq: add missing select
2024-02-21 15:03 [PATCH 0/8] Update TQMa6UL Sascha Hauer
@ 2024-02-21 15:03 ` Sascha Hauer
2024-02-21 15:03 ` [PATCH 2/8] board: tq: fix format specifier Sascha Hauer
` (7 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Sascha Hauer @ 2024-02-21 15:03 UTC (permalink / raw)
To: Barebox List
The TQ board code needs CRC_ITU_T. Select it.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
common/boards/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/boards/Kconfig b/common/boards/Kconfig
index fe3a60d508..f6d4a56f88 100644
--- a/common/boards/Kconfig
+++ b/common/boards/Kconfig
@@ -12,4 +12,5 @@ config BOARD_PHYTEC_SOM_IMX8M_DETECTION
select BOARD_PHYTEC_SOM_DETECTION
config BOARD_TQ
+ select CRC_ITU_T
bool
--
2.39.2
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 2/8] board: tq: fix format specifier
2024-02-21 15:03 [PATCH 0/8] Update TQMa6UL Sascha Hauer
2024-02-21 15:03 ` [PATCH 1/8] board: tq: add missing select Sascha Hauer
@ 2024-02-21 15:03 ` Sascha Hauer
2024-02-21 15:03 ` [PATCH 3/8] board: tq: add support for 16bit eeprom Sascha Hauer
` (6 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Sascha Hauer @ 2024-02-21 15:03 UTC (permalink / raw)
To: Barebox List
The correct format specifier for a size_t type is %zu. Use it.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
common/boards/tq/tq_eeprom.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/boards/tq/tq_eeprom.c b/common/boards/tq/tq_eeprom.c
index 220d75ecab..06f11a8a94 100644
--- a/common/boards/tq/tq_eeprom.c
+++ b/common/boards/tq/tq_eeprom.c
@@ -75,7 +75,7 @@ void tq_vard_show(const struct tq_vard *vard)
(tq_vard_has_eeprom(vard) ? 'y' : 'n'));
if (tq_vard_has_eeprom(vard))
- printf("EEPROM\ttype %u, %lu KiB, page %lu\n",
+ printf("EEPROM\ttype %u, %lu KiB, page %zu\n",
(unsigned int)(vard->eepromtype & VARD_EETYPE_MASK_MFR) >> 4,
(unsigned long)(tq_vard_eepromsize(vard) / (SZ_1K)),
tq_vard_eeprom_pgsize(vard));
--
2.39.2
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 3/8] board: tq: add support for 16bit eeprom
2024-02-21 15:03 [PATCH 0/8] Update TQMa6UL Sascha Hauer
2024-02-21 15:03 ` [PATCH 1/8] board: tq: add missing select Sascha Hauer
2024-02-21 15:03 ` [PATCH 2/8] board: tq: fix format specifier Sascha Hauer
@ 2024-02-21 15:03 ` Sascha Hauer
2024-02-21 15:03 ` [PATCH 4/8] ARM: i.MX6: add i2c4 base address Sascha Hauer
` (5 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Sascha Hauer @ 2024-02-21 15:03 UTC (permalink / raw)
To: Barebox List
Some I2C EEPROMs must be addressed with two bytes. Add the address
argument to pbl_tq_read_eeprom(). The actual EEPROM address will be 0x0
always, but we can use the address to pass I2C_ADDR_16_BIT through it.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/boards/tqma93xx/lowlevel.c | 2 +-
common/boards/tq/tq_eeprom.c | 4 ++--
include/boards/tq/tq_eeprom.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boards/tqma93xx/lowlevel.c b/arch/arm/boards/tqma93xx/lowlevel.c
index 07491867d4..8d89ee530f 100644
--- a/arch/arm/boards/tqma93xx/lowlevel.c
+++ b/arch/arm/boards/tqma93xx/lowlevel.c
@@ -28,7 +28,7 @@ static int tqma93xx_get_formfactor(void)
i2c = imx93_i2c_early_init(IOMEM(MX9_I2C1_BASE_ADDR));
- eeprom = pbl_tq_read_eeprom(i2c, 0x53);
+ eeprom = pbl_tq_read_eeprom(i2c, 0x53, 0);
if (!eeprom)
return VARD_FORMFACTOR_TYPE_CONNECTOR;
diff --git a/common/boards/tq/tq_eeprom.c b/common/boards/tq/tq_eeprom.c
index 06f11a8a94..fe776d6bab 100644
--- a/common/boards/tq/tq_eeprom.c
+++ b/common/boards/tq/tq_eeprom.c
@@ -118,13 +118,13 @@ static void tq_read_string(const char *src, char *dst, int len)
dst[i] = '\0';
}
-struct tq_eeprom *pbl_tq_read_eeprom(struct pbl_i2c *i2c, u8 addr)
+struct tq_eeprom *pbl_tq_read_eeprom(struct pbl_i2c *i2c, u8 addr, u32 eeprom_addr)
{
struct tq_eeprom_data raw;
static struct tq_eeprom eeprom;
int ret;
- ret = eeprom_read(i2c, addr, 0, &raw, sizeof(raw));
+ ret = eeprom_read(i2c, addr, eeprom_addr, &raw, sizeof(raw));
if (ret)
return NULL;
diff --git a/include/boards/tq/tq_eeprom.h b/include/boards/tq/tq_eeprom.h
index 9a81e6e61d..8b639e2014 100644
--- a/include/boards/tq/tq_eeprom.h
+++ b/include/boards/tq/tq_eeprom.h
@@ -191,6 +191,6 @@ struct tq_eeprom {
struct pbl_i2c;
-struct tq_eeprom *pbl_tq_read_eeprom(struct pbl_i2c *i2c, u8 addr);
+struct tq_eeprom *pbl_tq_read_eeprom(struct pbl_i2c *i2c, u8 addr, u32 eeprom_addr);
#endif
--
2.39.2
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 4/8] ARM: i.MX6: add i2c4 base address
2024-02-21 15:03 [PATCH 0/8] Update TQMa6UL Sascha Hauer
` (2 preceding siblings ...)
2024-02-21 15:03 ` [PATCH 3/8] board: tq: add support for 16bit eeprom Sascha Hauer
@ 2024-02-21 15:03 ` Sascha Hauer
2024-02-21 15:03 ` [PATCH 5/8] ARM: tqma6ul: add pr_fmt string Sascha Hauer
` (4 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Sascha Hauer @ 2024-02-21 15:03 UTC (permalink / raw)
To: Barebox List
Add a define for the I2C4 base address.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
include/mach/imx/imx6-regs.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/mach/imx/imx6-regs.h b/include/mach/imx/imx6-regs.h
index 89a3b267c6..957b95bc95 100644
--- a/include/mach/imx/imx6-regs.h
+++ b/include/mach/imx/imx6-regs.h
@@ -132,6 +132,7 @@
#define MX6_UART3_BASE_ADDR (MX6_AIPS2_OFF_BASE_ADDR + 0x6C000)
#define MX6_UART4_BASE_ADDR (MX6_AIPS2_OFF_BASE_ADDR + 0x70000)
#define MX6_UART5_BASE_ADDR (MX6_AIPS2_OFF_BASE_ADDR + 0x74000)
+#define MX6_I2C4_BASE_ADDR (MX6_AIPS2_OFF_BASE_ADDR + 0x78000)
#define MX6_IP2APB_USBPHY1_BASE_ADDR (MX6_AIPS2_OFF_BASE_ADDR + 0x78000)
#define MX6_IP2APB_USBPHY2_BASE_ADDR (MX6_AIPS2_OFF_BASE_ADDR + 0x7C000)
--
2.39.2
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 5/8] ARM: tqma6ul: add pr_fmt string
2024-02-21 15:03 [PATCH 0/8] Update TQMa6UL Sascha Hauer
` (3 preceding siblings ...)
2024-02-21 15:03 ` [PATCH 4/8] ARM: i.MX6: add i2c4 base address Sascha Hauer
@ 2024-02-21 15:03 ` Sascha Hauer
2024-02-21 15:03 ` [PATCH 6/8] ARM: tqma6ul: enable enet_ref_125m clk Sascha Hauer
` (3 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Sascha Hauer @ 2024-02-21 15:03 UTC (permalink / raw)
To: Barebox List
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/boards/tqma6ulx/board.c | 1 +
arch/arm/boards/tqma6ulx/lowlevel.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/arch/arm/boards/tqma6ulx/board.c b/arch/arm/boards/tqma6ulx/board.c
index 4a9429a8c3..b3cecaa97d 100644
--- a/arch/arm/boards/tqma6ulx/board.c
+++ b/arch/arm/boards/tqma6ulx/board.c
@@ -2,6 +2,7 @@
/*
* Copyright (C) 2021 Rouven Czerwinski, Pengutronix
*/
+#define pr_fmt(fmt) "tqma6ul: " fmt
#include <common.h>
#include <bootsource.h>
diff --git a/arch/arm/boards/tqma6ulx/lowlevel.c b/arch/arm/boards/tqma6ulx/lowlevel.c
index 29978821b8..052471a99c 100644
--- a/arch/arm/boards/tqma6ulx/lowlevel.c
+++ b/arch/arm/boards/tqma6ulx/lowlevel.c
@@ -2,6 +2,7 @@
/*
* Copyright (C) 2019 Rouven Czerwinski, Pengutronix
*/
+#define pr_fmt(fmt) "tqma6ul: " fmt
#include <common.h>
#include <debug_ll.h>
--
2.39.2
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 6/8] ARM: tqma6ul: enable enet_ref_125m clk
2024-02-21 15:03 [PATCH 0/8] Update TQMa6UL Sascha Hauer
` (4 preceding siblings ...)
2024-02-21 15:03 ` [PATCH 5/8] ARM: tqma6ul: add pr_fmt string Sascha Hauer
@ 2024-02-21 15:03 ` Sascha Hauer
2024-02-21 15:03 ` [PATCH 7/8] net: phy: fix miibus parent device of_node not matching phy node Sascha Hauer
` (2 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Sascha Hauer @ 2024-02-21 15:03 UTC (permalink / raw)
To: Barebox List
The TQMa6ul needs the enet_ref_125m clk as phy clock. This is currently
not enabled, so ethernet on fec2 is not working. As there's no good
place to enable it currently do this in the board code.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/boards/tqma6ulx/board.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm/boards/tqma6ulx/board.c b/arch/arm/boards/tqma6ulx/board.c
index b3cecaa97d..be0abe443e 100644
--- a/arch/arm/boards/tqma6ulx/board.c
+++ b/arch/arm/boards/tqma6ulx/board.c
@@ -11,10 +11,18 @@
#include <mach/imx/bbu.h>
#include <of.h>
#include <string.h>
+#include <linux/clk.h>
static int mba6ulx_probe(struct device *dev)
{
int flags;
+ struct clk *clk;
+
+ clk = clk_lookup("enet_ref_125m");
+ if (IS_ERR(clk))
+ pr_err("Cannot find enet_ref_125m: %pe\n", clk);
+ else
+ clk_enable(clk);
/* the bootloader is stored in one of the two boot partitions */
flags = bootsource_get_instance() == 0 ? BBU_HANDLER_FLAG_DEFAULT : 0;
--
2.39.2
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 7/8] net: phy: fix miibus parent device of_node not matching phy node
2024-02-21 15:03 [PATCH 0/8] Update TQMa6UL Sascha Hauer
` (5 preceding siblings ...)
2024-02-21 15:03 ` [PATCH 6/8] ARM: tqma6ul: enable enet_ref_125m clk Sascha Hauer
@ 2024-02-21 15:03 ` Sascha Hauer
2024-02-21 15:03 ` [PATCH 8/8] ARM: tqma6ul: use upstream device trees Sascha Hauer
2024-02-23 7:32 ` [PATCH 0/8] Update TQMa6UL Sascha Hauer
8 siblings, 0 replies; 12+ messages in thread
From: Sascha Hauer @ 2024-02-21 15:03 UTC (permalink / raw)
To: Barebox List
The device node of a miibus parent device usually points to the ethernet
device node whereas the parent device node of a phy device usually
points to the mdio {} subnode between the ethernet node and the phy
node, so both can't match. Ethernet drivers usually provide a pointer
to the mdio {} subnode in miibus::dev.of_node, so use that to match
against the phy nodes parent.
This occured on a TQMa6UL where two FECs are registered, but both phys
are connected to the FEC2.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/net/phy/mdio_bus.c | 10 +++-------
drivers/net/phy/phy.c | 2 +-
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 94123ef614..eed7c779e7 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -316,19 +316,15 @@ int mdiobus_register(struct mii_bus *bus)
pr_info("%s: probed\n", dev_name(&bus->dev));
+ if (!bus->dev.of_node)
+ bus->dev.of_node = bus->parent->of_node;
+
if (bus->dev.of_node) {
bus->dev.of_node->dev = &bus->dev;
/* Register PHY's as child node to mdio node */
of_mdiobus_register(bus, bus->dev.of_node);
}
- else if (bus->parent->of_node) {
- /*
- * Register PHY's as child node to the ethernet node,
- * if there was no mdio node
- */
- of_mdiobus_register(bus, bus->parent->of_node);
- }
return 0;
}
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index ad02732ff9..abd78b2c80 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -358,7 +358,7 @@ static struct phy_device *of_mdio_find_phy(struct eth_device *edev)
if (!of_property_read_u32(phy_node, "reg", &addr)) {
of_device_ensure_probed(phy_node->parent);
for_each_mii_bus(bus) {
- if (bus->parent->of_node == phy_node->parent) {
+ if (bus->dev.of_node == phy_node->parent) {
struct phy_device *phy = mdiobus_scan(bus, addr);
if (!IS_ERR(phy))
return phy;
--
2.39.2
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 8/8] ARM: tqma6ul: use upstream device trees
2024-02-21 15:03 [PATCH 0/8] Update TQMa6UL Sascha Hauer
` (6 preceding siblings ...)
2024-02-21 15:03 ` [PATCH 7/8] net: phy: fix miibus parent device of_node not matching phy node Sascha Hauer
@ 2024-02-21 15:03 ` Sascha Hauer
2024-02-21 16:42 ` Ahmad Fatoum
2024-02-23 7:32 ` [PATCH 0/8] Update TQMa6UL Sascha Hauer
8 siblings, 1 reply; 12+ messages in thread
From: Sascha Hauer @ 2024-02-21 15:03 UTC (permalink / raw)
To: Barebox List
The tqma6ul has several upstream device trees depending on the exact
board type. This removes the downstream device tree in favour for the
upstream device trees. The board type can be determined from an EEPROM
on the board. This patch also adds support for reading the EEPROM and
picking the right device tree for the board found.
The EEPROM has the board described as strings. I do not know the correct
strings for the boards I don't have, so right now only the device tree
for the "TQMa6UL2L-AB.0202" board is picked. A warning is printed when
an unknown board type is found, so this can be added as new board type
when found.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/boards/tqma6ulx/board.c | 7 +-
arch/arm/boards/tqma6ulx/lowlevel.c | 45 ++-
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 +
12 files changed, 72 insertions(+), 561 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
diff --git a/arch/arm/boards/tqma6ulx/board.c b/arch/arm/boards/tqma6ulx/board.c
index be0abe443e..378cadc018 100644
--- a/arch/arm/boards/tqma6ulx/board.c
+++ b/arch/arm/boards/tqma6ulx/board.c
@@ -40,7 +40,10 @@ static int mba6ulx_probe(struct device *dev)
}
static const struct of_device_id mba6ulx_of_match[] = {
- { .compatible = "tq,mba6ulx" },
+ { .compatible = "tq,imx6ul-tqma6ul2l" },
+ { .compatible = "tq,imx6ul-tqma6ul2" },
+ { .compatible = "tq,imx6ull-tqma6ull2" },
+ { .compatible = "tq,imx6ull-tqma6ull2l" },
{ /* sentinel */ },
};
MODULE_DEVICE_TABLE(of, mba6ulx_of_match);
@@ -51,3 +54,5 @@ static struct driver mba6ulx_board_driver = {
.of_compatible = mba6ulx_of_match,
};
device_platform_driver(mba6ulx_board_driver);
+
+BAREBOX_DEEP_PROBE_ENABLE(mba6ulx_of_match);
diff --git a/arch/arm/boards/tqma6ulx/lowlevel.c b/arch/arm/boards/tqma6ulx/lowlevel.c
index 052471a99c..eff38c336a 100644
--- a/arch/arm/boards/tqma6ulx/lowlevel.c
+++ b/arch/arm/boards/tqma6ulx/lowlevel.c
@@ -13,8 +13,13 @@
#include <mach/imx/esdctl.h>
#include <mach/imx/iomux-mx6ul.h>
#include <asm/cache.h>
+#include <pbl/i2c.h>
+#include <boards/tq/tq_eeprom.h>
-extern char __dtb_z_imx6ul_mba6ulx_start[];
+extern char __dtb_z_imx6ul_tqma6ul2_mba6ulx_start[];
+extern char __dtb_z_imx6ul_tqma6ul2l_mba6ulx_start[];
+extern char __dtb_z_imx6ull_tqma6ull2_mba6ulx_start[];
+extern char __dtb_z_imx6ull_tqma6ull2l_mba6ulx_start[];
static void setup_uart(void)
{
@@ -30,11 +35,47 @@ static void setup_uart(void)
}
+static void *read_eeprom(void)
+{
+ struct pbl_i2c *i2c;
+ struct tq_eeprom *eeprom;
+ void __iomem *iomux = (void *)MX6_IOMUXC_BASE_ADDR;
+ void *fdt = __dtb_z_imx6ul_tqma6ul2l_mba6ulx_start;
+
+ writel(0x12, iomux + 0x0094);
+ writel(0x0, iomux + 0x05bc);
+ writel(0x1b8b0, iomux + 0x0320);
+ writel(0x12, iomux + 0x0098);
+ writel(0x0, iomux + 0x05c0);
+ writel(0x1b8b0, iomux + 0x0324);
+
+ i2c = imx6_i2c_early_init(IOMEM(MX6_I2C4_BASE_ADDR));
+
+ eeprom = pbl_tq_read_eeprom(i2c, 0x50, I2C_ADDR_16_BIT);
+ if (!eeprom) {
+ pr_err("Cannot read EEPROM\n");
+ goto out;
+ }
+
+ pr_info("Board: %s\n", eeprom->id);
+
+ if (!strcmp(eeprom->id, "TQMa6UL2L-AB.0202"))
+ fdt = __dtb_z_imx6ul_tqma6ul2l_mba6ulx_start;
+ else
+ pr_err("Unknown board type\n");
+out:
+ return fdt;
+}
+
static void noinline start_mba6ulx(void)
{
+ void *fdt;
+
setup_uart();
- imx6ul_barebox_entry(__dtb_z_imx6ul_mba6ulx_start);
+ fdt = read_eeprom();
+
+ imx6ul_barebox_entry(fdt);
}
ENTRY_FUNCTION(start_imx6ul_mba6ulx, r0, r1, r2)
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 7800231570..db40c45084 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -160,7 +160,10 @@ lwl-$(CONFIG_MACH_TQ_MBA8MPXL) += imx8mp-tqma8mpql-mba8mpxl.dtb.o
lwl-$(CONFIG_MACH_TORADEX_COLIBRI_T20) += tegra20-colibri-iris.dtb.o
lwl-$(CONFIG_MACH_TOSHIBA_AC100) += tegra20-paz00.dtb.o
lwl-$(CONFIG_MACH_TQMA53) += imx53-mba53.dtb.o
-lwl-$(CONFIG_MACH_TQMA6UL) += imx6ul-mba6ulx.dtb.o
+lwl-$(CONFIG_MACH_TQMA6UL) += imx6ul-tqma6ul2-mba6ulx.dtb.o \
+ imx6ul-tqma6ul2l-mba6ulx.dtb.o \
+ imx6ull-tqma6ull2-mba6ulx.dtb.o \
+ imx6ull-tqma6ull2l-mba6ulx.dtb.o
lwl-$(CONFIG_MACH_TQMA6X) += imx6dl-mba6x.dtb.o imx6q-mba6x.dtb.o
lwl-$(CONFIG_MACH_TX25) += imx25-karo-tx25.dtb.o
lwl-$(CONFIG_MACH_TX6X) += imx6dl-tx6u.dtb.o
diff --git a/arch/arm/dts/imx6ul-mba6ulx.dtsi b/arch/arm/dts/imx6ul-mba6ulx.dtsi
deleted file mode 100644
index da73248084..0000000000
--- a/arch/arm/dts/imx6ul-mba6ulx.dtsi
+++ /dev/null
@@ -1,333 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
-/*
- * Copyright 2016 TQ Systems GmbH
- * Author: Marco Felsch
- */
-
-/dts-v1/;
-
-#include <dt-bindings/input/input.h>
-#include "imx6ul-tqma6ulx.dtsi"
-
-/ {
- model = "TQ TQMa6ULx SoM on MBa6ULx";
- compatible = "tq,mba6ulx", "tq,imx6ul-tqma6ul2l", "fsl,imx6ul";
-
- chosen {
- stdout-path = &uart1;
- };
-
- reg_mba6ul_3v3: regulator-mba6ul-3v3 {
- compatible = "regulator-fixed";
- regulator-name = "supply-mba6ul-3v3";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- regulator-always-on;
- };
-
- reg_mba6ul_5v0: regulator-mba6ul-5v0 {
- compatible = "regulator-fixed";
- regulator-name = "supply-mba6ul-5v0";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- regulator-always-on;
- };
-
- reg_otg2vbus_5v0: regulator-otg2-vbus-5v0 {
- compatible = "regulator-fixed";
- gpio = <&gpio3 21 GPIO_ACTIVE_HIGH>;
- enable-active-high;
- regulator-name = "otg2-vbus-supply-5v0";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- vin-supply = <®_mba6ul_5v0>;
- };
-
- reg_otg1vbus_5v0: regulator-otg1-vbus-5v0 {
- compatible = "regulator-fixed";
- gpio = <&gpio1 4 GPIO_ACTIVE_HIGH>;
- enable-active-high;
- regulator-name = "otg1-vbus-supply-5v0";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- vin-supply = <®_mba6ul_5v0>;
- };
-
- reg_fec_3v3: regulator-fec-3v3 {
- compatible = "regulator-fixed";
- regulator-name = "fec-3v3";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- regulator-always-on;
- vin-supply = <®_mba6ul_3v3>;
- };
-
- reg_mpcie: regulator-mpcie-1v5 {
- compatible = "regulator-fixed";
- pinctrl-names = "default";
- regulator-name = "mpcie-1v5";
- /* gpio = <&gpio1 3 GPIO_ACTIVE_HIGH>; */
- enable-active-high;
- regulator-min-microvolt = <1500000>;
- regulator-max-microvolt = <1500000>;
- vin-supply = <®_mba6ul_3v3>;
- };
-};
-
-&fec1 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_enet1>;
- phy-mode = "rmii";
- phy-handle = <ðphy0>;
- phy-supply = <®_fec_3v3>;
- phy-reset-gpios = <&gpio3 9 GPIO_ACTIVE_LOW>;
- phy-reset-duration = <26>;
- status = "okay";
-};
-
-&fec2 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_enet2>;
- phy-mode = "rmii";
- phy-handle = <ðphy1>;
- phy-supply = <®_fec_3v3>;
- phy-reset-gpios = <&gpio3 10 GPIO_ACTIVE_HIGH>;
- phy-reset-duration = <26>;
- status = "okay";
-
- mdio {
- #address-cells = <1>;
- #size-cells = <0>;
-
- ethphy0: ethernet-phy@0 {
- compatible = "ethernet-phy-ieee802.3-c22";
- max-speed = <100>;
- reg = <0>;
- /* ToDo: check if following 2 lines are required */
- clocks = <&clks IMX6UL_CLK_ENET_REF>;
- clock-names = "rmii-ref";
- };
-
- ethphy1: ethernet-phy@1 {
- compatible = "ethernet-phy-ieee802.3-c22";
- max-speed = <100>;
- reg = <1>;
- /* ToDo: check if following 2 lines are required */
- clocks = <&clks IMX6UL_CLK_ENET2_REF>;
- clock-names = "rmii-ref";
- };
- };
-};
-
-&i2c3 {
- clock-frequency = <100000>;
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_i2c3>;
- status = "okay";
-
- expander_io: gpio-expander@20 {
- compatible = "nxp,pca9554";
- reg = <0x20>;
- gpio-controller;
- #gpio-cells = <2>;
- status = "okay";
- };
-
- expander_in: gpio-expander@21 {
- compatible = "nxp,pca9554";
- reg = <0x21>;
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_expander_irq>;
- interrupt-parent = <&gpio5>;
- interrupts = <8 IRQ_TYPE_LEVEL_LOW>;
- interrupt-controller;
- #interrupt-cells = <2>;
- gpio-controller;
- #gpio-cells = <2>;
- status = "okay";
- };
-
- expander_out: gpio-expander@22 {
- compatible = "nxp,pca9554";
- reg = <0x22>;
- gpio-controller;
- #gpio-cells = <2>;
- status = "okay";
- };
-
-
- /* NXP SE97BTP with temperature sensor + eeprom */
- jc42_1b: eeprom-temperature-sensor@1b {
- compatible = "nxp,se97", "jedec,jc-42.4-temp";
- reg = <0x1b>;
- status = "okay";
- };
-
- se97_53: eeprom-temperature-sensor@53 {
- compatible = "nxp,spd";
- reg = <0x53>;
- pagesize = <16>;
- status = "okay";
- };
-
-};
-
-
-&iomuxc {
- pinctrl-names = "default";
-
- pinctrl_i2c3: i2c3grp {
- fsl,pins = <
- MX6UL_PAD_LCD_DATA00__I2C3_SDA 0x4001b8b0
- MX6UL_PAD_LCD_DATA01__I2C3_SCL 0x4001b8b0
- >;
- };
-
- pinctrl_enet1: enet1grp {
- fsl,pins = <
- MX6UL_PAD_ENET1_RX_EN__ENET1_RX_EN 0x1b0b0
- MX6UL_PAD_ENET1_RX_ER__ENET1_RX_ER 0x1b0b0
- MX6UL_PAD_ENET1_RX_DATA0__ENET1_RDATA00 0x1b0b0
- MX6UL_PAD_ENET1_RX_DATA1__ENET1_RDATA01 0x1b0b0
- MX6UL_PAD_ENET1_TX_DATA0__ENET1_TDATA00 0x1b0b0
- MX6UL_PAD_ENET1_TX_DATA1__ENET1_TDATA01 0x1b0b0
- MX6UL_PAD_ENET1_TX_EN__ENET1_TX_EN 0x1b0b0
- MX6UL_PAD_ENET1_TX_CLK__ENET1_REF_CLK1 0x4001b0a8
- >;
- };
-
- pinctrl_enet2: enet2grp {
- fsl,pins = <
- MX6UL_PAD_ENET2_RX_EN__ENET2_RX_EN 0x1b0b0
- MX6UL_PAD_ENET2_RX_ER__ENET2_RX_ER 0x1b0b0
- MX6UL_PAD_ENET2_RX_DATA0__ENET2_RDATA00 0x1b0b0
- MX6UL_PAD_ENET2_RX_DATA1__ENET2_RDATA01 0x1b0b0
- MX6UL_PAD_ENET2_TX_DATA0__ENET2_TDATA00 0x1b0a0
- MX6UL_PAD_ENET2_TX_DATA1__ENET2_TDATA01 0x1b0a0
- MX6UL_PAD_ENET2_TX_EN__ENET2_TX_EN 0x1b0b0
- MX6UL_PAD_ENET2_TX_CLK__ENET2_REF_CLK2 0x4001b0a8
- /* mdio */
- MX6UL_PAD_GPIO1_IO07__ENET2_MDC 0x1b0b0
- MX6UL_PAD_GPIO1_IO06__ENET2_MDIO 0x1b0b0
- >;
- };
-
- pinctrl_expander_irq: expanderirqgrp {
- fsl,pins = <
- MX6UL_PAD_SNVS_TAMPER8__GPIO5_IO08 0x1b0b1
- >;
- };
-
- pinctrl_uart1: uart1grp {
- fsl,pins = <
- MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b1
- MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX 0x1b0b1
- >;
- };
-
- pinctrl_usb_otg1: usbotg1grp {
- fsl,pins = <
- MX6UL_PAD_GPIO1_IO00__ANATOP_OTG1_ID 0x00017059
- MX6UL_PAD_GPIO1_IO01__USB_OTG1_OC 0x0001b0b0
- /* PWR */
- MX6UL_PAD_GPIO1_IO04__GPIO1_IO04 0x0001b099
- >;
- };
-
- pinctrl_usb_otg2: usbotg2grp {
- fsl,pins = <
- /* reset */
- MX6UL_PAD_LCD_DATA16__GPIO3_IO21 0x0001b099
- >;
- };
-
- pinctrl_usdhc1: usdhc1grp {
- fsl,pins = <
- MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x00017069
- MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x00017059
- MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x00017059
- MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x00017059
- MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x00017059
- MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x00017059
- /* CD */
- MX6UL_PAD_UART1_RTS_B__GPIO1_IO19 0x0001b099
- >;
- };
-
- pinctrl_usdhc1_100mhz: usdhc1grp100mhz {
- fsl,pins = <
- MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x00017069
- MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x000170b9
- MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x000170b9
- MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x000170b9
- MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x000170b9
- MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x000170b9
- /* CD */
- MX6UL_PAD_UART1_RTS_B__GPIO1_IO19 0x0001b099
- >;
- };
-
- pinctrl_usdhc1_200mhz: usdhc1grp200mhz {
- fsl,pins = <
- MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x00017069
- MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x000170f9
- MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x000170f9
- MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x000170f9
- MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x000170f9
- MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x000170f9
- /* CD */
- MX6UL_PAD_UART1_RTS_B__GPIO1_IO19 0x0001b099
- >;
- };
-
- pinctrl_wdog1: wdog1grp {
- fsl,pins = <
- MX6UL_PAD_GPIO1_IO08__WDOG1_WDOG_B 0x0001b099
- >;
- };
-};
-
-&uart1 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_uart1>;
- status = "okay";
-};
-
-/* otg-port */
-&usbotg1 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_usb_otg1>;
- vbus-supply = <®_otg1vbus_5v0>;
- dr_mode = "otg";
- status = "okay";
-};
-
-/* 7-port usb hub */
-/* id, pwr, oc pins not connected */
-&usbotg2 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_usb_otg2>;
- disable-over-current;
- vbus-supply = <®_otg2vbus_5v0>;
- dr_mode = "host";
- status = "okay";
-};
-
-&usdhc1 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_usdhc1>;
- cd-gpios = <&gpio1 19 GPIO_ACTIVE_LOW>;
- disable-wp;
- bus-width = <4>;
- vmmc-supply = <®_mba6ul_3v3>;
- vqmmc-supply = <®_vccsd>;
- no-1-8-v;
- status = "okay";
-};
-
-&wdog1 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_wdog1>;
- fsl,ext-reset-output;
- status = "okay";
-};
diff --git a/arch/arm/dts/imx6ul-mba6ulx.dts b/arch/arm/dts/imx6ul-tqma6ul-common.dtsi
similarity index 96%
rename from arch/arm/dts/imx6ul-mba6ulx.dts
rename to arch/arm/dts/imx6ul-tqma6ul-common.dtsi
index e2ed694ff9..64f1ee253c 100644
--- a/arch/arm/dts/imx6ul-mba6ulx.dts
+++ b/arch/arm/dts/imx6ul-tqma6ul-common.dtsi
@@ -1,14 +1,9 @@
-
// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
/*
* Copyright 2021 Pengutronix e.K.
* Author: Rouven Czerwinski
*/
-/dts-v1/;
-
-#include "imx6ul-mba6ulx.dtsi"
-
/ {
chosen {
environment-sd {
diff --git a/arch/arm/dts/imx6ul-tqma6ul2-mba6ulx.dts b/arch/arm/dts/imx6ul-tqma6ul2-mba6ulx.dts
new file mode 100644
index 0000000000..2d49c0e763
--- /dev/null
+++ b/arch/arm/dts/imx6ul-tqma6ul2-mba6ulx.dts
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
+
+#include <arm/nxp/imx/imx6ul-tqma6ul2l-mba6ulx.dts>
+#include "imx6ul-tqma6ul-common.dtsi"
diff --git a/arch/arm/dts/imx6ul-tqma6ul2l-mba6ulx.dts b/arch/arm/dts/imx6ul-tqma6ul2l-mba6ulx.dts
new file mode 100644
index 0000000000..2d49c0e763
--- /dev/null
+++ b/arch/arm/dts/imx6ul-tqma6ul2l-mba6ulx.dts
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
+
+#include <arm/nxp/imx/imx6ul-tqma6ul2l-mba6ulx.dts>
+#include "imx6ul-tqma6ul-common.dtsi"
diff --git a/arch/arm/dts/imx6ull-tqma6ull2-mba6ulx.dts b/arch/arm/dts/imx6ull-tqma6ull2-mba6ulx.dts
new file mode 100644
index 0000000000..20eb7a7c1d
--- /dev/null
+++ b/arch/arm/dts/imx6ull-tqma6ull2-mba6ulx.dts
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
+
+#include <arm/nxp/imx/imx6ull-tqma6ull2-mba6ulx.dts>
+#include "imx6ul-tqma6ul-common.dtsi"
diff --git a/arch/arm/dts/imx6ull-tqma6ull2l-mba6ulx.dts b/arch/arm/dts/imx6ull-tqma6ull2l-mba6ulx.dts
new file mode 100644
index 0000000000..58df3349c7
--- /dev/null
+++ b/arch/arm/dts/imx6ull-tqma6ull2l-mba6ulx.dts
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
+
+#include <arm/nxp/imx/imx6ull-tqma6ull2l-mba6ulx.dts>
+#include "imx6ul-tqma6ul-common.dtsi"
diff --git a/arch/arm/dts/tqma6ul-common.dtsi b/arch/arm/dts/tqma6ul-common.dtsi
deleted file mode 100644
index 92b295891c..0000000000
--- a/arch/arm/dts/tqma6ul-common.dtsi
+++ /dev/null
@@ -1,191 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
-/*
- * Copyright 2018 TQ Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
- */
-
-&cpu0 {
- arm-supply = <®_arm>;
- soc-supply = <®_soc>;
-};
-
-&i2c4 {
- clock-frequency = <100000>;
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_i2c4>;
- status = "okay";
-
- pfuze3000: pmic@8 {
- compatible = "fsl,pfuze3000";
- reg = <0x08>;
-
- regulators {
- reg_sw1a: sw1a {
- regulator-min-microvolt = <700000>;
- regulator-max-microvolt = <3300000>;
- regulator-boot-on;
- regulator-ramp-delay = <6250>;
- /* not used */
- };
-
- reg_sw1b_core: sw1b {
- regulator-min-microvolt = <700000>;
- regulator-max-microvolt = <1475000>;
- regulator-boot-on;
- regulator-always-on;
- regulator-ramp-delay = <6250>;
- };
-
- reg_sw2: sw2 {
- regulator-min-microvolt = <2500000>;
- regulator-max-microvolt = <3300000>;
- regulator-boot-on;
- };
-
- reg_sw3_ddr: sw3 {
- regulator-min-microvolt = <900000>;
- regulator-max-microvolt = <1650000>;
- regulator-boot-on;
- regulator-always-on;
- };
-
- reg_swbst: swbst {
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5150000>;
- /* not used */
- };
-
- reg_snvs_3v0: vsnvs {
- regulator-min-microvolt = <1000000>;
- regulator-max-microvolt = <3000000>;
- regulator-boot-on;
- regulator-always-on;
- };
-
- reg_vrefddr: vrefddr {
- regulator-boot-on;
- regulator-always-on;
- };
-
- reg_vccsd: vccsd {
- regulator-min-microvolt = <2850000>;
- regulator-max-microvolt = <3300000>;
- };
-
- reg_v33_3v3: v33 {
- regulator-min-microvolt = <2850000>;
- regulator-max-microvolt = <3300000>;
- regulator-always-on;
- };
-
- reg_vldo1_3v3: vldo1 {
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <3300000>;
- regulator-boot-on;
- /* not used */
- };
-
- reg_vldo2: vldo2 {
- regulator-min-microvolt = <800000>;
- regulator-max-microvolt = <1550000>;
- regulator-boot-on;
- /* not used */
- };
-
- reg_vldo3: vldo3 {
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <3300000>;
- regulator-boot-on;
- /* not used */
- };
-
- reg_vldo4: vldo4 {
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-fixed;
- regulator-always-on;
- };
- };
- };
-
- jc42_1a: eeprom-temperature-sensor@1a {
- compatible = "nxp,se97", "jedec,jc-42.4-temp";
- reg = <0x1a>;
- status = "okay";
- };
-
- m24c64_50: eeprom@50 {
- compatible = "atmel,24c64";
- reg = <0x50>;
- pagesize = <32>;
- status = "okay";
- };
-
- m24c02_52: eeprom@52 {
- compatible = "atmel,24c02";
- reg = <0x52>;
- pagesize = <16>;
- status = "okay";
- };
-
- rtc1: rtc@68 {
- compatible = "dallas,ds1339";
- reg = <0x68>;
- status = "okay";
- };
-};
-
-&iomuxc {
- pinctrl_i2c4: i2c4grp {
- fsl,pins = <
- MX6UL_PAD_UART2_TX_DATA__I2C4_SCL 0x4001b8b0
- MX6UL_PAD_UART2_RX_DATA__I2C4_SDA 0x4001b8b0
- >;
- };
-
- /*
- * currently not used, potentially dangerous if used on
- * baseboard
- */
- pinctrl_pmic: pmic {
- fsl,pins = <
- /* PMIC irq */
- MX6UL_PAD_CSI_DATA03__GPIO4_IO24 0x1b099
- >;
- };
-};
-
-&qspi {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_qspi>;
- status = "okay";
-
- flash0: spinor@0 {
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "jedec,spi-nor";
- spi-max-frequency = <33000000>;
- spi-rx-bus-width = <4>;
- spi-tx-bus-width = <4>;
- reg = <0>;
- };
-};
-
-&snvs_rtc {
- status = "disabled";
-};
-
-/* eMMC */
-&usdhc2 {
- pinctrl-names = "default", "state_100mhz" , "state_200mhz";
- pinctrl-0 = <&pinctrl_usdhc2>;
- pinctrl-1 = <&pinctrl_usdhc2_100mhz>;
- pinctrl-2 = <&pinctrl_usdhc2_200mhz>;
-
- bus-width = <8>;
- disable-wp;
- non-removable;
- no-sdio;
- no-sd;
- status = "okay";
-};
diff --git a/arch/arm/dts/tqma6ulx-common.dtsi b/arch/arm/dts/tqma6ulx-common.dtsi
deleted file mode 100644
index 3e398d25ad..0000000000
--- a/arch/arm/dts/tqma6ulx-common.dtsi
+++ /dev/null
@@ -1,28 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
-/*
- * Copyright 2018 TQ Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
- */
-
-&iomuxc {
- pinctrl_qspi: qspigrp {
- fsl,pins = <
- MX6UL_PAD_NAND_WP_B__QSPI_A_SCLK 0x70b9
- MX6UL_PAD_NAND_READY_B__QSPI_A_DATA00 0x70b9
- MX6UL_PAD_NAND_CE0_B__QSPI_A_DATA01 0x70b9
- MX6UL_PAD_NAND_CE1_B__QSPI_A_DATA02 0x70b9
- MX6UL_PAD_NAND_CLE__QSPI_A_DATA03 0x70b9
- MX6UL_PAD_NAND_DQS__QSPI_A_SS0_B 0x70a1
- >;
- };
-};
-
-®_sw2 {
- regulator-always-on;
-};
-
-/* eMMC */
-&usdhc2 {
- vmmc-supply = <®_sw2>;
- vqmmc-supply = <®_vldo4>;
-};
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index f7b1d88dd6..d585aa0485 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -500,6 +500,9 @@ config MACH_TQMA6UL
bool "TQ tqma6ul on mba6ulx"
select ARCH_IMX6UL
select ARM_USE_COMPRESSED_DTB
+ select BOARD_TQ
+ select I2C
+ select I2C_IMX_EARLY
config MACH_VARISCITE_MX6
bool "Variscite i.MX6 Quad SOM"
--
2.39.2
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 8/8] ARM: tqma6ul: use upstream device trees
2024-02-21 15:03 ` [PATCH 8/8] ARM: tqma6ul: use upstream device trees Sascha Hauer
@ 2024-02-21 16:42 ` Ahmad Fatoum
2024-02-23 7:37 ` Sascha Hauer
0 siblings, 1 reply; 12+ messages in thread
From: Ahmad Fatoum @ 2024-02-21 16:42 UTC (permalink / raw)
To: Sascha Hauer, Barebox List
Hello Sascha,
On 21.02.24 16:03, Sascha Hauer wrote:
> The tqma6ul has several upstream device trees depending on the exact
> board type. This removes the downstream device tree in favour for the
> upstream device trees. The board type can be determined from an EEPROM
> on the board. This patch also adds support for reading the EEPROM and
> picking the right device tree for the board found.
Is the existing "mba6ulx" device tree not a subset of all boards?
Would it make sense to fall back to that instead of using a specific
DT that may fail on other variants?
> The EEPROM has the board described as strings. I do not know the correct
> strings for the boards I don't have, so right now only the device tree
> for the "TQMa6UL2L-AB.0202" board is picked. A warning is printed when
> an unknown board type is found, so this can be added as new board type
> when found.
>
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
> arch/arm/boards/tqma6ulx/board.c | 7 +-
> arch/arm/boards/tqma6ulx/lowlevel.c | 45 ++-
> 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 +
> 12 files changed, 72 insertions(+), 561 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
>
> diff --git a/arch/arm/boards/tqma6ulx/board.c b/arch/arm/boards/tqma6ulx/board.c
> index be0abe443e..378cadc018 100644
> --- a/arch/arm/boards/tqma6ulx/board.c
> +++ b/arch/arm/boards/tqma6ulx/board.c
> @@ -40,7 +40,10 @@ static int mba6ulx_probe(struct device *dev)
> }
>
> static const struct of_device_id mba6ulx_of_match[] = {
> - { .compatible = "tq,mba6ulx" },
> + { .compatible = "tq,imx6ul-tqma6ul2l" },
> + { .compatible = "tq,imx6ul-tqma6ul2" },
> + { .compatible = "tq,imx6ull-tqma6ull2" },
> + { .compatible = "tq,imx6ull-tqma6ull2l" },
> { /* sentinel */ },
> };
> MODULE_DEVICE_TABLE(of, mba6ulx_of_match);
> @@ -51,3 +54,5 @@ static struct driver mba6ulx_board_driver = {
> .of_compatible = mba6ulx_of_match,
> };
> device_platform_driver(mba6ulx_board_driver);
> +
> +BAREBOX_DEEP_PROBE_ENABLE(mba6ulx_of_match);
> diff --git a/arch/arm/boards/tqma6ulx/lowlevel.c b/arch/arm/boards/tqma6ulx/lowlevel.c
> index 052471a99c..eff38c336a 100644
> --- a/arch/arm/boards/tqma6ulx/lowlevel.c
> +++ b/arch/arm/boards/tqma6ulx/lowlevel.c
> @@ -13,8 +13,13 @@
> #include <mach/imx/esdctl.h>
> #include <mach/imx/iomux-mx6ul.h>
> #include <asm/cache.h>
> +#include <pbl/i2c.h>
> +#include <boards/tq/tq_eeprom.h>
>
> -extern char __dtb_z_imx6ul_mba6ulx_start[];
> +extern char __dtb_z_imx6ul_tqma6ul2_mba6ulx_start[];
> +extern char __dtb_z_imx6ul_tqma6ul2l_mba6ulx_start[];
> +extern char __dtb_z_imx6ull_tqma6ull2_mba6ulx_start[];
> +extern char __dtb_z_imx6ull_tqma6ull2l_mba6ulx_start[];
>
> static void setup_uart(void)
> {
> @@ -30,11 +35,47 @@ static void setup_uart(void)
>
> }
>
> +static void *read_eeprom(void)
> +{
> + struct pbl_i2c *i2c;
> + struct tq_eeprom *eeprom;
> + void __iomem *iomux = (void *)MX6_IOMUXC_BASE_ADDR;
> + void *fdt = __dtb_z_imx6ul_tqma6ul2l_mba6ulx_start;
> +
> + writel(0x12, iomux + 0x0094);
> + writel(0x0, iomux + 0x05bc);
> + writel(0x1b8b0, iomux + 0x0320);
> + writel(0x12, iomux + 0x0098);
> + writel(0x0, iomux + 0x05c0);
> + writel(0x1b8b0, iomux + 0x0324);
Could iomux_v3_setup_pad and pinctrl macros be used here instead?
> +
> + i2c = imx6_i2c_early_init(IOMEM(MX6_I2C4_BASE_ADDR));
> +
> + eeprom = pbl_tq_read_eeprom(i2c, 0x50, I2C_ADDR_16_BIT);
> + if (!eeprom) {
> + pr_err("Cannot read EEPROM\n");
> + goto out;
> + }
> +
> + pr_info("Board: %s\n", eeprom->id);
> +
> + if (!strcmp(eeprom->id, "TQMa6UL2L-AB.0202"))
> + fdt = __dtb_z_imx6ul_tqma6ul2l_mba6ulx_start;
> + else
> + pr_err("Unknown board type\n");
> +out:
> + return fdt;
> +}
[snip]
> diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
> index f7b1d88dd6..d585aa0485 100644
> --- a/arch/arm/mach-imx/Kconfig
> +++ b/arch/arm/mach-imx/Kconfig
> @@ -500,6 +500,9 @@ config MACH_TQMA6UL
> bool "TQ tqma6ul on mba6ulx"
> select ARCH_IMX6UL
> select ARM_USE_COMPRESSED_DTB
> + select BOARD_TQ
> + select I2C
Is I2C absolutely needed in barebox proper?
> + select I2C_IMX_EARLY
>
> config MACH_VARISCITE_MX6
> bool "Variscite i.MX6 Quad SOM"
Cheers,
Ahmad
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 8/8] ARM: tqma6ul: use upstream device trees
2024-02-21 16:42 ` Ahmad Fatoum
@ 2024-02-23 7:37 ` Sascha Hauer
0 siblings, 0 replies; 12+ messages in thread
From: Sascha Hauer @ 2024-02-23 7:37 UTC (permalink / raw)
To: Ahmad Fatoum; +Cc: Barebox List
On Wed, Feb 21, 2024 at 05:42:49PM +0100, Ahmad Fatoum wrote:
> Hello Sascha,
>
> On 21.02.24 16:03, Sascha Hauer wrote:
> > The tqma6ul has several upstream device trees depending on the exact
> > board type. This removes the downstream device tree in favour for the
> > upstream device trees. The board type can be determined from an EEPROM
> > on the board. This patch also adds support for reading the EEPROM and
> > picking the right device tree for the board found.
>
> Is the existing "mba6ulx" device tree not a subset of all boards?
> Would it make sense to fall back to that instead of using a specific
> DT that may fail on other variants?
I don't know if it's a subset of all boards. There are enough TQMa6ul
device trees already, I don't think we should keep even more of them
around.
> > + writel(0x12, iomux + 0x0094);
> > + writel(0x0, iomux + 0x05bc);
> > + writel(0x1b8b0, iomux + 0x0320);
> > + writel(0x12, iomux + 0x0098);
> > + writel(0x0, iomux + 0x05c0);
> > + writel(0x1b8b0, iomux + 0x0324);
>
> Could iomux_v3_setup_pad and pinctrl macros be used here instead?
Yes, fixed.
> > select ARM_USE_COMPRESSED_DTB
> > + select BOARD_TQ
> > + select I2C
>
> Is I2C absolutely needed in barebox proper?
No, it's not. I though we have to select I2C to get I2C_IMX_EARLY, but
apparently that's not necessary.
Sascha
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/8] Update TQMa6UL
2024-02-21 15:03 [PATCH 0/8] Update TQMa6UL Sascha Hauer
` (7 preceding siblings ...)
2024-02-21 15:03 ` [PATCH 8/8] ARM: tqma6ul: use upstream device trees Sascha Hauer
@ 2024-02-23 7:32 ` Sascha Hauer
8 siblings, 0 replies; 12+ messages in thread
From: Sascha Hauer @ 2024-02-23 7:32 UTC (permalink / raw)
To: Barebox List, Sascha Hauer
On Wed, 21 Feb 2024 16:03:15 +0100, Sascha Hauer wrote:
> 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
>
> [...]
Applied, thanks!
[1/8] board: tq: add missing select
https://git.pengutronix.de/cgit/barebox/commit/?id=64447652f9ad (link may not be stable)
[2/8] board: tq: fix format specifier
https://git.pengutronix.de/cgit/barebox/commit/?id=bef0946e6a33 (link may not be stable)
[3/8] board: tq: add support for 16bit eeprom
https://git.pengutronix.de/cgit/barebox/commit/?id=57ee1c9d6b60 (link may not be stable)
[4/8] ARM: i.MX6: add i2c4 base address
https://git.pengutronix.de/cgit/barebox/commit/?id=24fb4842ca4b (link may not be stable)
[5/8] ARM: tqma6ul: add pr_fmt string
https://git.pengutronix.de/cgit/barebox/commit/?id=b78ccb436a3a (link may not be stable)
[6/8] ARM: tqma6ul: enable enet_ref_125m clk
https://git.pengutronix.de/cgit/barebox/commit/?id=30aea51621e7 (link may not be stable)
[7/8] net: phy: fix miibus parent device of_node not matching phy node
https://git.pengutronix.de/cgit/barebox/commit/?id=6534338de3c5 (link may not be stable)
[8/8] ARM: tqma6ul: use upstream device trees
https://git.pengutronix.de/cgit/barebox/commit/?id=cb3f6f5769af (link may not be stable)
Best regards,
--
Sascha Hauer <s.hauer@pengutronix.de>
^ permalink raw reply [flat|nested] 12+ messages in thread