* [PATCH v1 0/7] colibri-imx6ull: fix the Ethernet PHY detection
@ 2026-11-20 11:10 Stefan Eichenberger
2026-11-20 11:10 ` [PATCH v1 1/7] clk: imx: imx6ul: fix the enet clock gate register Stefan Eichenberger
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Stefan Eichenberger @ 2026-11-20 11:10 UTC (permalink / raw)
To: trini, ilias.apalodimas, peng.fan, jh80.chung, tanmay.kathpalia,
sbabic, festevam, uboot-imx, francesco.dolcini, lukma, dlechner,
msp, stefan.eichenberger, Max.Merchel, nora.schiffer,
primoz.fiser, jbx6244, aford173, cniedermaier
Cc: u-boot
Since commit a5d990854f2c ("regulator: fixed: fix regulator-fixed-clock")
the regulator-fixed-clock driver gets its clock in a probe hook, so it
can no longer probe without CONFIG_CLK. On the Colibri iMX6ULL the
Ethernet PHY supply is such a regulator. Its 150ms startup delay is
skipped, and the first FEC probe does not find the PHY.
This series fixes the problem by moving the board to the clock framework
(CONFIG_CLK_IMX6UL). The i.MX6UL clock driver could not yet drive the
FEC, so most of the series makes the ENET clocks usable:
- Patch 1 fixes the ENET gate, which pointed at the uart3 gate. It is a
standalone fix and can be applied on its own.
- Patches 2 and 3 fix the PLLv3 ENET PLL: wait for lock after power up,
and stop setting and clearing bit 13. That bit is an output gate, which
the SoC drivers already model as a separate clock. Patch 3 also affects
i.MX6Q/DL, where every PLL6 consumer goes through the pll6_enet gate
on that bit.
- Patch 4 adds the ENET clock tree to the i.MX6UL driver: the PLL6
bypass, the reference dividers with their 125M gates, the GPR1
reference clock selectors, the PTP clock and the AHB gate.
The rest prepares and switches the board:
- Patch 5 removes the static serial_mxc device. It duplicates the
device tree instance and cannot get its clocks once CCF is enabled.
- Patch 6 moves the Colibri iMX6ULL device trees to OF_UPSTREAM.
- Patch 7 enables the clock framework. With it, the hand-rolled FEC clock
setup is no longer needed. setup_gpmi_nand() has to go as well, because
it now overwrites the ENFC parent chosen by the CCM driver and breaks
NAND. SYS_MALLOC_F_LEN is raised for the pre-relocation CCM probe.
A note on patch 4: U-Boot has no clock type for the IOMUXC GPR muxes, so
the ENETn_CLK_SEL selectors are plain muxes on the GPR1 register, and the
ENET2_TX_CLK direction bit stays in board code. A follow-up could add a
syscon-based GPR mux clock like the one in Linux. That would also remove
the remaining board code.
On the Colibri iMX6ULL, Ethernet now finds the PHY on the first probe.
The series was tested on the following modules:
- Colibri iMX6ULL
- Colibri iMX6ULL eMMC
- Colibri iMX6
- Apalis iMX6
Francesco Dolcini (4):
clk: imx: imx6ul: fix the enet clock gate register
board: toradex: colibri-imx6ull: drop the static serial device
arm: dts: imx6ull-colibri: migrate to OF_UPSTREAM
board: toradex: colibri-imx6ull: enable the clock framework
Stefan Eichenberger (3):
clk: imx: pllv3: wait for the ENET PLL to lock
clk: imx: pllv3: do not touch the ENET output gate
clk: imx: imx6ul: add the enet clock tree
arch/arm/dts/Makefile | 2 -
arch/arm/dts/imx6ull-colibri-emmc-eval-v3.dts | 17 -
.../arm/dts/imx6ull-colibri-emmc-nonwifi.dtsi | 187 -----
.../dts/imx6ull-colibri-eval-v3-u-boot.dtsi | 6 +
arch/arm/dts/imx6ull-colibri-eval-v3.dts | 14 -
arch/arm/dts/imx6ull-colibri-eval-v3.dtsi | 121 ---
arch/arm/dts/imx6ull-colibri-nonwifi.dtsi | 161 ----
arch/arm/dts/imx6ull-colibri.dtsi | 748 ------------------
arch/arm/mach-imx/mx6/Kconfig | 1 +
board/toradex/colibri-imx6ull/MAINTAINERS | 8 +-
.../toradex/colibri-imx6ull/colibri-imx6ull.c | 45 +-
configs/colibri-imx6ull-emmc_defconfig | 4 +-
configs/colibri-imx6ull_defconfig | 4 +-
drivers/clk/imx/clk-imx6ul.c | 81 +-
drivers/clk/imx/clk-pllv3.c | 21 +-
15 files changed, 116 insertions(+), 1304 deletions(-)
delete mode 100644 arch/arm/dts/imx6ull-colibri-emmc-eval-v3.dts
delete mode 100644 arch/arm/dts/imx6ull-colibri-emmc-nonwifi.dtsi
delete mode 100644 arch/arm/dts/imx6ull-colibri-eval-v3.dts
delete mode 100644 arch/arm/dts/imx6ull-colibri-eval-v3.dtsi
delete mode 100644 arch/arm/dts/imx6ull-colibri-nonwifi.dtsi
delete mode 100644 arch/arm/dts/imx6ull-colibri.dtsi
--
2.56.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v1 1/7] clk: imx: imx6ul: fix the enet clock gate register
2026-11-20 11:10 [PATCH v1 0/7] colibri-imx6ull: fix the Ethernet PHY detection Stefan Eichenberger
@ 2026-11-20 11:10 ` Stefan Eichenberger
2026-11-20 11:10 ` [PATCH v1 2/7] clk: imx: pllv3: wait for the ENET PLL to lock Stefan Eichenberger
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Stefan Eichenberger @ 2026-11-20 11:10 UTC (permalink / raw)
To: trini, ilias.apalodimas, peng.fan, jh80.chung, tanmay.kathpalia,
sbabic, festevam, uboot-imx, francesco.dolcini, lukma, dlechner,
msp, stefan.eichenberger, Max.Merchel, nora.schiffer,
primoz.fiser, jbx6244, aford173, cniedermaier
Cc: u-boot
From: Francesco Dolcini <francesco.dolcini@toradex.com>
IMX6UL_CLK_ENET was registered on CCGR1 bit 10, which is CG5, the uart3
gate: enabling the FEC clock would have gated uart3 and left ENET alone.
The ENET gate is CCM_CCGR0[CG6] on i.MX6ULL and CCM_CCGR3[CG2] on
i.MX6UL, as the reference manuals and Linux have it.
Fixes: 0f53197c3d6c ("clk: imx: add i.MX6UL clk driver")
Tested-by: Stefan Eichenberger <stefan.eichenberger@toradex.com>
Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Signed-off-by: Stefan Eichenberger <stefan.eichenberger@toradex.com>
---
drivers/clk/imx/clk-imx6ul.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/clk/imx/clk-imx6ul.c b/drivers/clk/imx/clk-imx6ul.c
index 32fb949ffbc..a73fb40b8ac 100644
--- a/drivers/clk/imx/clk-imx6ul.c
+++ b/drivers/clk/imx/clk-imx6ul.c
@@ -9,6 +9,7 @@
#include <log.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h>
+#include <asm/mach-imx/sys_proto.h>
#include <dt-bindings/clock/imx6ul-clock.h>
#include "clk.h"
@@ -259,8 +260,12 @@ static int imx6ul_clk_probe(struct udevice *dev)
clk_dm(IMX6UL_CLK_PWM1,
imx_clk_gate2(dev, "pwm1", "perclk", base + 0x78, 16));
- clk_dm(IMX6UL_CLK_ENET,
- imx_clk_gate2(dev, "enet", "ipg", base + 0x6c, 10));
+ if (is_mx6ull())
+ clk_dm(IMX6UL_CLK_ENET,
+ imx_clk_gate2(dev, "enet", "ipg", base + 0x68, 12));
+ else
+ clk_dm(IMX6UL_CLK_ENET,
+ imx_clk_gate2(dev, "enet", "ipg", base + 0x74, 4));
clk_dm(IMX6UL_CLK_ENET_REF,
imx_clk_fixed_factor(dev, "enet_ref", "pll6_enet", 1, 1));
--
2.56.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v1 2/7] clk: imx: pllv3: wait for the ENET PLL to lock
2026-11-20 11:10 [PATCH v1 0/7] colibri-imx6ull: fix the Ethernet PHY detection Stefan Eichenberger
2026-11-20 11:10 ` [PATCH v1 1/7] clk: imx: imx6ul: fix the enet clock gate register Stefan Eichenberger
@ 2026-11-20 11:10 ` Stefan Eichenberger
2026-11-20 11:10 ` [PATCH v1 3/7] clk: imx: pllv3: do not touch the ENET output gate Stefan Eichenberger
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Stefan Eichenberger @ 2026-11-20 11:10 UTC (permalink / raw)
To: trini, ilias.apalodimas, peng.fan, jh80.chung, tanmay.kathpalia,
sbabic, festevam, uboot-imx, francesco.dolcini, lukma, dlechner,
msp, stefan.eichenberger, Max.Merchel, nora.schiffer,
primoz.fiser, jbx6244, aford173, cniedermaier
Cc: u-boot
From: Stefan Eichenberger <stefan.eichenberger@toradex.com>
The ENET PLL enable powers the PLL up and returns immediately, so a
consumer can start using the reference clock before the PLL has locked.
The legacy enable_fec_anatop_clock() polled the LOCK bit after powering
up the PLL, and Linux does the same in clk_pllv3_prepare().
Poll the LOCK bit after enabling the ENET PLL, with a 10 ms timeout.
Signed-off-by: Stefan Eichenberger <stefan.eichenberger@toradex.com>
---
drivers/clk/imx/clk-pllv3.c | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c
index 85b6a9809e8..8e67442844f 100644
--- a/drivers/clk/imx/clk-pllv3.c
+++ b/drivers/clk/imx/clk-pllv3.c
@@ -14,6 +14,7 @@
#include <clk.h>
#include "clk.h"
#include <linux/err.h>
+#include <linux/iopoll.h>
#define UBOOT_DM_CLK_IMX_PLLV3_GENERIC "imx_clk_pllv3_generic"
#define UBOOT_DM_CLK_IMX_PLLV3_SYS "imx_clk_pllv3_sys"
@@ -31,6 +32,8 @@
#define BM_PLL_LOCK (0x1 << 31)
#define BM_PLL_LOCK_V2 (0x1 << 29)
+#define PLL_LOCK_TIMEOUT_US 10000
+
struct clk_pllv3 {
struct clk clk;
void __iomem *base;
@@ -275,8 +278,22 @@ static ulong clk_pllv3_enet_get_rate(struct clk *clk)
return pll->ref_clock;
}
+static int clk_pllv3_enet_enable(struct clk *clk)
+{
+ struct clk_pllv3 *pll = to_clk_pllv3(clk);
+ u32 val;
+ int ret;
+
+ ret = clk_pllv3_generic_enable(clk);
+ if (ret)
+ return ret;
+
+ return readl_poll_timeout(pll->base, val, val & pll->lock_bit,
+ PLL_LOCK_TIMEOUT_US);
+}
+
static const struct clk_ops clk_pllv3_enet_ops = {
- .enable = clk_pllv3_generic_enable,
+ .enable = clk_pllv3_enet_enable,
.disable = clk_pllv3_generic_disable,
.get_rate = clk_pllv3_enet_get_rate,
};
--
2.56.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v1 3/7] clk: imx: pllv3: do not touch the ENET output gate
2026-11-20 11:10 [PATCH v1 0/7] colibri-imx6ull: fix the Ethernet PHY detection Stefan Eichenberger
2026-11-20 11:10 ` [PATCH v1 1/7] clk: imx: imx6ul: fix the enet clock gate register Stefan Eichenberger
2026-11-20 11:10 ` [PATCH v1 2/7] clk: imx: pllv3: wait for the ENET PLL to lock Stefan Eichenberger
@ 2026-11-20 11:10 ` Stefan Eichenberger
2026-11-20 11:10 ` [PATCH v1 4/7] clk: imx: imx6ul: add the enet clock tree Stefan Eichenberger
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Stefan Eichenberger @ 2026-11-20 11:10 UTC (permalink / raw)
To: trini, ilias.apalodimas, peng.fan, jh80.chung, tanmay.kathpalia,
sbabic, festevam, uboot-imx, francesco.dolcini, lukma, dlechner,
msp, stefan.eichenberger, Max.Merchel, nora.schiffer,
primoz.fiser, jbx6244, aford173, cniedermaier
Cc: u-boot
From: Stefan Eichenberger <stefan.eichenberger@toradex.com>
The PLLv3 enable and disable set and clear BM_PLL_ENABLE (bit 13) for
every PLL type. On PLL_ENET that bit is not a PLL enable but an output
gate: ENET1_125M_EN on i.MX6UL/ULL and the ENET clock output enable on
i.MX6Q/DL. Both SoC drivers already model it as their own gate clock
(enet1_ref_125m and pll6_enet, respectively), so the bit has two owners.
Enabling PLL6 for any of its other outputs turns that output on as well,
and disabling PLL6 clears it behind the gate's back.
Linux only handles the power bit for the ENET PLL. Do the same and leave
bit 13 to the SoC drivers. The PLL is still powered up and down through
BM_PLL_POWER.
Signed-off-by: Stefan Eichenberger <stefan.eichenberger@toradex.com>
---
drivers/clk/imx/clk-pllv3.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c
index 8e67442844f..4a3f1d088dd 100644
--- a/drivers/clk/imx/clk-pllv3.c
+++ b/drivers/clk/imx/clk-pllv3.c
@@ -346,6 +346,8 @@ struct clk *imx_clk_pllv3(struct udevice *dev, enum imx_pllv3_type type,
case IMX_PLLV3_ENET:
drv_name = UBOOT_DM_CLK_IMX_PLLV3_ENET;
pll->ref_clock = 500000000;
+ /* Bit 13 is an output gate, modelled by the SoC driver */
+ pll->enable_bit = 0;
break;
default:
kfree(pll);
--
2.56.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v1 4/7] clk: imx: imx6ul: add the enet clock tree
2026-11-20 11:10 [PATCH v1 0/7] colibri-imx6ull: fix the Ethernet PHY detection Stefan Eichenberger
` (2 preceding siblings ...)
2026-11-20 11:10 ` [PATCH v1 3/7] clk: imx: pllv3: do not touch the ENET output gate Stefan Eichenberger
@ 2026-11-20 11:10 ` Stefan Eichenberger
2026-11-20 11:10 ` [PATCH v1 5/7] board: toradex: colibri-imx6ull: drop the static serial device Stefan Eichenberger
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Stefan Eichenberger @ 2026-11-20 11:10 UTC (permalink / raw)
To: trini, ilias.apalodimas, peng.fan, jh80.chung, tanmay.kathpalia,
sbabic, festevam, uboot-imx, francesco.dolcini, lukma, dlechner,
msp, stefan.eichenberger, Max.Merchel, nora.schiffer,
primoz.fiser, jbx6244, aford173, cniedermaier
Cc: u-boot
From: Stefan Eichenberger <stefan.eichenberger@toradex.com>
The FEC ipg/ahb/ptp/ref clocks and the regulator-fixed-clock PHY
supplies reference clock IDs the driver never registered, so none of
them can probe with the clock framework enabled. The CCM request
callback only checks the ID range, so clk_get_by_name() still succeeds,
but the following clk_set_rate() and clk_enable() fail to look up the
clock.
Model the ENET branch as the reference manual and Linux describe it:
- The PLL6 bypass muxes, as this driver already does for PLL3.
PLL_ENET comes out of reset with BYPASS set, and the PLLv3 enable
only powers the PLL up, so select pll6 at probe time. Otherwise the
reference dividers run from the 24 MHz oscillator.
- pll6_enet feeding the two ref dividers and their 125M gates.
pll6_enet was registered as a gate on PLL_ENET bit 13, which is the
ENET1 125M output enable, not a PLL gate.
- The ENET1/ENET2 reference clock selectors on the IOMUXC_GPR1
ENETn_CLK_SEL bits, choosing between the 125M gates and the
ENETn_TX_CLK pads. U-Boot has no GPR mux clock type, so use a plain
mux on the GPR1 register. The pad clocks are not modelled and map to
"dummy". Unlike the Linux GPR mux, this does not drive
ENETn_TX_CLK_DIR: the U-Boot mux can only update a contiguous bit
field, and CLK_SEL and TX_CLK_DIR are not adjacent.
- The PTP reference and the enet AHB gate.
The 125M gates and the selectors carry CLK_SET_RATE_PARENT, so the FEC
driver's clk_set_rate() on enet_clk_ref lands on the ref divider.
Default both ref dividers to 50 MHz as Linux does, so the clock is
already at the RMII rate when a consumer enables it before the FEC
sets the rate, such as a regulator-fixed-clock PHY supply that probes
before the FEC.
Co-developed-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Signed-off-by: Stefan Eichenberger <stefan.eichenberger@toradex.com>
---
drivers/clk/imx/clk-imx6ul.c | 76 +++++++++++++++++++++++++++++++++---
1 file changed, 71 insertions(+), 5 deletions(-)
diff --git a/drivers/clk/imx/clk-imx6ul.c b/drivers/clk/imx/clk-imx6ul.c
index a73fb40b8ac..c65c029758b 100644
--- a/drivers/clk/imx/clk-imx6ul.c
+++ b/drivers/clk/imx/clk-imx6ul.c
@@ -34,8 +34,20 @@ static struct clk_ops imx6ul_clk_ops = {
.disable = ccf_clk_disable,
};
+static const struct clk_div_table clk_enet_ref_table[] = {
+ { .val = 0, .div = 20, },
+ { .val = 1, .div = 10, },
+ { .val = 2, .div = 5, },
+ { .val = 3, .div = 4, },
+ { }
+};
+
static const char *const pll_bypass_src_sels[] = { "osc", "dummy", };
static const char *const pll3_bypass_sels[] = { "pll3", "pll3_bypass_src", };
+static const char *const pll6_bypass_sels[] = { "pll6", "pll6_bypass_src", };
+/* The ENETn_TX_CLK pad clocks are not modelled, hence "dummy" */
+static const char *const enet1_ref_sels[] = { "enet1_ref_125m", "dummy", };
+static const char *const enet2_ref_sels[] = { "enet2_ref_125m", "dummy", };
static const char *const bch_sels[] = { "pll2_pfd2_396m", "pll2_pfd0_352m", };
static const char *const gpmi_sels[] = { "pll2_pfd2_396m", "pll2_pfd0_352m", };
@@ -103,8 +115,48 @@ static int imx6ul_clk_probe(struct udevice *dev)
clk_dm(IMX6UL_CLK_PLL6,
imx_clk_pllv3(dev, IMX_PLLV3_ENET, "pll6", "osc", base + 0xe0,
0x3));
+ clk_dm(IMX6UL_PLL6_BYPASS_SRC,
+ imx_clk_mux(dev, "pll6_bypass_src", base + 0xe0, 14, 1,
+ pll_bypass_src_sels,
+ ARRAY_SIZE(pll_bypass_src_sels)));
+ clk_dm(IMX6UL_PLL6_BYPASS,
+ imx_clk_mux_flags(dev, "pll6_bypass", base + 0xe0, 16, 1,
+ pll6_bypass_sels, ARRAY_SIZE(pll6_bypass_sels),
+ CLK_SET_RATE_PARENT));
clk_dm(IMX6UL_CLK_PLL6_ENET,
- imx_clk_gate(dev, "pll6_enet", "pll6", base + 0xe0, 13));
+ imx_clk_fixed_factor(dev, "pll6_enet", "pll6_bypass", 1, 1));
+ clk_dm(IMX6UL_CLK_ENET_REF,
+ clk_register_divider_table(dev, "enet1_ref", "pll6_enet", 0,
+ base + 0xe0, 0, 2, 0,
+ clk_enet_ref_table));
+ clk_dm(IMX6UL_CLK_ENET2_REF,
+ clk_register_divider_table(dev, "enet2_ref", "pll6_enet", 0,
+ base + 0xe0, 2, 2, 0,
+ clk_enet_ref_table));
+ clk_dm(IMX6UL_CLK_ENET1_REF_125M,
+ imx_clk_gate(dev, "enet1_ref_125m", "enet1_ref", base + 0xe0,
+ 13));
+ clk_dm(IMX6UL_CLK_ENET2_REF_125M,
+ imx_clk_gate(dev, "enet2_ref_125m", "enet2_ref", base + 0xe0,
+ 20));
+ /*
+ * IOMUXC_GPR1 ENETn_CLK_SEL: the ENET reference clock comes from
+ * the anatop ENET PLL (0) or from the ENETn_TX_CLK pad (1).
+ */
+ clk_dm(IMX6UL_CLK_ENET1_REF_SEL,
+ imx_clk_mux_flags(dev, "enet1_ref_sel",
+ (void *)IOMUXC_GPR_BASE_ADDR + 0x4, 13, 1,
+ enet1_ref_sels, ARRAY_SIZE(enet1_ref_sels),
+ CLK_SET_RATE_PARENT));
+ clk_dm(IMX6UL_CLK_ENET2_REF_SEL,
+ imx_clk_mux_flags(dev, "enet2_ref_sel",
+ (void *)IOMUXC_GPR_BASE_ADDR + 0x4, 14, 1,
+ enet2_ref_sels, ARRAY_SIZE(enet2_ref_sels),
+ CLK_SET_RATE_PARENT));
+ clk_dm(IMX6UL_CLK_ENET_PTP_REF,
+ imx_clk_fixed_factor(dev, "enet_ptp_ref", "pll6_enet", 1, 20));
+ clk_dm(IMX6UL_CLK_ENET_PTP,
+ imx_clk_gate(dev, "enet_ptp", "enet_ptp_ref", base + 0xe0, 21));
/* CCM clocks */
base = dev_read_addr_ptr(dev);
@@ -260,14 +312,17 @@ static int imx6ul_clk_probe(struct udevice *dev)
clk_dm(IMX6UL_CLK_PWM1,
imx_clk_gate2(dev, "pwm1", "perclk", base + 0x78, 16));
- if (is_mx6ull())
+ if (is_mx6ull()) {
clk_dm(IMX6UL_CLK_ENET,
imx_clk_gate2(dev, "enet", "ipg", base + 0x68, 12));
- else
+ clk_dm(IMX6UL_CLK_ENET_AHB,
+ imx_clk_gate2(dev, "enet_ahb", "ahb", base + 0x68, 12));
+ } else {
clk_dm(IMX6UL_CLK_ENET,
imx_clk_gate2(dev, "enet", "ipg", base + 0x74, 4));
- clk_dm(IMX6UL_CLK_ENET_REF,
- imx_clk_fixed_factor(dev, "enet_ref", "pll6_enet", 1, 1));
+ clk_dm(IMX6UL_CLK_ENET_AHB,
+ imx_clk_gate2(dev, "enet_ahb", "ahb", base + 0x74, 4));
+ }
struct clk *clk, *clk1;
@@ -276,6 +331,17 @@ static int imx6ul_clk_probe(struct udevice *dev)
clk_set_parent(clk, clk1);
+ /* Take PLL6 out of bypass, the ENET reference clocks need 500 MHz */
+ clk_get_by_id(IMX6UL_PLL6_BYPASS, &clk);
+ clk_get_by_id(IMX6UL_CLK_PLL6, &clk1);
+
+ clk_set_parent(clk, clk1);
+
+ clk_get_by_id(IMX6UL_CLK_ENET_REF, &clk);
+ clk_set_rate(clk, 50000000);
+ clk_get_by_id(IMX6UL_CLK_ENET2_REF, &clk);
+ clk_set_rate(clk, 50000000);
+
return 0;
}
--
2.56.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v1 5/7] board: toradex: colibri-imx6ull: drop the static serial device
2026-11-20 11:10 [PATCH v1 0/7] colibri-imx6ull: fix the Ethernet PHY detection Stefan Eichenberger
` (3 preceding siblings ...)
2026-11-20 11:10 ` [PATCH v1 4/7] clk: imx: imx6ul: add the enet clock tree Stefan Eichenberger
@ 2026-11-20 11:10 ` Stefan Eichenberger
2026-11-20 11:10 ` [PATCH v1 6/7] arm: dts: imx6ull-colibri: migrate to OF_UPSTREAM Stefan Eichenberger
2026-11-20 11:10 ` [PATCH v1 7/7] board: toradex: colibri-imx6ull: enable the clock framework Stefan Eichenberger
6 siblings, 0 replies; 8+ messages in thread
From: Stefan Eichenberger @ 2026-11-20 11:10 UTC (permalink / raw)
To: trini, ilias.apalodimas, peng.fan, jh80.chung, tanmay.kathpalia,
sbabic, festevam, uboot-imx, francesco.dolcini, lukma, dlechner,
msp, stefan.eichenberger, Max.Merchel, nora.schiffer,
primoz.fiser, jbx6244, aford173, cniedermaier
Cc: u-boot
From: Francesco Dolcini <francesco.dolcini@toradex.com>
uart1 is described in the device tree and enabled there, so the
platform-data device binds a second, duplicate serial_mxc instance.
It has no device tree node, so once the clock framework is enabled it
cannot resolve its clocks and fails to probe.
The device tree instance is still available before relocation: both
simple_bus and serial_mxc set DM_FLAG_PRE_RELOC, so the soc/aips/spba
buses and uart1 bind without bootph marks, and fsl,dte-mode replaces
the use_dte platform data.
Tested-by: Stefan Eichenberger <stefan.eichenberger@toradex.com>
Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Signed-off-by: Stefan Eichenberger <stefan.eichenberger@toradex.com>
---
board/toradex/colibri-imx6ull/colibri-imx6ull.c | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
index 7bfe200d6e4..01387e87294 100644
--- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c
+++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
@@ -19,7 +19,6 @@
#include <asm/mach-imx/iomux-v3.h>
#include <asm/io.h>
#include <dm.h>
-#include <dm/platform_data/serial_mxc.h>
#include <env.h>
#include <fdt_support.h>
#include <imx_thermal.h>
@@ -211,13 +210,3 @@ int ft_board_setup(void *blob, struct bd_info *bd)
return ft_common_board_setup(blob, bd);
}
#endif
-
-static struct mxc_serial_plat mxc_serial_plat = {
- .reg = (struct mxc_uart *)UART1_BASE,
- .use_dte = 1,
-};
-
-U_BOOT_DRVINFO(mxc_serial) = {
- .name = "serial_mxc",
- .plat = &mxc_serial_plat,
-};
--
2.56.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v1 6/7] arm: dts: imx6ull-colibri: migrate to OF_UPSTREAM
2026-11-20 11:10 [PATCH v1 0/7] colibri-imx6ull: fix the Ethernet PHY detection Stefan Eichenberger
` (4 preceding siblings ...)
2026-11-20 11:10 ` [PATCH v1 5/7] board: toradex: colibri-imx6ull: drop the static serial device Stefan Eichenberger
@ 2026-11-20 11:10 ` Stefan Eichenberger
2026-11-20 11:10 ` [PATCH v1 7/7] board: toradex: colibri-imx6ull: enable the clock framework Stefan Eichenberger
6 siblings, 0 replies; 8+ messages in thread
From: Stefan Eichenberger @ 2026-11-20 11:10 UTC (permalink / raw)
To: trini, ilias.apalodimas, peng.fan, jh80.chung, tanmay.kathpalia,
sbabic, festevam, uboot-imx, francesco.dolcini, lukma, dlechner,
msp, stefan.eichenberger, Max.Merchel, nora.schiffer,
primoz.fiser, jbx6244, aford173, cniedermaier
Cc: u-boot
From: Francesco Dolcini <francesco.dolcini@toradex.com>
Build the Colibri iMX6ULL device trees from dts/upstream so they follow
the Linux kernel releases instead of a local copy. The U-Boot specific
bits stay in the *-u-boot.dtsi files.
Remove the now obsolete device tree files:
- imx6ull-colibri.dtsi
- imx6ull-colibri-nonwifi.dtsi
- imx6ull-colibri-emmc-nonwifi.dtsi
- imx6ull-colibri-eval-v3.dtsi
- imx6ull-colibri-eval-v3.dts
- imx6ull-colibri-emmc-eval-v3.dts
Tested-by: Stefan Eichenberger <stefan.eichenberger@toradex.com>
Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Signed-off-by: Stefan Eichenberger <stefan.eichenberger@toradex.com>
---
arch/arm/dts/Makefile | 2 -
arch/arm/dts/imx6ull-colibri-emmc-eval-v3.dts | 17 -
.../arm/dts/imx6ull-colibri-emmc-nonwifi.dtsi | 187 -----
arch/arm/dts/imx6ull-colibri-eval-v3.dts | 14 -
arch/arm/dts/imx6ull-colibri-eval-v3.dtsi | 121 ---
arch/arm/dts/imx6ull-colibri-nonwifi.dtsi | 161 ----
arch/arm/dts/imx6ull-colibri.dtsi | 748 ------------------
arch/arm/mach-imx/mx6/Kconfig | 1 +
board/toradex/colibri-imx6ull/MAINTAINERS | 8 +-
configs/colibri-imx6ull-emmc_defconfig | 2 +-
configs/colibri-imx6ull_defconfig | 2 +-
11 files changed, 5 insertions(+), 1258 deletions(-)
delete mode 100644 arch/arm/dts/imx6ull-colibri-emmc-eval-v3.dts
delete mode 100644 arch/arm/dts/imx6ull-colibri-emmc-nonwifi.dtsi
delete mode 100644 arch/arm/dts/imx6ull-colibri-eval-v3.dts
delete mode 100644 arch/arm/dts/imx6ull-colibri-eval-v3.dtsi
delete mode 100644 arch/arm/dts/imx6ull-colibri-nonwifi.dtsi
delete mode 100644 arch/arm/dts/imx6ull-colibri.dtsi
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index cf4674042a2..e965aa6cd59 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -800,8 +800,6 @@ dtb-$(CONFIG_MX6UL) += \
dtb-$(CONFIG_MX6ULL) += \
imx6ull-14x14-evk.dtb \
- imx6ull-colibri-emmc-eval-v3.dtb \
- imx6ull-colibri-eval-v3.dtb \
imx6ull-myir-mys-6ulx-eval.dtb \
imx6ull-seeed-npi-imx6ull-dev-board.dtb \
imx6ull-phytec-segin-ff-rdk-emmc.dtb \
diff --git a/arch/arm/dts/imx6ull-colibri-emmc-eval-v3.dts b/arch/arm/dts/imx6ull-colibri-emmc-eval-v3.dts
deleted file mode 100644
index 61b93cb040c..00000000000
--- a/arch/arm/dts/imx6ull-colibri-emmc-eval-v3.dts
+++ /dev/null
@@ -1,17 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+ OR MIT
-/*
- * Copyright 2021 Toradex
- */
-
-/dts-v1/;
-
-#include "imx6ull-colibri-emmc-nonwifi.dtsi"
-#include "imx6ull-colibri-eval-v3.dtsi"
-
-/ {
- model = "Toradex Colibri iMX6ULL 1GB (eMMC) on Colibri Evaluation Board V3";
- compatible = "toradex,colibri-imx6ull-emmc-eval",
- "toradex,colibri-imx6ull-emmc",
- "toradex,colibri-imx6ull",
- "fsl,imx6ull";
-};
diff --git a/arch/arm/dts/imx6ull-colibri-emmc-nonwifi.dtsi b/arch/arm/dts/imx6ull-colibri-emmc-nonwifi.dtsi
deleted file mode 100644
index ea238525d5c..00000000000
--- a/arch/arm/dts/imx6ull-colibri-emmc-nonwifi.dtsi
+++ /dev/null
@@ -1,187 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/*
- * Copyright 2022 Toradex
- */
-
-#include "imx6ull-colibri.dtsi"
-
-/ {
- aliases {
- mmc0 = &usdhc2; /* eMMC */
- mmc1 = &usdhc1; /* MMC 4-bit slot */
- };
-
- memory@80000000 {
- device_type = "memory";
- reg = <0x80000000 0x10000000>;
- };
-};
-
-&gpio1 {
- gpio-line-names = "SODIMM_8",
- "SODIMM_6",
- "SODIMM_129",
- "SODIMM_89",
- "SODIMM_19",
- "SODIMM_21",
- "UNUSABLE_SODIMM_180",
- "UNUSABLE_SODIMM_184",
- "SODIMM_4",
- "SODIMM_2",
- "SODIMM_106",
- "SODIMM_71",
- "SODIMM_23",
- "SODIMM_31",
- "SODIMM_99",
- "SODIMM_102",
- "SODIMM_33",
- "SODIMM_35",
- "SODIMM_25",
- "SODIMM_27",
- "SODIMM_36",
- "SODIMM_38",
- "SODIMM_32",
- "SODIMM_34",
- "SODIMM_135",
- "SODIMM_77",
- "SODIMM_100",
- "SODIMM_186",
- "SODIMM_196",
- "SODIMM_194";
-};
-
-&gpio2 {
- gpio-line-names = "SODIMM_55",
- "SODIMM_63",
- "SODIMM_178",
- "SODIMM_188",
- "SODIMM_73",
- "SODIMM_30",
- "SODIMM_67",
- "SODIMM_104",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "SODIMM_190",
- "SODIMM_47",
- "SODIMM_192",
- "SODIMM_49",
- "SODIMM_51",
- "SODIMM_53";
-};
-
-&gpio3 {
- gpio-line-names = "SODIMM_56",
- "SODIMM_44",
- "SODIMM_68",
- "SODIMM_82",
- "",
- "SODIMM_76",
- "SODIMM_70",
- "SODIMM_60",
- "SODIMM_58",
- "SODIMM_78",
- "SODIMM_72",
- "SODIMM_80",
- "SODIMM_46",
- "SODIMM_62",
- "SODIMM_48",
- "SODIMM_74",
- "SODIMM_50",
- "SODIMM_52",
- "SODIMM_54",
- "SODIMM_66",
- "SODIMM_64",
- "SODIMM_57",
- "SODIMM_61",
- "SODIMM_29",
- "SODIMM_37",
- "SODIMM_88",
- "SODIMM_86",
- "SODIMM_92",
- "SODIMM_90";
-};
-
-&gpio4 {
- gpio-line-names = "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "SODIMM_140",
- "SODIMM_59",
- "SODIMM_142",
- "SODIMM_144",
- "SODIMM_133",
- "SODIMM_146",
- "SODIMM_28",
- "SODIMM_75",
- "SODIMM_96",
- "SODIMM_81",
- "SODIMM_94",
- "SODIMM_101",
- "SODIMM_103",
- "SODIMM_79",
- "SODIMM_97",
- "SODIMM_69",
- "SODIMM_98",
- "SODIMM_85",
- "SODIMM_65";
-};
-
-&gpio5 {
- gpio-line-names = "SODIMM_43",
- "SODIMM_45",
- "SODIMM_137",
- "SODIMM_95",
- "SODIMM_107",
- "SODIMM_131",
- "SODIMM_93",
- "",
- "SODIMM_138",
- "",
- "SODIMM_105",
- "SODIMM_127";
-};
-
-/* NAND */
-&gpmi {
- status = "disabled";
-};
-
-&iomuxc {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3
- &pinctrl_gpio4 &pinctrl_gpio6 &pinctrl_gpio7
- &pinctrl_gpmi_gpio>;
-};
-
-&iomuxc_snvs {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_snvs_gpio1 &pinctrl_snvs_gpio3>;
-};
-
-/* eMMC */
-&usdhc2 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_usdhc2emmc>;
- assigned-clocks = <&clks IMX6UL_CLK_USDHC2_SEL>, <&clks IMX6UL_CLK_USDHC2>;
- assigned-clock-parents = <&clks IMX6UL_CLK_PLL2_PFD2>;
- assigned-clock-rates = <0>, <198000000>;
- bus-width = <8>;
- keep-power-in-suspend;
- no-1-8-v;
- non-removable;
- vmmc-supply = <®_module_3v3>;
- status = "okay";
-};
diff --git a/arch/arm/dts/imx6ull-colibri-eval-v3.dts b/arch/arm/dts/imx6ull-colibri-eval-v3.dts
deleted file mode 100644
index 9bf7111d7b0..00000000000
--- a/arch/arm/dts/imx6ull-colibri-eval-v3.dts
+++ /dev/null
@@ -1,14 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/*
- * Copyright 2018-2022 Toradex
- */
-
-/dts-v1/;
-
-#include "imx6ull-colibri-nonwifi.dtsi"
-#include "imx6ull-colibri-eval-v3.dtsi"
-
-/ {
- model = "Toradex Colibri iMX6ULL 256/512MB on Colibri Evaluation Board V3";
- compatible = "toradex,colibri-imx6ull-eval", "fsl,imx6ull";
-};
diff --git a/arch/arm/dts/imx6ull-colibri-eval-v3.dtsi b/arch/arm/dts/imx6ull-colibri-eval-v3.dtsi
deleted file mode 100644
index e29907428c2..00000000000
--- a/arch/arm/dts/imx6ull-colibri-eval-v3.dtsi
+++ /dev/null
@@ -1,121 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/*
- * Copyright 2017-2022 Toradex
- */
-
-/ {
- chosen {
- stdout-path = "serial0:115200n8";
- };
-
- /* fixed crystal dedicated to mcp2515 */
- clk16m: clk16m {
- compatible = "fixed-clock";
- #clock-cells = <0>;
- clock-frequency = <16000000>;
- };
-
- reg_3v3: regulator-3v3 {
- compatible = "regulator-fixed";
- regulator-name = "3.3V";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- };
-
- reg_5v0: regulator-5v0 {
- compatible = "regulator-fixed";
- regulator-name = "5V";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- };
-
- reg_usbh_vbus: regulator-usbh-vbus {
- compatible = "regulator-fixed";
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_usbh_reg>;
- regulator-name = "VCC_USB[1-4]";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- gpio = <&gpio1 2 GPIO_ACTIVE_LOW>;
- vin-supply = <®_5v0>;
- };
-};
-
-&adc1 {
- status = "okay";
-};
-
-&ecspi1 {
- status = "okay";
-
- mcp2515: can@0 {
- compatible = "microchip,mcp2515";
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_can_int>;
- reg = <0>;
- clocks = <&clk16m>;
- interrupt-parent = <&gpio2>;
- interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
- spi-max-frequency = <10000000>;
- vdd-supply = <®_3v3>;
- xceiver-supply = <®_5v0>;
- status = "okay";
- };
-};
-
-&i2c1 {
- status = "okay";
-
- /* M41T0M6 real time clock on carrier board */
- m41t0m6: rtc@68 {
- compatible = "st,m41t0";
- reg = <0x68>;
- };
-};
-
-/* PWM <A> */
-&pwm4 {
- status = "okay";
-};
-
-/* PWM <B> */
-&pwm5 {
- status = "okay";
-};
-
-/* PWM <C> */
-&pwm6 {
- status = "okay";
-};
-
-/* PWM <D> */
-&pwm7 {
- status = "okay";
-};
-
-&uart1 {
- status = "okay";
-};
-
-&uart2 {
- status = "okay";
-};
-
-&uart5 {
- status = "okay";
-};
-
-&usbotg1 {
- vbus-supply = <®_usbh_vbus>;
- status = "okay";
-};
-
-&usbotg2 {
- vbus-supply = <®_usbh_vbus>;
- status = "okay";
-};
-
-&usdhc1 {
- vmmc-supply = <®_3v3>;
- status = "okay";
-};
diff --git a/arch/arm/dts/imx6ull-colibri-nonwifi.dtsi b/arch/arm/dts/imx6ull-colibri-nonwifi.dtsi
deleted file mode 100644
index 88901db255d..00000000000
--- a/arch/arm/dts/imx6ull-colibri-nonwifi.dtsi
+++ /dev/null
@@ -1,161 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/*
- * Copyright 2018-2022 Toradex
- */
-
-#include "imx6ull-colibri.dtsi"
-
-/ {
- memory@80000000 {
- device_type = "memory";
- reg = <0x80000000 0x10000000>;
- };
-};
-
-&gpio1 {
- gpio-line-names = "SODIMM_8",
- "SODIMM_6",
- "SODIMM_129",
- "SODIMM_89",
- "SODIMM_19",
- "SODIMM_21",
- "UNUSABLE_SODIMM_180",
- "UNUSABLE_SODIMM_184",
- "SODIMM_4",
- "SODIMM_2",
- "SODIMM_106",
- "SODIMM_71",
- "SODIMM_23",
- "SODIMM_31",
- "SODIMM_99",
- "SODIMM_102",
- "SODIMM_33",
- "SODIMM_35",
- "SODIMM_25",
- "SODIMM_27",
- "SODIMM_36",
- "SODIMM_38",
- "SODIMM_32",
- "SODIMM_34",
- "SODIMM_135",
- "SODIMM_77",
- "SODIMM_100",
- "SODIMM_186",
- "SODIMM_196",
- "SODIMM_194";
-};
-
-&gpio2 {
- gpio-line-names = "SODIMM_55",
- "SODIMM_63",
- "SODIMM_178",
- "SODIMM_188",
- "SODIMM_73",
- "SODIMM_30",
- "SODIMM_67",
- "SODIMM_104",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "SODIMM_190",
- "SODIMM_47",
- "SODIMM_192",
- "SODIMM_49",
- "SODIMM_51",
- "SODIMM_53";
-};
-
-&gpio3 {
- gpio-line-names = "SODIMM_56",
- "SODIMM_44",
- "SODIMM_68",
- "SODIMM_82",
- "",
- "SODIMM_76",
- "SODIMM_70",
- "SODIMM_60",
- "SODIMM_58",
- "SODIMM_78",
- "SODIMM_72",
- "SODIMM_80",
- "SODIMM_46",
- "SODIMM_62",
- "SODIMM_48",
- "SODIMM_74",
- "SODIMM_50",
- "SODIMM_52",
- "SODIMM_54",
- "SODIMM_66",
- "SODIMM_64",
- "SODIMM_57",
- "SODIMM_61",
- "SODIMM_29",
- "SODIMM_37",
- "SODIMM_88",
- "SODIMM_86",
- "SODIMM_92",
- "SODIMM_90";
-};
-
-&gpio4 {
- gpio-line-names = "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "SODIMM_59",
- "",
- "",
- "SODIMM_133",
- "",
- "SODIMM_28",
- "SODIMM_75",
- "SODIMM_96",
- "SODIMM_81",
- "SODIMM_94",
- "SODIMM_101",
- "SODIMM_103",
- "SODIMM_79",
- "SODIMM_97",
- "SODIMM_69",
- "SODIMM_98",
- "SODIMM_85",
- "SODIMM_65";
-};
-
-&gpio5 {
- gpio-line-names = "SODIMM_43",
- "SODIMM_45",
- "SODIMM_137",
- "SODIMM_95",
- "SODIMM_107",
- "SODIMM_131",
- "SODIMM_93",
- "",
- "SODIMM_138",
- "",
- "SODIMM_105",
- "SODIMM_127";
-};
-
-&iomuxc {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3
- &pinctrl_gpio4 &pinctrl_gpio6 &pinctrl_gpio7>;
-};
-
-&iomuxc_snvs {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_snvs_gpio1 &pinctrl_snvs_gpio3>;
-};
diff --git a/arch/arm/dts/imx6ull-colibri.dtsi b/arch/arm/dts/imx6ull-colibri.dtsi
deleted file mode 100644
index 577a424b0e1..00000000000
--- a/arch/arm/dts/imx6ull-colibri.dtsi
+++ /dev/null
@@ -1,748 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/*
- * Copyright 2018-2022 Toradex
- */
-
-#include "imx6ull.dtsi"
-
-/ {
- /* Ethernet aliases to ensure correct MAC addresses */
- aliases {
- ethernet0 = &fec2;
- ethernet1 = &fec1;
- };
-
- backlight: backlight {
- compatible = "pwm-backlight";
- brightness-levels = <0 4 8 16 32 64 128 255>;
- default-brightness-level = <6>;
- enable-gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_gpio_bl_on>;
- power-supply = <®_3v3>;
- pwms = <&pwm4 0 5000000 1>;
- status = "okay";
- };
-
- gpio-keys {
- compatible = "gpio-keys";
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_snvs_gpiokeys>;
-
- wakeup {
- debounce-interval = <10>;
- gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; /* SODIMM 45 */
- label = "Wake-Up";
- linux,code = <KEY_WAKEUP>;
- wakeup-source;
- };
- };
-
- panel_dpi: panel-dpi {
- compatible = "edt,et057090dhu";
- backlight = <&backlight>;
- power-supply = <®_3v3>;
- status = "okay";
-
- port {
- lcd_panel_in: endpoint {
- remote-endpoint = <&lcdif_out>;
- };
- };
- };
-
- reg_module_3v3: regulator-module-3v3 {
- compatible = "regulator-fixed";
- regulator-always-on;
- regulator-name = "+V3.3";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- };
-
- reg_module_3v3_avdd: regulator-module-3v3-avdd {
- compatible = "regulator-fixed";
- regulator-always-on;
- regulator-name = "+V3.3_AVDD_AUDIO";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- };
-
- reg_sd1_vqmmc: regulator-sd1-vqmmc {
- compatible = "regulator-gpio";
- gpios = <&gpio5 9 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_snvs_reg_sd>;
- regulator-always-on;
- regulator-name = "+V3.3_1.8_SD";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <3300000>;
- states = <1800000 0x1 3300000 0x0>;
- vin-supply = <®_module_3v3>;
- };
-
- reg_eth_phy: regulator-eth-phy {
- compatible = "regulator-fixed-clock";
- regulator-boot-on;
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- regulator-name = "+V3.3_ETH";
- regulator-type = "voltage";
- vin-supply = <®_module_3v3>;
- clocks = <&clks IMX6UL_CLK_ENET2_REF_125M>;
- startup-delay-us = <150000>;
- };
-};
-
-&adc1 {
- vref-supply = <®_module_3v3_avdd>;
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_adc1>;
-};
-
-&can1 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_flexcan1>;
- status = "disabled";
-};
-
-&can2 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_flexcan2>;
- status = "disabled";
-};
-
-/* Colibri SPI */
-&ecspi1 {
- cs-gpios = <&gpio3 26 GPIO_ACTIVE_LOW>;
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_ecspi1 &pinctrl_ecspi1_cs>;
-};
-
-/* Ethernet */
-&fec2 {
- pinctrl-names = "default", "sleep";
- pinctrl-0 = <&pinctrl_enet2>;
- pinctrl-1 = <&pinctrl_enet2_sleep>;
- phy-mode = "rmii";
- phy-handle = <ðphy1>;
- phy-supply = <®_eth_phy>;
- status = "okay";
-
- mdio {
- #address-cells = <1>;
- #size-cells = <0>;
-
- ethphy1: ethernet-phy@2 {
- compatible = "ethernet-phy-ieee802.3-c22";
- max-speed = <100>;
- reg = <2>;
- };
- };
-};
-
-/* NAND */
-&gpmi {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_gpmi_nand>;
- fsl,use-minimum-ecc;
- nand-on-flash-bbt;
- nand-ecc-mode = "hw";
- nand-ecc-strength = <8>;
- nand-ecc-step-size = <512>;
- status = "okay";
-};
-
-/* I2C3_SDA/SCL on SODIMM 194/196 (e.g. RTC on carrier board) */
-&i2c1 {
- pinctrl-names = "default", "gpio";
- pinctrl-0 = <&pinctrl_i2c1>;
- pinctrl-1 = <&pinctrl_i2c1_gpio>;
- sda-gpios = <&gpio1 29 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
- scl-gpios = <&gpio1 28 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
- status = "okay";
-
- /* Atmel maxtouch controller */
- atmel_mxt_ts: touchscreen@4a {
- compatible = "atmel,maxtouch";
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_atmel_conn &pinctrl_atmel_snvs_conn>;
- reg = <0x4a>;
- interrupt-parent = <&gpio5>;
- interrupts = <4 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 107 / INT */
- reset-gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; /* SODIMM 106 / RST */
- status = "disabled";
- };
-};
-
-/*
- * PWR_I2C: power I2C to audio codec, PMIC, temperature sensor and
- * touch screen controller
- */
-&i2c2 {
- /* Use low frequency to compensate for the high pull-up values. */
- clock-frequency = <40000>;
- pinctrl-names = "default", "gpio";
- pinctrl-0 = <&pinctrl_i2c2>;
- pinctrl-1 = <&pinctrl_i2c2_gpio>;
- sda-gpios = <&gpio1 31 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
- scl-gpios = <&gpio1 30 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
- status = "okay";
-
- ad7879_ts: touchscreen@2c {
- compatible = "adi,ad7879-1";
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_snvs_ad7879_int>;
- reg = <0x2c>;
- interrupt-parent = <&gpio5>;
- interrupts = <7 IRQ_TYPE_EDGE_FALLING>;
- touchscreen-max-pressure = <4096>;
- adi,resistance-plate-x = <120>;
- adi,first-conversion-delay = /bits/ 8 <3>;
- adi,acquisition-time = /bits/ 8 <1>;
- adi,median-filter-size = /bits/ 8 <2>;
- adi,averaging = /bits/ 8 <1>;
- adi,conversion-interval = /bits/ 8 <255>;
- };
-};
-
-&lcdif {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_lcdif_dat
- &pinctrl_lcdif_ctrl>;
-
- port {
- lcdif_out: endpoint {
- remote-endpoint = <&lcd_panel_in>;
- };
- };
-};
-
-/* PWM <A> */
-&pwm4 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_pwm4>;
-};
-
-/* PWM <B> */
-&pwm5 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_pwm5>;
-};
-
-/* PWM <C> */
-&pwm6 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_pwm6>;
-};
-
-/* PWM <D> */
-&pwm7 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_pwm7>;
-};
-
-&sdma {
- status = "okay";
-};
-
-&snvs_pwrkey {
- status = "disabled";
-};
-
-/* Colibri UART_A */
-&uart1 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_uart1 &pinctrl_uart1_ctrl1>;
- uart-has-rtscts;
- fsl,dte-mode;
-};
-
-/* Colibri UART_B */
-&uart2 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_uart2>;
- uart-has-rtscts;
- fsl,dte-mode;
-};
-
-/* Colibri UART_C */
-&uart5 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_uart5>;
- fsl,dte-mode;
-};
-
-/* Colibri USBC */
-&usbotg1 {
- dr_mode = "otg";
- srp-disable;
- hnp-disable;
- adp-disable;
-};
-
-/* Colibri USBH */
-&usbotg2 {
- dr_mode = "host";
-};
-
-/* Colibri MMC/SD */
-&usdhc1 {
- pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep";
- pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>;
- pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_snvs_usdhc1_cd>;
- pinctrl-2 = <&pinctrl_usdhc1_200mhz &pinctrl_snvs_usdhc1_cd>;
- pinctrl-3 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd_sleep>;
- assigned-clocks = <&clks IMX6UL_CLK_USDHC1_SEL>, <&clks IMX6UL_CLK_USDHC1>;
- assigned-clock-parents = <&clks IMX6UL_CLK_PLL2_PFD2>;
- assigned-clock-rates = <0>, <198000000>;
- bus-width = <4>;
- cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; /* MMC_CD */
- disable-wp;
- keep-power-in-suspend;
- no-1-8-v;
- vqmmc-supply = <®_sd1_vqmmc>;
- wakeup-source;
-};
-
-&wdog1 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_wdog>;
- fsl,ext-reset-output;
-};
-
-&iomuxc {
- pinctrl_adc1: adc1grp {
- fsl,pins = <
- MX6UL_PAD_GPIO1_IO00__GPIO1_IO00 0x3000 /* SODIMM 8 */
- MX6UL_PAD_GPIO1_IO01__GPIO1_IO01 0x3000 /* SODIMM 6 */
- MX6UL_PAD_GPIO1_IO08__GPIO1_IO08 0x3000 /* SODIMM 4 */
- MX6UL_PAD_GPIO1_IO09__GPIO1_IO09 0x3000 /* SODIMM 2 */
- >;
- };
-
- pinctrl_atmel_adap: atmeladapgrp {
- fsl,pins = <
- MX6UL_PAD_NAND_DQS__GPIO4_IO16 0xb0a0 /* SODIMM 28 */
- MX6UL_PAD_ENET1_TX_EN__GPIO2_IO05 0xb0a0 /* SODIMM 30 */
- >;
- };
-
- pinctrl_atmel_conn: atmelconngrp {
- fsl,pins = <
- MX6UL_PAD_JTAG_MOD__GPIO1_IO10 0xb0a0 /* SODIMM 106 */
- >;
- };
-
- pinctrl_can_int: canintgrp {
- fsl,pins = <
- MX6UL_PAD_ENET1_TX_DATA1__GPIO2_IO04 0x13010 /* SODIMM 73 */
- >;
- };
-
- pinctrl_enet2: enet2grp {
- fsl,pins = <
- MX6UL_PAD_GPIO1_IO06__ENET2_MDIO 0x1b0b0
- MX6UL_PAD_GPIO1_IO07__ENET2_MDC 0x1b0b0
- MX6UL_PAD_ENET2_RX_DATA0__ENET2_RDATA00 0x1b0b0
- MX6UL_PAD_ENET2_RX_DATA1__ENET2_RDATA01 0x1b0b0
- MX6UL_PAD_ENET2_RX_EN__ENET2_RX_EN 0x1b0b0
- MX6UL_PAD_ENET2_RX_ER__ENET2_RX_ER 0x1b0b0
- MX6UL_PAD_ENET2_TX_CLK__ENET2_REF_CLK2 0x4001b031
- MX6UL_PAD_ENET2_TX_DATA0__ENET2_TDATA00 0x1b0b0
- MX6UL_PAD_ENET2_TX_DATA1__ENET2_TDATA01 0x1b0b0
- MX6UL_PAD_ENET2_TX_EN__ENET2_TX_EN 0x1b0b0
- >;
- };
-
- pinctrl_enet2_sleep: enet2-sleepgrp {
- fsl,pins = <
- MX6UL_PAD_GPIO1_IO06__GPIO1_IO06 0x0
- MX6UL_PAD_GPIO1_IO07__GPIO1_IO07 0x0
- MX6UL_PAD_ENET2_RX_DATA0__GPIO2_IO08 0x0
- MX6UL_PAD_ENET2_RX_DATA1__GPIO2_IO09 0x0
- MX6UL_PAD_ENET2_RX_EN__GPIO2_IO10 0x0
- MX6UL_PAD_ENET2_RX_ER__GPIO2_IO15 0x0
- MX6UL_PAD_ENET2_TX_CLK__ENET2_REF_CLK2 0x4001b031
- MX6UL_PAD_ENET2_TX_DATA0__GPIO2_IO11 0x0
- MX6UL_PAD_ENET2_TX_DATA1__GPIO2_IO12 0x0
- MX6UL_PAD_ENET2_TX_EN__GPIO2_IO13 0x0
- >;
- };
-
- pinctrl_ecspi1_cs: ecspi1csgrp {
- fsl,pins = <
- MX6UL_PAD_LCD_DATA21__GPIO3_IO26 0x70a0 /* SODIMM 86 */
- >;
- };
-
- pinctrl_ecspi1: ecspi1grp {
- fsl,pins = <
- MX6UL_PAD_LCD_DATA20__ECSPI1_SCLK 0x000a0 /* SODIMM 88 */
- MX6UL_PAD_LCD_DATA22__ECSPI1_MOSI 0x000a0 /* SODIMM 92 */
- MX6UL_PAD_LCD_DATA23__ECSPI1_MISO 0x100a0 /* SODIMM 90 */
- >;
- };
-
- pinctrl_flexcan1: flexcan1grp {
- fsl,pins = <
- MX6UL_PAD_ENET1_RX_DATA0__FLEXCAN1_TX 0x1b020
- MX6UL_PAD_ENET1_RX_DATA1__FLEXCAN1_RX 0x1b020
- >;
- };
-
- pinctrl_flexcan2: flexcan2grp {
- fsl,pins = <
- MX6UL_PAD_ENET1_TX_DATA0__FLEXCAN2_RX 0x1b020
- MX6UL_PAD_ENET1_RX_EN__FLEXCAN2_TX 0x1b020
- >;
- };
-
- pinctrl_gpio_bl_on: gpioblongrp {
- fsl,pins = <
- MX6UL_PAD_JTAG_TMS__GPIO1_IO11 0x30a0 /* SODIMM 71 */
- >;
- };
-
- pinctrl_gpio1: gpio1grp {
- fsl,pins = <
- MX6UL_PAD_UART3_RX_DATA__GPIO1_IO25 0x10b0 /* SODIMM 77 */
- MX6UL_PAD_JTAG_TCK__GPIO1_IO14 0x70a0 /* SODIMM 99 */
- MX6UL_PAD_NAND_CE1_B__GPIO4_IO14 0x10b0 /* SODIMM 133 */
- MX6UL_PAD_UART3_TX_DATA__GPIO1_IO24 0x10b0 /* SODIMM 135 */
- MX6UL_PAD_UART3_CTS_B__GPIO1_IO26 0x10b0 /* SODIMM 100 */
- MX6UL_PAD_JTAG_TRST_B__GPIO1_IO15 0x70a0 /* SODIMM 102 */
- MX6UL_PAD_ENET1_RX_ER__GPIO2_IO07 0x10b0 /* SODIMM 104 */
- MX6UL_PAD_UART3_RTS_B__GPIO1_IO27 0x10b0 /* SODIMM 186 */
- >;
- };
-
- pinctrl_gpio2: gpio2grp { /* Camera */
- fsl,pins = <
- MX6UL_PAD_CSI_DATA04__GPIO4_IO25 0x10b0 /* SODIMM 69 */
- MX6UL_PAD_CSI_MCLK__GPIO4_IO17 0x10b0 /* SODIMM 75 */
- MX6UL_PAD_CSI_DATA06__GPIO4_IO27 0x10b0 /* SODIMM 85 */
- MX6UL_PAD_CSI_PIXCLK__GPIO4_IO18 0x10b0 /* SODIMM 96 */
- MX6UL_PAD_CSI_DATA05__GPIO4_IO26 0x10b0 /* SODIMM 98 */
- >;
- };
-
- pinctrl_gpio3: gpio3grp { /* CAN2 */
- fsl,pins = <
- MX6UL_PAD_ENET1_RX_EN__GPIO2_IO02 0x10b0 /* SODIMM 178 */
- MX6UL_PAD_ENET1_TX_DATA0__GPIO2_IO03 0x10b0 /* SODIMM 188 */
- >;
- };
-
- pinctrl_gpio4: gpio4grp {
- fsl,pins = <
- MX6UL_PAD_CSI_DATA07__GPIO4_IO28 0x10b0 /* SODIMM 65 */
- >;
- };
-
- pinctrl_gpio6: gpio6grp { /* Wifi pins */
- fsl,pins = <
- MX6UL_PAD_GPIO1_IO03__GPIO1_IO03 0x10b0 /* SODIMM 89 */
- MX6UL_PAD_CSI_DATA02__GPIO4_IO23 0x10b0 /* SODIMM 79 */
- MX6UL_PAD_CSI_VSYNC__GPIO4_IO19 0x10b0 /* SODIMM 81 */
- MX6UL_PAD_CSI_DATA03__GPIO4_IO24 0x10b0 /* SODIMM 97 */
- MX6UL_PAD_CSI_DATA00__GPIO4_IO21 0x10b0 /* SODIMM 101 */
- MX6UL_PAD_CSI_DATA01__GPIO4_IO22 0x10b0 /* SODIMM 103 */
- MX6UL_PAD_CSI_HSYNC__GPIO4_IO20 0x10b0 /* SODIMM 94 */
- >;
- };
-
- pinctrl_gpio7: gpio7grp { /* CAN1 */
- fsl,pins = <
- MX6UL_PAD_ENET1_RX_DATA0__GPIO2_IO00 0xb0b0/* SODIMM 55 */
- MX6UL_PAD_ENET1_RX_DATA1__GPIO2_IO01 0xb0b0 /* SODIMM 63 */
- >;
- };
-
- /*
- * With an eMMC instead of a raw NAND device the following pins
- * are available at SODIMM pins.
- */
- pinctrl_gpmi_gpio: gpmigpiogrp {
- fsl,pins = <
- MX6UL_PAD_NAND_ALE__GPIO4_IO10 0x10b0 /* SODIMM 140 */
- MX6UL_PAD_NAND_CE0_B__GPIO4_IO13 0x10b0 /* SODIMM 144 */
- MX6UL_PAD_NAND_CLE__GPIO4_IO15 0x10b0 /* SODIMM 146 */
- MX6UL_PAD_NAND_READY_B__GPIO4_IO12 0x10b0 /* SODIMM 142 */
- >;
- };
-
- pinctrl_gpmi_nand: gpminandgrp {
- fsl,pins = <
- MX6UL_PAD_NAND_DATA00__RAWNAND_DATA00 0x100a9
- MX6UL_PAD_NAND_DATA01__RAWNAND_DATA01 0x100a9
- MX6UL_PAD_NAND_DATA02__RAWNAND_DATA02 0x100a9
- MX6UL_PAD_NAND_DATA03__RAWNAND_DATA03 0x100a9
- MX6UL_PAD_NAND_DATA04__RAWNAND_DATA04 0x100a9
- MX6UL_PAD_NAND_DATA05__RAWNAND_DATA05 0x100a9
- MX6UL_PAD_NAND_DATA06__RAWNAND_DATA06 0x100a9
- MX6UL_PAD_NAND_DATA07__RAWNAND_DATA07 0x100a9
- MX6UL_PAD_NAND_CLE__RAWNAND_CLE 0x100a9
- MX6UL_PAD_NAND_ALE__RAWNAND_ALE 0x100a9
- MX6UL_PAD_NAND_RE_B__RAWNAND_RE_B 0x100a9
- MX6UL_PAD_NAND_WE_B__RAWNAND_WE_B 0x100a9
- MX6UL_PAD_NAND_CE0_B__RAWNAND_CE0_B 0x100a9
- MX6UL_PAD_NAND_READY_B__RAWNAND_READY_B 0x100a9
- >;
- };
-
- pinctrl_i2c1: i2c1grp {
- fsl,pins = <
- MX6UL_PAD_UART4_TX_DATA__I2C1_SCL 0x4001b8b0 /* SODIMM 196 */
- MX6UL_PAD_UART4_RX_DATA__I2C1_SDA 0x4001b8b0 /* SODIMM 194 */
- >;
- };
-
- pinctrl_i2c1_gpio: i2c1-gpiogrp {
- fsl,pins = <
- MX6UL_PAD_UART4_TX_DATA__GPIO1_IO28 0x4001b8b0 /* SODIMM 196 */
- MX6UL_PAD_UART4_RX_DATA__GPIO1_IO29 0x4001b8b0 /* SODIMM 194 */
- >;
- };
-
- pinctrl_i2c2: i2c2grp {
- fsl,pins = <
- MX6UL_PAD_UART5_TX_DATA__I2C2_SCL 0x4001f8b0
- MX6UL_PAD_UART5_RX_DATA__I2C2_SDA 0x4001f8b0
- >;
- };
-
- pinctrl_i2c2_gpio: i2c2-gpiogrp {
- fsl,pins = <
- MX6UL_PAD_UART5_TX_DATA__GPIO1_IO30 0x4001f8b0
- MX6UL_PAD_UART5_RX_DATA__GPIO1_IO31 0x4001f8b0
- >;
- };
-
- pinctrl_lcdif_dat: lcdifdatgrp {
- fsl,pins = <
- MX6UL_PAD_LCD_DATA00__LCDIF_DATA00 0x00079 /* SODIMM 76 */
- MX6UL_PAD_LCD_DATA01__LCDIF_DATA01 0x00079 /* SODIMM 70 */
- MX6UL_PAD_LCD_DATA02__LCDIF_DATA02 0x00079 /* SODIMM 60 */
- MX6UL_PAD_LCD_DATA03__LCDIF_DATA03 0x00079 /* SODIMM 58 */
- MX6UL_PAD_LCD_DATA04__LCDIF_DATA04 0x00079 /* SODIMM 78 */
- MX6UL_PAD_LCD_DATA05__LCDIF_DATA05 0x00079 /* SODIMM 72 */
- MX6UL_PAD_LCD_DATA06__LCDIF_DATA06 0x00079 /* SODIMM 80 */
- MX6UL_PAD_LCD_DATA07__LCDIF_DATA07 0x00079 /* SODIMM 46 */
- MX6UL_PAD_LCD_DATA08__LCDIF_DATA08 0x00079 /* SODIMM 62 */
- MX6UL_PAD_LCD_DATA09__LCDIF_DATA09 0x00079 /* SODIMM 48 */
- MX6UL_PAD_LCD_DATA10__LCDIF_DATA10 0x00079 /* SODIMM 74 */
- MX6UL_PAD_LCD_DATA11__LCDIF_DATA11 0x00079 /* SODIMM 50 */
- MX6UL_PAD_LCD_DATA12__LCDIF_DATA12 0x00079 /* SODIMM 52 */
- MX6UL_PAD_LCD_DATA13__LCDIF_DATA13 0x00079 /* SODIMM 54 */
- MX6UL_PAD_LCD_DATA14__LCDIF_DATA14 0x00079 /* SODIMM 66 */
- MX6UL_PAD_LCD_DATA15__LCDIF_DATA15 0x00079 /* SODIMM 64 */
- MX6UL_PAD_LCD_DATA16__LCDIF_DATA16 0x00079 /* SODIMM 57 */
- MX6UL_PAD_LCD_DATA17__LCDIF_DATA17 0x00079 /* SODIMM 61 */
- >;
- };
-
- pinctrl_lcdif_ctrl: lcdifctrlgrp {
- fsl,pins = <
- MX6UL_PAD_LCD_CLK__LCDIF_CLK 0x00079 /* SODIMM 56 */
- MX6UL_PAD_LCD_ENABLE__LCDIF_ENABLE 0x00079 /* SODIMM 44 */
- MX6UL_PAD_LCD_HSYNC__LCDIF_HSYNC 0x00079 /* SODIMM 68 */
- MX6UL_PAD_LCD_VSYNC__LCDIF_VSYNC 0x00079 /* SODIMM 82 */
- >;
- };
-
- pinctrl_pwm4: pwm4grp {
- fsl,pins = <
- MX6UL_PAD_NAND_WP_B__PWM4_OUT 0x00079 /* SODIMM 59 */
- >;
- };
-
- pinctrl_pwm5: pwm5grp {
- fsl,pins = <
- MX6UL_PAD_NAND_DQS__PWM5_OUT 0x00079 /* SODIMM 28 */
- >;
- };
-
- pinctrl_pwm6: pwm6grp {
- fsl,pins = <
- MX6UL_PAD_ENET1_TX_EN__PWM6_OUT 0x00079 /* SODIMM 30 */
- >;
- };
-
- pinctrl_pwm7: pwm7grp {
- fsl,pins = <
- MX6UL_PAD_ENET1_TX_CLK__PWM7_OUT 0x00079 /* SODIMM 67 */
- >;
- };
-
- pinctrl_uart1: uart1grp {
- fsl,pins = <
- MX6UL_PAD_UART1_TX_DATA__UART1_DTE_RX 0x1b0b1 /* SODIMM 33 */
- MX6UL_PAD_UART1_RX_DATA__UART1_DTE_TX 0x1b0b1 /* SODIMM 35 */
- MX6UL_PAD_UART1_RTS_B__UART1_DTE_CTS 0x1b0b1 /* SODIMM 27 */
- MX6UL_PAD_UART1_CTS_B__UART1_DTE_RTS 0x1b0b1 /* SODIMM 25 */
- >;
- };
-
- pinctrl_uart1_ctrl1: uart1ctrl1grp { /* Additional DTR, DCD */
- fsl,pins = <
- MX6UL_PAD_JTAG_TDI__GPIO1_IO13 0x70a0 /* SODIMM 31 / DCD */
- MX6UL_PAD_LCD_DATA18__GPIO3_IO23 0x10b0 /* SODIMM 29 / DSR */
- MX6UL_PAD_JTAG_TDO__GPIO1_IO12 0x90b1 /* SODIMM 23 / DTR */
- MX6UL_PAD_LCD_DATA19__GPIO3_IO24 0x10b0 /* SODIMM 37 / RI */
- >;
- };
-
- pinctrl_uart2: uart2grp {
- fsl,pins = <
- MX6UL_PAD_UART2_TX_DATA__UART2_DTE_RX 0x1b0b1 /* SODIMM 36 */
- MX6UL_PAD_UART2_RX_DATA__UART2_DTE_TX 0x1b0b1 /* SODIMM 38 */
- MX6UL_PAD_UART2_CTS_B__UART2_DTE_RTS 0x1b0b1 /* SODIMM 32 */
- MX6UL_PAD_UART2_RTS_B__UART2_DTE_CTS 0x1b0b1 /* SODIMM 34 */
- >;
- };
- pinctrl_uart5: uart5grp {
- fsl,pins = <
- MX6UL_PAD_GPIO1_IO04__UART5_DTE_RX 0x1b0b1 /* SODIMM 19 */
- MX6UL_PAD_GPIO1_IO05__UART5_DTE_TX 0x1b0b1 /* SODIMM 21 */
- >;
- };
-
- pinctrl_usbh_reg: usbhreggrp {
- fsl,pins = <
- MX6UL_PAD_GPIO1_IO02__GPIO1_IO02 0x10b0 /* SODIMM 129 / USBH_PEN */
- >;
- };
-
- pinctrl_usdhc1: usdhc1grp {
- fsl,pins = <
- MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x10059 /* SODIMM 47 */
- MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x17059 /* SODIMM 190 */
- MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x17059 /* SODIMM 192 */
- MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x17059 /* SODIMM 49 */
- MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x17059 /* SODIMM 51 */
- MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x17059 /* SODIMM 53 */
- >;
- };
-
- pinctrl_usdhc1_100mhz: usdhc1-100mhzgrp {
- fsl,pins = <
- MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x100b9
- MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x170b9
- MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x170b9
- MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x170b9
- MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x170b9
- MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x170b9
- >;
- };
-
- pinctrl_usdhc1_200mhz: usdhc1-200mhzgrp {
- fsl,pins = <
- MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x100f9
- MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x170f9
- MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x170f9
- MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x170f9
- MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x170f9
- MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x170f9
- >;
- };
-
- pinctrl_usdhc2: usdhc2grp {
- fsl,pins = <
- MX6UL_PAD_CSI_DATA00__USDHC2_DATA0 0x17069
- MX6UL_PAD_CSI_DATA01__USDHC2_DATA1 0x17069
- MX6UL_PAD_CSI_DATA02__USDHC2_DATA2 0x17069
- MX6UL_PAD_CSI_DATA03__USDHC2_DATA3 0x17069
- MX6UL_PAD_CSI_HSYNC__USDHC2_CMD 0x17069
- MX6UL_PAD_CSI_VSYNC__USDHC2_CLK 0x10069
-
- MX6UL_PAD_GPIO1_IO03__OSC32K_32K_OUT 0x10
- >;
- };
-
- pinctrl_usdhc2emmc: usdhc2emmcgrp {
- fsl,pins = <
- MX6UL_PAD_NAND_RE_B__USDHC2_CLK 0x17059
- MX6UL_PAD_NAND_WE_B__USDHC2_CMD 0x17059
- MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x17059
- MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x17059
- MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x17059
- MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x17059
- MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x17059
- MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x17059
- MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x17059
- MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x17059
- >;
- };
-
- pinctrl_wdog: wdoggrp {
- fsl,pins = <
- MX6UL_PAD_LCD_RESET__WDOG1_WDOG_ANY 0x30b0
- >;
- };
-};
-
-&iomuxc_snvs {
- pinctrl_atmel_snvs_conn: atmelsnvsconngrp {
- fsl,pins = <
- MX6ULL_PAD_SNVS_TAMPER4__GPIO5_IO04 0xb0a0 /* SODIMM 107 */
- >;
- };
-
- pinctrl_snvs_gpio1: snvsgpio1grp {
- fsl,pins = <
- MX6ULL_PAD_SNVS_TAMPER6__GPIO5_IO06 0x110a0 /* SODIMM 93 */
- MX6ULL_PAD_SNVS_TAMPER3__GPIO5_IO03 0x110a0 /* SODIMM 95 */
- MX6ULL_PAD_BOOT_MODE0__GPIO5_IO10 0x1b0a0 /* SODIMM 105 */
- MX6ULL_PAD_SNVS_TAMPER5__GPIO5_IO05 0x0b0a0 /* SODIMM 131 / USBH_OC */
- MX6ULL_PAD_SNVS_TAMPER8__GPIO5_IO08 0x110a0 /* SODIMM 138 */
- >;
- };
-
- pinctrl_snvs_gpio3: snvsgpio3grp { /* Wifi pins */
- fsl,pins = <
- MX6ULL_PAD_BOOT_MODE1__GPIO5_IO11 0x130a0 /* SODIMM 127 */
- >;
- };
-
- pinctrl_snvs_ad7879_int: snvsad7879intgrp { /* TOUCH Interrupt */
- fsl,pins = <
- MX6ULL_PAD_SNVS_TAMPER7__GPIO5_IO07 0x100b0
- >;
- };
-
- pinctrl_snvs_reg_sd: snvsregsdgrp {
- fsl,pins = <
- MX6ULL_PAD_SNVS_TAMPER9__GPIO5_IO09 0x400100b0
- >;
- };
-
- pinctrl_snvs_usbc_det: snvsusbcdetgrp {
- fsl,pins = <
- MX6ULL_PAD_SNVS_TAMPER2__GPIO5_IO02 0x130b0
- >;
- };
-
- pinctrl_snvs_gpiokeys: snvsgpiokeysgrp {
- fsl,pins = <
- MX6ULL_PAD_SNVS_TAMPER1__GPIO5_IO01 0x130a0 /* SODIMM 45 / WAKE_UP */
- >;
- };
-
- pinctrl_snvs_usdhc1_cd: snvsusdhc1cdgrp {
- fsl,pins = <
- MX6ULL_PAD_SNVS_TAMPER0__GPIO5_IO00 0x1b0a0 /* SODIMM 43 / MMC_CD */
- >;
- };
-
- pinctrl_snvs_usdhc1_cd_sleep: snvsusdhc1cd-sleepgrp {
- fsl,pins = <
- MX6ULL_PAD_SNVS_TAMPER0__GPIO5_IO00 0x0
- >;
- };
-
- pinctrl_snvs_wifi_pdn: snvswifipdngrp {
- fsl,pins = <
- MX6ULL_PAD_BOOT_MODE1__GPIO5_IO11 0x130a0
- >;
- };
-};
diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig
index 6140d9f319b..081c941fe45 100644
--- a/arch/arm/mach-imx/mx6/Kconfig
+++ b/arch/arm/mach-imx/mx6/Kconfig
@@ -170,6 +170,7 @@ config TARGET_COLIBRI_IMX6ULL
select DM
select DM_THERMAL
select IOMUX_LPSR
+ imply OF_UPSTREAM
config TARGET_DART_6UL
bool "Variscite imx6ULL dart(DART-SOM-6ULL)"
diff --git a/board/toradex/colibri-imx6ull/MAINTAINERS b/board/toradex/colibri-imx6ull/MAINTAINERS
index 1ceb1c8eb1b..5afcabdced1 100644
--- a/board/toradex/colibri-imx6ull/MAINTAINERS
+++ b/board/toradex/colibri-imx6ull/MAINTAINERS
@@ -3,12 +3,8 @@ M: Francesco Dolcini <francesco.dolcini@toradex.com>
W: http://developer.toradex.com/software/linux/linux-software
W: https://www.toradex.com/community
S: Maintained
-F: arch/arm/dts/imx6ull-colibri.dtsi
-F: arch/arm/dts/imx6ull-colibri-emmc-eval-v3.dts
-F: arch/arm/dts/imx6ull-colibri-emmc-nonwifi.dtsi
-F: arch/arm/dts/imx6ull-colibri-eval-v3.dts
-F: arch/arm/dts/imx6ull-colibri-eval-v3.dtsi
-F: arch/arm/dts/imx6ull-colibri-nonwifi.dtsi
+F: arch/arm/dts/imx6ull-colibri-emmc-eval-v3-u-boot.dtsi
+F: arch/arm/dts/imx6ull-colibri-eval-v3-u-boot.dtsi
F: board/toradex/colibri-imx6ull/
F: board/toradex/common/
F: configs/colibri-imx6ull_defconfig
diff --git a/configs/colibri-imx6ull-emmc_defconfig b/configs/colibri-imx6ull-emmc_defconfig
index e48ce16b467..c56e9a90bc1 100644
--- a/configs/colibri-imx6ull-emmc_defconfig
+++ b/configs/colibri-imx6ull-emmc_defconfig
@@ -8,7 +8,7 @@ CONFIG_MX6ULL=y
CONFIG_TARGET_COLIBRI_IMX6ULL=y
CONFIG_DM_GPIO=y
CONFIG_TARGET_COLIBRI_IMX6ULL_EMMC=y
-CONFIG_DEFAULT_DEVICE_TREE="imx6ull-colibri-emmc-eval-v3"
+CONFIG_DEFAULT_DEVICE_TREE="nxp/imx/imx6ull-colibri-emmc-eval-v3"
CONFIG_OF_LIBFDT_OVERLAY=y
CONFIG_SYS_LOAD_ADDR=0x84200000
CONFIG_SYS_MEMTEST_START=0x80000000
diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig
index d18965f5508..d65e5c16957 100644
--- a/configs/colibri-imx6ull_defconfig
+++ b/configs/colibri-imx6ull_defconfig
@@ -9,7 +9,7 @@ CONFIG_MX6ULL=y
CONFIG_TARGET_COLIBRI_IMX6ULL=y
CONFIG_DM_GPIO=y
CONFIG_TARGET_COLIBRI_IMX6ULL_NAND=y
-CONFIG_DEFAULT_DEVICE_TREE="imx6ull-colibri-eval-v3"
+CONFIG_DEFAULT_DEVICE_TREE="nxp/imx/imx6ull-colibri-eval-v3"
CONFIG_OF_LIBFDT_OVERLAY=y
CONFIG_SYS_LOAD_ADDR=0x84200000
CONFIG_SYS_MEMTEST_START=0x80000000
--
2.56.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v1 7/7] board: toradex: colibri-imx6ull: enable the clock framework
2026-11-20 11:10 [PATCH v1 0/7] colibri-imx6ull: fix the Ethernet PHY detection Stefan Eichenberger
` (5 preceding siblings ...)
2026-11-20 11:10 ` [PATCH v1 6/7] arm: dts: imx6ull-colibri: migrate to OF_UPSTREAM Stefan Eichenberger
@ 2026-11-20 11:10 ` Stefan Eichenberger
6 siblings, 0 replies; 8+ messages in thread
From: Stefan Eichenberger @ 2026-11-20 11:10 UTC (permalink / raw)
To: trini, ilias.apalodimas, peng.fan, jh80.chung, tanmay.kathpalia,
sbabic, festevam, uboot-imx, francesco.dolcini, lukma, dlechner,
msp, stefan.eichenberger, Max.Merchel, nora.schiffer,
primoz.fiser, jbx6244, aford173, cniedermaier
Cc: u-boot
From: Francesco Dolcini <francesco.dolcini@toradex.com>
The PHY supply is a regulator-fixed-clock, and since commit a5d990854f2c
("regulator: fixed: fix regulator-fixed-clock") gave that driver a probe
hook calling devm_clk_get() it cannot probe without CONFIG_CLK, so its
150ms startup delay is skipped and the first FEC probe finds no PHY.
Enable the clock framework, which also makes the hand-rolled FEC clock
setup redundant. The ENET2 reference clock selector (gpr1[14]) is now
the IMX6UL_CLK_ENET2_REF_SEL clock, its parent set through
assigned-clock-parents. Only the ENET2_TX_CLK direction (gpr1[18]),
which no clock models, stays in board code.
Drop setup_gpmi_nand() as well. The regulator probe now probes the CCM
in initr_dm, before board_init(), and the CCM driver sets ENFC_SEL to
pll2_pfd2. setup_gpmi_io_clk() then writes MXC_CCM_CS2CDR_ENFC_CLK_SEL(3),
which on i.MX6ULL only covers bits 17:16 of the 3-bit field, leaving
ENFC_SEL at the reserved value 7 behind the back of the clock framework.
The GPMI loses its clock and every NAND command times out. With the
clock framework the CCM driver selects the ENFC parent and the mxs_nand
driver enables the GPMI clocks and sets their rate.
The serial driver probes the CCM before relocation, and the ~80 clocks it
registers need around 13 KiB from the pre-relocation malloc pool, more
than the 8 KiB default. Raise SYS_MALLOC_F_LEN to 32 KiB.
With the clock framework the usdhc, i2c and gpmi drivers take their
rates from the CCM driver instead of mxc_get_clock(), and the usdhc
assigned-clocks in the device tree are now applied.
Tested-by: Stefan Eichenberger <stefan.eichenberger@toradex.com>
Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Signed-off-by: Stefan Eichenberger <stefan.eichenberger@toradex.com>
---
.../dts/imx6ull-colibri-eval-v3-u-boot.dtsi | 6 ++++
.../toradex/colibri-imx6ull/colibri-imx6ull.c | 34 +++----------------
configs/colibri-imx6ull-emmc_defconfig | 2 ++
configs/colibri-imx6ull_defconfig | 2 ++
4 files changed, 15 insertions(+), 29 deletions(-)
diff --git a/arch/arm/dts/imx6ull-colibri-eval-v3-u-boot.dtsi b/arch/arm/dts/imx6ull-colibri-eval-v3-u-boot.dtsi
index 8494b1a2c60..1712f38edbf 100644
--- a/arch/arm/dts/imx6ull-colibri-eval-v3-u-boot.dtsi
+++ b/arch/arm/dts/imx6ull-colibri-eval-v3-u-boot.dtsi
@@ -29,6 +29,12 @@
bootph-all;
};
+/* RMII reference clock from the internal ENET PLL, not from the pad */
+&fec2 {
+ assigned-clocks = <&clks IMX6UL_CLK_ENET2_REF_SEL>;
+ assigned-clock-parents = <&clks IMX6UL_CLK_ENET2_REF_125M>;
+};
+
&lcdif {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_lcdif_dat
diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
index 01387e87294..ea83d53c27b 100644
--- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c
+++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
@@ -7,10 +7,7 @@
#include <asm/global_data.h>
#include <linux/delay.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/crm_regs.h>
#include <asm/arch/imx-regs.h>
-#include <asm/arch-mx6/clock.h>
#include <asm/arch-mx6/imx-regs.h>
#include <asm/arch-mx6/mx6ull_pins.h>
#include <asm/arch/sys_proto.h>
@@ -57,15 +54,6 @@ int dram_init(void)
return 0;
}
-#ifdef CONFIG_NAND_MXS
-static void setup_gpmi_nand(void)
-{
- setup_gpmi_io_clk((MXC_CCM_CS2CDR_ENFC_CLK_PODF(0) |
- MXC_CCM_CS2CDR_ENFC_CLK_PRED(3) |
- MXC_CCM_CS2CDR_ENFC_CLK_SEL(3)));
-}
-#endif /* CONFIG_NAND_MXS */
-
#ifdef CONFIG_VIDEO
static const iomux_v3_cfg_t backlight_pads[] = {
/* Backlight On */
@@ -94,25 +82,16 @@ static int setup_lcd(void)
#endif
#ifdef CONFIG_FEC_MXC
-static int setup_fec(void)
+static void setup_fec(void)
{
struct iomuxc *iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR;
- int ret;
/*
- * Use 50MHz anatop loopback REF_CLK2 for ENET2,
- * clear gpr1[14], set gpr1[18].
+ * Drive the ENET2 reference clock out to the PHY: ENET2_TX_CLK_DIR
+ * (gpr1[18]) output. The ENET2_CLK_SEL (gpr1[14]) half is the
+ * IMX6UL_CLK_ENET2_REF_SEL clock, set up from the device tree.
*/
- clrsetbits_le32(&iomuxc_regs->gpr[1], IOMUX_GPR1_FEC2_MASK,
- IOMUX_GPR1_FEC2_CLOCK_MUX1_SEL_MASK);
-
- ret = enable_fec_anatop_clock(1, ENET_50MHZ);
- if (ret)
- return ret;
-
- enable_enet_clk(1);
-
- return 0;
+ setbits_le32(&iomuxc_regs->gpr[1], IOMUX_GPR1_FEC2_CLOCK_MUX1_SEL_MASK);
}
#endif /* CONFIG_FEC_MXC */
@@ -135,9 +114,6 @@ int board_init(void)
setup_fec();
#endif
-#ifdef CONFIG_NAND_MXS
- setup_gpmi_nand();
-#endif
return 0;
}
diff --git a/configs/colibri-imx6ull-emmc_defconfig b/configs/colibri-imx6ull-emmc_defconfig
index c56e9a90bc1..82f1d9e8b83 100644
--- a/configs/colibri-imx6ull-emmc_defconfig
+++ b/configs/colibri-imx6ull-emmc_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_MX6=y
CONFIG_TEXT_BASE=0x87800000
+CONFIG_SYS_MALLOC_F_LEN=0x8000
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0xFFFFDE00
@@ -64,6 +65,7 @@ CONFIG_TFTP_BLOCKSIZE=16352
CONFIG_BOUNCE_BUFFER=y
CONFIG_BOOTCOUNT_LIMIT=y
CONFIG_BOOTCOUNT_ENV=y
+CONFIG_CLK_IMX6UL=y
CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x81100000
CONFIG_FASTBOOT_UUU_SUPPORT=y
diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig
index d65e5c16957..55990719f28 100644
--- a/configs/colibri-imx6ull_defconfig
+++ b/configs/colibri-imx6ull_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_ARCH_MX6=y
CONFIG_TEXT_BASE=0x87800000
CONFIG_SYS_MALLOC_LEN=0x2000000
+CONFIG_SYS_MALLOC_F_LEN=0x8000
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x20000
CONFIG_ENV_OFFSET=0x380000
@@ -74,6 +75,7 @@ CONFIG_TFTP_BLOCKSIZE=16352
CONFIG_BOUNCE_BUFFER=y
CONFIG_BOOTCOUNT_LIMIT=y
CONFIG_BOOTCOUNT_ENV=y
+CONFIG_CLK_IMX6UL=y
CONFIG_DFU_NAND=y
CONFIG_SYS_DFU_DATA_BUF_SIZE=0x1000000
CONFIG_USB_FUNCTION_FASTBOOT=y
--
2.56.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2026-11-20 13:21 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-20 11:10 [PATCH v1 0/7] colibri-imx6ull: fix the Ethernet PHY detection Stefan Eichenberger
2026-11-20 11:10 ` [PATCH v1 1/7] clk: imx: imx6ul: fix the enet clock gate register Stefan Eichenberger
2026-11-20 11:10 ` [PATCH v1 2/7] clk: imx: pllv3: wait for the ENET PLL to lock Stefan Eichenberger
2026-11-20 11:10 ` [PATCH v1 3/7] clk: imx: pllv3: do not touch the ENET output gate Stefan Eichenberger
2026-11-20 11:10 ` [PATCH v1 4/7] clk: imx: imx6ul: add the enet clock tree Stefan Eichenberger
2026-11-20 11:10 ` [PATCH v1 5/7] board: toradex: colibri-imx6ull: drop the static serial device Stefan Eichenberger
2026-11-20 11:10 ` [PATCH v1 6/7] arm: dts: imx6ull-colibri: migrate to OF_UPSTREAM Stefan Eichenberger
2026-11-20 11:10 ` [PATCH v1 7/7] board: toradex: colibri-imx6ull: enable the clock framework Stefan Eichenberger
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.