* [PATCH 2/4] ARM: imx8m: make debug UART selection available on i.MX8MM
2020-07-24 11:12 [PATCH 1/4] ARM: imx8mm: select FIRMWARE_IMX_LPDDR4_PMU_TRAIN from IMX8MM_EVK Lucas Stach
@ 2020-07-24 11:12 ` Lucas Stach
2020-08-03 19:36 ` Sascha Hauer
2020-07-24 11:12 ` [PATCH 3/4] ARM: nxp-imx8mm-evk: always set up UART Lucas Stach
2020-07-24 11:12 ` [PATCH 4/4] nvmem: ocotp: add support for i.MX8MM Lucas Stach
2 siblings, 1 reply; 5+ messages in thread
From: Lucas Stach @ 2020-07-24 11:12 UTC (permalink / raw)
To: barebox
i.MX8MM/MN has UARTs in the same place in the MMIO address space as
the i.MX8MQ, so make the lowlevel debug a bit more generic across the
i.MX8M family.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
arch/arm/mach-imx/include/mach/debug_ll.h | 6 +++---
common/Kconfig | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-imx/include/mach/debug_ll.h b/arch/arm/mach-imx/include/mach/debug_ll.h
index 5eed01631c9d..1593dd018e13 100644
--- a/arch/arm/mach-imx/include/mach/debug_ll.h
+++ b/arch/arm/mach-imx/include/mach/debug_ll.h
@@ -15,7 +15,7 @@
#include <mach/imx53-regs.h>
#include <mach/imx6-regs.h>
#include <mach/imx7-regs.h>
-#include <mach/imx8mq-regs.h>
+#include <mach/imx8m-regs.h>
#include <mach/vf610-regs.h>
#include <serial/imx-uart.h>
@@ -48,8 +48,8 @@
#define IMX_DEBUG_SOC MX6
#elif defined CONFIG_DEBUG_IMX7D_UART
#define IMX_DEBUG_SOC MX7
-#elif defined CONFIG_DEBUG_IMX8MQ_UART
-#define IMX_DEBUG_SOC MX8MQ
+#elif defined CONFIG_DEBUG_IMX8M_UART
+#define IMX_DEBUG_SOC MX8M
#elif defined CONFIG_DEBUG_VF610_UART
#define IMX_DEBUG_SOC VF610
#else
diff --git a/common/Kconfig b/common/Kconfig
index ac282d8955eb..3dff47d4c1f6 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -1188,12 +1188,12 @@ config DEBUG_IMX7D_UART
Say Y here if you want barebox low-level debugging support
on i.MX7D.
-config DEBUG_IMX8MQ_UART
- bool "i.MX8MQ Debug UART"
- depends on ARCH_IMX8MQ
+config DEBUG_IMX8M_UART
+ bool "i.MX8M Debug UART"
+ depends on ARCH_IMX8M
help
Say Y here if you want barebox low-level debugging support
- on i.MX8MQ.
+ on i.MX8M*.
config DEBUG_VF610_UART
bool "VF610 Debug UART"
@@ -1285,7 +1285,7 @@ config DEBUG_IMX_UART_PORT
DEBUG_IMX6Q_UART || \
DEBUG_IMX6SL_UART || \
DEBUG_IMX7D_UART || \
- DEBUG_IMX8MQ_UART || \
+ DEBUG_IMX8M_UART || \
DEBUG_VF610_UART
default 1
depends on ARCH_IMX
--
2.20.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 3/4] ARM: nxp-imx8mm-evk: always set up UART
2020-07-24 11:12 [PATCH 1/4] ARM: imx8mm: select FIRMWARE_IMX_LPDDR4_PMU_TRAIN from IMX8MM_EVK Lucas Stach
2020-07-24 11:12 ` [PATCH 2/4] ARM: imx8m: make debug UART selection available on i.MX8MM Lucas Stach
@ 2020-07-24 11:12 ` Lucas Stach
2020-07-24 11:12 ` [PATCH 4/4] nvmem: ocotp: add support for i.MX8MM Lucas Stach
2 siblings, 0 replies; 5+ messages in thread
From: Lucas Stach @ 2020-07-24 11:12 UTC (permalink / raw)
To: barebox
When the TF-A is configured to have some output on the UART it does not
set up the UART on its own, but just expects a pre-existing configuration.
If Barebox did not set up the UART in the !DEBUG_LL case, TF-A will just
hang without any user accessible debug output, which is a very non-obvious
failure, so better be safe and always set up the UART in case TF-A wants
to use it.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
arch/arm/boards/nxp-imx8mm-evk/lowlevel.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boards/nxp-imx8mm-evk/lowlevel.c b/arch/arm/boards/nxp-imx8mm-evk/lowlevel.c
index cd1f7d168bc6..082aefb8c1c5 100644
--- a/arch/arm/boards/nxp-imx8mm-evk/lowlevel.c
+++ b/arch/arm/boards/nxp-imx8mm-evk/lowlevel.c
@@ -32,9 +32,12 @@ static void setup_uart(void)
imx8mm_setup_pad(IMX8MM_PAD_UART2_TXD_UART2_TX | UART_PAD_CTRL);
- imx8m_uart_setup_ll();
+ imx8mq_uart_setup((void *)MX8M_UART2_BASE_ADDR);
- putc_ll('>');
+ if (IS_ENABLED(CONFIG_DEBUG_LL)) {
+ imx8m_uart_setup_ll();
+ putc_ll('>');
+ }
}
static void pmic_reg_write(void *i2c, int reg, uint8_t val)
@@ -157,8 +160,7 @@ static void start_atf(void)
*/
static __noreturn noinline void nxp_imx8mm_evk_start(void)
{
- if (IS_ENABLED(CONFIG_DEBUG_LL))
- setup_uart();
+ setup_uart();
start_atf();
--
2.20.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 4/4] nvmem: ocotp: add support for i.MX8MM
2020-07-24 11:12 [PATCH 1/4] ARM: imx8mm: select FIRMWARE_IMX_LPDDR4_PMU_TRAIN from IMX8MM_EVK Lucas Stach
2020-07-24 11:12 ` [PATCH 2/4] ARM: imx8m: make debug UART selection available on i.MX8MM Lucas Stach
2020-07-24 11:12 ` [PATCH 3/4] ARM: nxp-imx8mm-evk: always set up UART Lucas Stach
@ 2020-07-24 11:12 ` Lucas Stach
2 siblings, 0 replies; 5+ messages in thread
From: Lucas Stach @ 2020-07-24 11:12 UTC (permalink / raw)
To: barebox
For whatever reason the i.MX8MM OCOTP got a separate compatible and
is not marked as compatible to imx8mq, while the parameters used in the
driver seem to be the same.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
drivers/nvmem/Kconfig | 2 +-
drivers/nvmem/ocotp.c | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/nvmem/Kconfig b/drivers/nvmem/Kconfig
index 968342b281ad..55fc6f382d16 100644
--- a/drivers/nvmem/Kconfig
+++ b/drivers/nvmem/Kconfig
@@ -18,7 +18,7 @@ config NVMEM_SNVS_LPGPR
config IMX_OCOTP
tristate "i.MX6 On Chip OTP controller"
- depends on ARCH_IMX6 || ARCH_VF610 || ARCH_IMX8MQ
+ depends on ARCH_IMX6 || ARCH_VF610 || ARCH_IMX8M
depends on OFDEVICE
help
This adds support for the i.MX6 On-Chip OTP controller. Currently the
diff --git a/drivers/nvmem/ocotp.c b/drivers/nvmem/ocotp.c
index 34e33dee827f..a444f0c364de 100644
--- a/drivers/nvmem/ocotp.c
+++ b/drivers/nvmem/ocotp.c
@@ -755,6 +755,9 @@ static __maybe_unused struct of_device_id imx_ocotp_dt_ids[] = {
}, {
.compatible = "fsl,imx8mq-ocotp",
.data = &imx8mq_ocotp_data,
+ }, {
+ .compatible = "fsl,imx8mm-ocotp",
+ .data = &imx8mq_ocotp_data,
}, {
.compatible = "fsl,vf610-ocotp",
.data = &vf610_ocotp_data,
--
2.20.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread