* [U-Boot] [PATCH V2 1/4] imx: add module fuse support
@ 2019-07-23 7:19 Peng Fan
2019-07-23 7:19 ` [U-Boot] [PATCH V2 2/4] i2c: mxc: add fuse check Peng Fan
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Peng Fan @ 2019-07-23 7:19 UTC (permalink / raw)
To: u-boot
There are different parts from one SoC. Take i.MX6ULL for example,
some part might not have ENET, some might have; some might not have
USB, some might have. The information could be got from OCOTP,
to make one image support the different parts, we need runtime
disable linux kernel dts node and uboot driver probe if the
corresponding module not exists in the part.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
V2:
None
arch/arm/include/asm/mach-imx/module_fuse.h | 127 +++++++++++
arch/arm/include/asm/mach-imx/sys_proto.h | 1 +
arch/arm/mach-imx/Kconfig | 7 +
arch/arm/mach-imx/mx6/Makefile | 1 +
arch/arm/mach-imx/mx6/module_fuse.c | 322 ++++++++++++++++++++++++++++
5 files changed, 458 insertions(+)
create mode 100644 arch/arm/include/asm/mach-imx/module_fuse.h
create mode 100644 arch/arm/mach-imx/mx6/module_fuse.c
diff --git a/arch/arm/include/asm/mach-imx/module_fuse.h b/arch/arm/include/asm/mach-imx/module_fuse.h
new file mode 100644
index 0000000000..6b93f0402e
--- /dev/null
+++ b/arch/arm/include/asm/mach-imx/module_fuse.h
@@ -0,0 +1,127 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2019 NXP
+ */
+
+#ifndef __MODULE_FUSE_H__
+#define __MODULE_FUSE_H__
+
+enum fuse_module_type {
+ MODULE_TSC,
+ MODULE_ADC1,
+ MODULE_ADC2,
+ MODULE_SIM1,
+ MODULE_SIM2,
+ MODULE_FLEXCAN1,
+ MODULE_FLEXCAN2,
+ MODULE_SPDIF,
+ MODULE_EIM,
+ MODULE_SD1,
+ MODULE_SD2,
+ MODULE_SD3,
+ MODULE_SD4,
+ MODULE_QSPI1,
+ MODULE_QSPI2,
+ MODULE_GPMI,
+ MODULE_APBHDMA,
+ MODULE_LCDIF,
+ MODULE_PXP,
+ MODULE_CSI,
+ MODULE_ENET1,
+ MODULE_ENET2,
+ MODULE_CAAM,
+ MODULE_USB_OTG1,
+ MODULE_USB_OTG2,
+ MODULE_SAI2,
+ MODULE_SAI3,
+ MODULE_BEE,
+ MODULE_UART1,
+ MODULE_UART2,
+ MODULE_UART3,
+ MODULE_UART4,
+ MODULE_UART5,
+ MODULE_UART6,
+ MODULE_UART7,
+ MODULE_UART8,
+ MODULE_PWM5,
+ MODULE_PWM6,
+ MODULE_PWM7,
+ MODULE_PWM8,
+ MODULE_ECSPI1,
+ MODULE_ECSPI2,
+ MODULE_ECSPI3,
+ MODULE_ECSPI4,
+ MODULE_ECSPI5,
+ MODULE_I2C1,
+ MODULE_I2C2,
+ MODULE_I2C3,
+ MODULE_I2C4,
+ MODULE_GPT1,
+ MODULE_GPT2,
+ MODULE_EPIT1,
+ MODULE_EPIT2,
+ MODULE_EPDC,
+ MODULE_ESAI,
+ MODULE_DCP,
+ MODULE_DCP_CRYPTO,
+};
+
+struct fuse_entry_desc {
+ enum fuse_module_type module;
+ const char *node_path;
+ u32 fuse_word_offset;
+ u32 fuse_bit_offset;
+ u32 status;
+};
+
+#if !IS_ENABLED(CONFIG_IMX_MODULE_FUSE)
+static inline u32 check_module_fused(enum fuse_module_type module)
+{
+ return 0;
+};
+
+static inline u32 esdhc_fused(u32 base_addr)
+{
+ return 0;
+};
+
+static inline u32 ecspi_fused(u32 base_addr)
+{
+ return 0;
+};
+
+static inline u32 uart_fused(u32 base_addr)
+{
+ return 0;
+};
+
+static inline u32 usb_fused(u32 base_addr)
+{
+ return 0;
+};
+
+static inline u32 qspi_fused(u32 base_addr)
+{
+ return 0;
+};
+
+static inline u32 i2c_fused(u32 base_addr)
+{
+ return 0;
+};
+
+static inline u32 enet_fused(u32 base_addr)
+{
+ return 0;
+};
+#else
+u32 check_module_fused(enum fuse_module_type module);
+u32 esdhc_fused(u32 base_addr);
+u32 ecspi_fused(u32 base_addr);
+u32 uart_fused(u32 base_addr);
+u32 usb_fused(u32 base_addr);
+u32 qspi_fused(u32 base_addr);
+u32 i2c_fused(u32 base_addr);
+u32 enet_fused(u32 base_addr);
+#endif
+#endif /* __MODULE_FUSE_H__ */
diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h
index 4925dd7894..6ebe5b5479 100644
--- a/arch/arm/include/asm/mach-imx/sys_proto.h
+++ b/arch/arm/include/asm/mach-imx/sys_proto.h
@@ -9,6 +9,7 @@
#include <asm/io.h>
#include <asm/mach-imx/regs-common.h>
+#include <asm/mach-imx/module_fuse.h>
#include <common.h>
#include "../arch-imx/cpu.h"
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index aeb5493488..a5b6f51ef0 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -27,6 +27,13 @@ config IMX_BOOTAUX
help
bootaux [addr] to boot auxiliary core.
+config IMX_MODULE_FUSE
+ bool "i.MX Module Fuse"
+ depends on ARCH_MX6
+ help
+ i.MX module fuse to runtime disable some driver, including
+ Linux OS device node.
+
config USE_IMXIMG_PLUGIN
bool "Use imximage plugin code"
depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX7ULP
diff --git a/arch/arm/mach-imx/mx6/Makefile b/arch/arm/mach-imx/mx6/Makefile
index 81e2913d14..7ea8f91e4f 100644
--- a/arch/arm/mach-imx/mx6/Makefile
+++ b/arch/arm/mach-imx/mx6/Makefile
@@ -6,6 +6,7 @@
# (C) Copyright 2011 Freescale Semiconductor, Inc.
obj-y := soc.o clock.o
+obj-$(CONFIG_IMX_MODULE_FUSE) += module_fuse.o
obj-$(CONFIG_SPL_BUILD) += ddr.o
obj-$(CONFIG_MP) += mp.o
obj-$(CONFIG_MX6UL_LITESOM) += litesom.o
diff --git a/arch/arm/mach-imx/mx6/module_fuse.c b/arch/arm/mach-imx/mx6/module_fuse.c
new file mode 100644
index 0000000000..417264b15c
--- /dev/null
+++ b/arch/arm/mach-imx/mx6/module_fuse.c
@@ -0,0 +1,322 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2019 NXP
+ */
+
+#include <common.h>
+#include <fdt_support.h>
+#include <asm/io.h>
+#include <asm/arch/sys_proto.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/mach-imx/module_fuse.h>
+#include <linux/errno.h>
+
+static struct fuse_entry_desc mx6_fuse_descs[] = {
+#if defined(CONFIG_MX6ULL)
+ {MODULE_TSC, "/soc/aips-bus at 2000000/tsc at 2040000", 0x430, 22},
+ {MODULE_ADC2, "/soc/aips-bus at 2100000/adc at 219c000", 0x430, 23},
+ {MODULE_EPDC, "/soc/aips-bus at 2200000/epdc at 228c000", 0x430, 24},
+ {MODULE_ESAI, "/soc/aips-bus at 2000000/spba-bus at 2000000/esai at 2024000", 0x430, 25},
+ {MODULE_FLEXCAN1, "/soc/aips-bus at 2000000/can at 2090000", 0x430, 26},
+ {MODULE_FLEXCAN2, "/soc/aips-bus at 2000000/can at 2094000", 0x430, 27},
+ {MODULE_SPDIF, "/soc/aips-bus at 2000000/spba-bus at 2000000/spdif at 2004000", 0x440, 2},
+ {MODULE_EIM, "/soc/aips-bus at 2100000/weim at 21b8000", 0x440, 3},
+ {MODULE_SD1, "/soc/aips-bus at 2100000/usdhc at 2190000", 0x440, 4},
+ {MODULE_SD2, "/soc/aips-bus at 2100000/usdhc at 2194000", 0x440, 5},
+ {MODULE_QSPI1, "/soc/aips-bus at 2100000/qspi at 21e0000", 0x440, 6},
+ {MODULE_GPMI, "/soc/gpmi-nand at 1806000", 0x440, 7},
+ {MODULE_APBHDMA, "/soc/dma-apbh at 1804000", 0x440, 7},
+ {MODULE_LCDIF, "/soc/aips-bus at 2100000/lcdif at 21c8000", 0x440, 8},
+ {MODULE_PXP, "/soc/aips-bus at 2100000/pxp at 21cc000", 0x440, 9},
+ {MODULE_CSI, "/soc/aips-bus at 2100000/csi at 21c4000", 0x440, 10},
+ {MODULE_ADC1, "/soc/aips-bus at 2100000/adc at 2198000", 0x440, 11},
+ {MODULE_ENET1, "/soc/aips-bus at 2100000/ethernet at 2188000", 0x440, 12},
+ {MODULE_ENET2, "/soc/aips-bus at 2000000/ethernet at 20b4000", 0x440, 13},
+ {MODULE_DCP, "/soc/aips-bus at 2200000/dcp at 2280000", 0x440, 14},
+ {MODULE_USB_OTG2, "/soc/aips-bus at 2100000/usb at 2184200", 0x440, 15},
+ {MODULE_SAI2, "/soc/aips-bus at 2000000/spba-bus at 2000000/sai at 202c000", 0x440, 24},
+ {MODULE_SAI3, "/soc/aips-bus at 2000000/spba-bus at 2000000/sai at 2030000", 0x440, 24},
+ {MODULE_DCP_CRYPTO, "/soc/aips-bus at 2200000/dcp at 2280000", 0x440, 25},
+ {MODULE_UART5, "/soc/aips-bus at 2100000/serial at 21f4000", 0x440, 26},
+ {MODULE_UART6, "/soc/aips-bus at 2100000/serial at 21fc000", 0x440, 26},
+ {MODULE_UART7, "/soc/aips-bus at 2000000/spba-bus at 2000000/serial at 2018000", 0x440, 26},
+ {MODULE_UART8, "/soc/aips-bus at 2200000/serial at 2288000", 0x440, 26},
+ {MODULE_PWM5, "/soc/aips-bus at 2000000/pwm at 20f0000", 0x440, 27},
+ {MODULE_PWM6, "/soc/aips-bus at 2000000/pwm at 20f4000", 0x440, 27},
+ {MODULE_PWM7, "/soc/aips-bus at 2000000/pwm at 20f8000", 0x440, 27},
+ {MODULE_PWM8, "/soc/aips-bus at 2000000/pwm at 20fc000", 0x440, 27},
+ {MODULE_ECSPI3, "/soc/aips-bus at 2000000/spba-bus at 2000000/ecspi at 2010000", 0x440, 28},
+ {MODULE_ECSPI4, "/soc/aips-bus at 2000000/spba-bus at 2000000/ecspi at 2014000", 0x440, 28},
+ {MODULE_I2C3, "/soc/aips-bus at 2100000/i2c at 21a8000", 0x440, 29},
+ {MODULE_I2C4, "/soc/aips-bus at 2100000/i2c at 21f8000", 0x440, 29},
+ {MODULE_GPT2, "/soc/aips-bus at 2000000/gpt at 20e8000", 0x440, 30},
+ {MODULE_EPIT2, "/soc/aips-bus at 2000000/epit at 20d4000", 0x440, 31},
+ /* Paths for older imx tree: */
+ {MODULE_TSC, "/soc/aips-bus at 02000000/tsc at 02040000", 0x430, 22},
+ {MODULE_ADC2, "/soc/aips-bus at 02100000/adc at 0219c000", 0x430, 23},
+ {MODULE_EPDC, "/soc/aips-bus at 02200000/epdc at 0228c000", 0x430, 24},
+ {MODULE_ESAI, "/soc/aips-bus at 02000000/spba-bus at 02000000/esai at 02024000", 0x430, 25},
+ {MODULE_FLEXCAN1, "/soc/aips-bus at 02000000/can at 02090000", 0x430, 26},
+ {MODULE_FLEXCAN2, "/soc/aips-bus at 02000000/can at 02094000", 0x430, 27},
+ {MODULE_SPDIF, "/soc/aips-bus at 02000000/spba-bus at 02000000/spdif at 02004000", 0x440, 2},
+ {MODULE_EIM, "/soc/aips-bus at 02100000/weim at 021b8000", 0x440, 3},
+ {MODULE_SD1, "/soc/aips-bus at 02100000/usdhc at 02190000", 0x440, 4},
+ {MODULE_SD2, "/soc/aips-bus at 02100000/usdhc at 02194000", 0x440, 5},
+ {MODULE_QSPI1, "/soc/aips-bus at 02100000/qspi at 021e0000", 0x440, 6},
+ {MODULE_GPMI, "/soc/gpmi-nand at 01806000", 0x440, 7},
+ {MODULE_APBHDMA, "/soc/dma-apbh at 01804000", 0x440, 7},
+ {MODULE_LCDIF, "/soc/aips-bus at 02100000/lcdif at 021c8000", 0x440, 8},
+ {MODULE_PXP, "/soc/aips-bus at 02100000/pxp at 021cc000", 0x440, 9},
+ {MODULE_CSI, "/soc/aips-bus at 02100000/csi at 021c4000", 0x440, 10},
+ {MODULE_ADC1, "/soc/aips-bus at 02100000/adc at 02198000", 0x440, 11},
+ {MODULE_ENET1, "/soc/aips-bus at 02100000/ethernet at 02188000", 0x440, 12},
+ {MODULE_ENET2, "/soc/aips-bus at 02000000/ethernet at 020b4000", 0x440, 13},
+ {MODULE_DCP, "/soc/aips-bus at 02200000/dcp at 02280000", 0x440, 14},
+ {MODULE_USB_OTG2, "/soc/aips-bus at 02100000/usb at 02184200", 0x440, 15},
+ {MODULE_SAI2, "/soc/aips-bus at 02000000/spba-bus at 02000000/sai at 0202c000", 0x440, 24},
+ {MODULE_SAI3, "/soc/aips-bus at 02000000/spba-bus at 02000000/sai at 02030000", 0x440, 24},
+ {MODULE_DCP_CRYPTO, "/soc/aips-bus at 02200000/dcp at 02280000", 0x440, 25},
+ {MODULE_UART5, "/soc/aips-bus at 02100000/serial at 021f4000", 0x440, 26},
+ {MODULE_UART6, "/soc/aips-bus at 02100000/serial at 021fc000", 0x440, 26},
+ {MODULE_UART7, "/soc/aips-bus at 02000000/spba-bus at 02000000/serial at 02018000", 0x440, 26},
+ {MODULE_UART8, "/soc/aips-bus at 02200000/serial at 02288000", 0x440, 26},
+ {MODULE_PWM5, "/soc/aips-bus at 02000000/pwm at 020f0000", 0x440, 27},
+ {MODULE_PWM6, "/soc/aips-bus at 02000000/pwm at 020f4000", 0x440, 27},
+ {MODULE_PWM7, "/soc/aips-bus at 02000000/pwm at 020f8000", 0x440, 27},
+ {MODULE_PWM8, "/soc/aips-bus at 02000000/pwm at 020fc000", 0x440, 27},
+ {MODULE_ECSPI3, "/soc/aips-bus at 02000000/spba-bus at 02000000/ecspi at 02010000", 0x440, 28},
+ {MODULE_ECSPI4, "/soc/aips-bus at 02000000/spba-bus at 02000000/ecspi at 02014000", 0x440, 28},
+ {MODULE_I2C3, "/soc/aips-bus at 02100000/i2c at 021a8000", 0x440, 29},
+ {MODULE_I2C4, "/soc/aips-bus at 02100000/i2c at 021f8000", 0x440, 29},
+ {MODULE_GPT2, "/soc/aips-bus at 02000000/gpt at 020e8000", 0x440, 30},
+ {MODULE_EPIT2, "/soc/aips-bus at 02000000/epit at 020d4000", 0x440, 31},
+#elif defined(CONFIG_MX6UL)
+ {MODULE_TSC, "/soc/aips-bus at 2000000/tsc at 2040000", 0x430, 22},
+ {MODULE_ADC2, "/soc/aips-bus at 2100000/adc at 219c000", 0x430, 23},
+ {MODULE_SIM1, "/soc/aips-bus at 2100000/sim at 218c000", 0x430, 24},
+ {MODULE_SIM2, "/soc/aips-bus at 2100000/sim at 21b4000", 0x430, 25},
+ {MODULE_FLEXCAN1, "/soc/aips-bus at 2000000/can at 2090000", 0x430, 26},
+ {MODULE_FLEXCAN2, "/soc/aips-bus at 2000000/can at 2094000", 0x430, 27},
+ {MODULE_SPDIF, "/soc/aips-bus at 2000000/spba-bus at 2000000/spdif at 2004000", 0x440, 2},
+ {MODULE_EIM, "/soc/aips-bus at 2100000/weim at 21b8000", 0x440, 3},
+ {MODULE_SD1, "/soc/aips-bus at 2100000/usdhc at 2190000", 0x440, 4},
+ {MODULE_SD2, "/soc/aips-bus at 2100000/usdhc at 2194000", 0x440, 5},
+ {MODULE_QSPI1, "/soc/aips-bus at 2100000/qspi at 21e0000", 0x440, 6},
+ {MODULE_GPMI, "/soc/gpmi-nand at 1806000", 0x440, 7},
+ {MODULE_APBHDMA, "/soc/dma-apbh at 1804000", 0x440, 7},
+ {MODULE_LCDIF, "/soc/aips-bus at 2100000/lcdif at 21c8000", 0x440, 8},
+ {MODULE_PXP, "/soc/aips-bus at 2100000/pxp at 21cc000", 0x440, 9},
+ {MODULE_CSI, "/soc/aips-bus at 2100000/csi at 21c4000", 0x440, 10},
+ {MODULE_ADC1, "/soc/aips-bus at 2100000/adc at 2198000", 0x440, 11},
+ {MODULE_ENET1, "/soc/aips-bus at 2100000/ethernet at 2188000", 0x440, 12},
+ {MODULE_ENET2, "/soc/aips-bus at 2000000/ethernet at 20b4000", 0x440, 13},
+ {MODULE_CAAM, "/soc/aips-bus at 2100000/caam at 2140000", 0x440, 14},
+ {MODULE_USB_OTG2, "/soc/aips-bus at 2100000/usb at 2184200", 0x440, 15},
+ {MODULE_SAI2, "/soc/aips-bus at 2000000/spba-bus at 2000000/sai at 202c000", 0x440, 24},
+ {MODULE_SAI3, "/soc/aips-bus at 2000000/spba-bus at 2000000/sai at 2030000", 0x440, 24},
+ {MODULE_BEE, "/soc/aips-bus at 2000000/bee at 2044000", 0x440, 25},
+ {MODULE_UART5, "/soc/aips-bus at 2100000/serial at 21f4000", 0x440, 26},
+ {MODULE_UART6, "/soc/aips-bus at 2100000/serial at 21fc000", 0x440, 26},
+ {MODULE_UART7, "/soc/aips-bus at 2000000/spba-bus at 2000000/serial at 2018000", 0x440, 26},
+ {MODULE_UART8, "/soc/aips-bus at 2000000/spba-bus at 2000000/serial at 2024000", 0x440, 26},
+ {MODULE_PWM5, "/soc/aips-bus at 2000000/pwm at 20f0000", 0x440, 27},
+ {MODULE_PWM6, "/soc/aips-bus at 2000000/pwm at 20f4000", 0x440, 27},
+ {MODULE_PWM7, "/soc/aips-bus at 2000000/pwm at 20f8000", 0x440, 27},
+ {MODULE_PWM8, "/soc/aips-bus at 2000000/pwm at 20fc000", 0x440, 27},
+ {MODULE_ECSPI3, "/soc/aips-bus at 2000000/spba-bus at 2000000/ecspi at 2010000", 0x440, 28},
+ {MODULE_ECSPI4, "/soc/aips-bus at 2000000/spba-bus at 2000000/ecspi at 2014000", 0x440, 28},
+ {MODULE_I2C3, "/soc/aips-bus at 2100000/i2c at 21a8000", 0x440, 29},
+ {MODULE_I2C4, "/soc/aips-bus at 2100000/i2c at 21f8000", 0x440, 29},
+ {MODULE_GPT2, "/soc/aips-bus at 2000000/gpt at 20e8000", 0x440, 30},
+ {MODULE_EPIT2, "/soc/aips-bus at 2000000/epit at 20d4000", 0x440, 31},
+ /* Paths for older imx tree: */
+ {MODULE_TSC, "/soc/aips-bus at 02000000/tsc at 02040000", 0x430, 22},
+ {MODULE_ADC2, "/soc/aips-bus at 02100000/adc at 0219c000", 0x430, 23},
+ {MODULE_SIM1, "/soc/aips-bus at 02100000/sim at 0218c000", 0x430, 24},
+ {MODULE_SIM2, "/soc/aips-bus at 02100000/sim at 021b4000", 0x430, 25},
+ {MODULE_FLEXCAN1, "/soc/aips-bus at 02000000/can at 02090000", 0x430, 26},
+ {MODULE_FLEXCAN2, "/soc/aips-bus at 02000000/can at 02094000", 0x430, 27},
+ {MODULE_SPDIF, "/soc/aips-bus at 02000000/spba-bus at 02000000/spdif at 02004000", 0x440, 2},
+ {MODULE_EIM, "/soc/aips-bus at 02100000/weim at 021b8000", 0x440, 3},
+ {MODULE_SD1, "/soc/aips-bus at 02100000/usdhc at 02190000", 0x440, 4},
+ {MODULE_SD2, "/soc/aips-bus at 02100000/usdhc at 02194000", 0x440, 5},
+ {MODULE_QSPI1, "/soc/aips-bus at 02100000/qspi at 021e0000", 0x440, 6},
+ {MODULE_GPMI, "/soc/gpmi-nand at 01806000", 0x440, 7},
+ {MODULE_APBHDMA, "/soc/dma-apbh at 01804000", 0x440, 7},
+ {MODULE_LCDIF, "/soc/aips-bus at 02100000/lcdif at 021c8000", 0x440, 8},
+ {MODULE_PXP, "/soc/aips-bus at 02100000/pxp at 021cc000", 0x440, 9},
+ {MODULE_CSI, "/soc/aips-bus at 02100000/csi at 021c4000", 0x440, 10},
+ {MODULE_ADC1, "/soc/aips-bus at 02100000/adc at 02198000", 0x440, 11},
+ {MODULE_ENET1, "/soc/aips-bus at 02100000/ethernet at 02188000", 0x440, 12},
+ {MODULE_ENET2, "/soc/aips-bus at 02000000/ethernet at 020b4000", 0x440, 13},
+ {MODULE_CAAM, "/soc/aips-bus at 02100000/caam at 2140000", 0x440, 14},
+ {MODULE_USB_OTG2, "/soc/aips-bus at 02100000/usb at 02184200", 0x440, 15},
+ {MODULE_SAI2, "/soc/aips-bus at 02000000/spba-bus at 02000000/sai at 0202c000", 0x440, 24},
+ {MODULE_SAI3, "/soc/aips-bus at 02000000/spba-bus at 02000000/sai at 02030000", 0x440, 24},
+ {MODULE_BEE, "/soc/aips-bus at 02000000/bee at 02044000", 0x440, 25},
+ {MODULE_UART5, "/soc/aips-bus at 02100000/serial at 021f4000", 0x440, 26},
+ {MODULE_UART6, "/soc/aips-bus at 02100000/serial at 021fc000", 0x440, 26},
+ {MODULE_UART7, "/soc/aips-bus at 02000000/spba-bus at 02000000/serial at 02018000", 0x440, 26},
+ {MODULE_UART8, "/soc/aips-bus at 02000000/spba-bus at 02000000/serial at 02024000", 0x440, 26},
+ {MODULE_PWM5, "/soc/aips-bus at 02000000/pwm at 020f0000", 0x440, 27},
+ {MODULE_PWM6, "/soc/aips-bus at 02000000/pwm at 020f4000", 0x440, 27},
+ {MODULE_PWM7, "/soc/aips-bus at 02000000/pwm at 020f8000", 0x440, 27},
+ {MODULE_PWM8, "/soc/aips-bus at 02000000/pwm at 020fc000", 0x440, 27},
+ {MODULE_ECSPI3, "/soc/aips-bus at 02000000/spba-bus at 02000000/ecspi at 02010000", 0x440, 28},
+ {MODULE_ECSPI4, "/soc/aips-bus at 02000000/spba-bus at 02000000/ecspi at 02014000", 0x440, 28},
+ {MODULE_I2C3, "/soc/aips-bus at 02100000/i2c at 021a8000", 0x440, 29},
+ {MODULE_I2C4, "/soc/aips-bus at 02100000/i2c at 021f8000", 0x440, 29},
+ {MODULE_GPT2, "/soc/aips-bus at 02000000/gpt at 020e8000", 0x440, 30},
+ {MODULE_EPIT2, "/soc/aips-bus at 02000000/epit at 020d4000", 0x440, 31},
+#endif
+};
+
+u32 check_module_fused(enum fuse_module_type module)
+{
+ u32 i, reg;
+
+ for (i = 0; i < ARRAY_SIZE(mx6_fuse_descs); i++) {
+ if (mx6_fuse_descs[i].module == module) {
+ reg = readl(OCOTP_BASE_ADDR +
+ mx6_fuse_descs[i].fuse_word_offset);
+ if (reg & BIT(mx6_fuse_descs[i].fuse_bit_offset))
+ return 1; /* disabled */
+ else
+ return 0; /* enabled */
+ }
+ }
+
+ return 0; /* Not has a fuse, always enabled */
+}
+
+#ifdef CONFIG_OF_SYSTEM_SETUP
+int ft_system_setup(void *blob, bd_t *bd)
+{
+ const char *status = "disabled";
+ u32 i, reg;
+ int rc, off;
+
+ for (i = 0; i < ARRAY_SIZE(mx6_fuse_descs); i++) {
+ reg = readl(OCOTP_BASE_ADDR +
+ mx6_fuse_descs[i].fuse_word_offset);
+ if (reg & BIT(mx6_fuse_descs[i].fuse_bit_offset)) {
+ off = fdt_path_offset(blob,
+ mx6_fuse_descs[i].node_path);
+
+ if (off < 0)
+ continue; /* Not found, skip it */
+add_status:
+ rc = fdt_setprop(blob, nodeoff, "status", status,
+ strlen(status) + 1);
+ if (rc) {
+ if (rc == -FDT_ERR_NOSPACE) {
+ rc = fdt_increase_size(blob, 512);
+ if (!rc)
+ goto add_status;
+ }
+ printf("Unable to update property %s:%s, err=%s\n", mx6_fuse_descs[i].node_path, "status", fdt_strerror(rc));
+ } else {
+ printf("Modify %s disabled\n", mx6_fuse_descs[i].node_path);
+ }
+ }
+ }
+
+ return 0;
+}
+#endif
+
+u32 esdhc_fused(u32 base_addr)
+{
+ switch (base_addr) {
+ case USDHC1_BASE_ADDR:
+ return check_module_fused(MODULE_SD1);
+ case USDHC2_BASE_ADDR:
+ return check_module_fused(MODULE_SD2);
+#ifdef USDHC3_BASE_ADDR
+ case USDHC3_BASE_ADDR:
+ return check_module_fused(MODULE_SD3);
+#endif
+#ifdef USDHC4_BASE_ADDR
+ case USDHC4_BASE_ADDR:
+ return check_module_fused(MODULE_SD4);
+#endif
+ default:
+ return 0;
+ }
+}
+
+u32 ecspi_fused(u32 base_addr)
+{
+ switch (base_addr) {
+ case ECSPI1_BASE_ADDR:
+ return check_module_fused(MODULE_ECSPI1);
+ case ECSPI2_BASE_ADDR:
+ return check_module_fused(MODULE_ECSPI2);
+ case ECSPI3_BASE_ADDR:
+ return check_module_fused(MODULE_ECSPI3);
+ case ECSPI4_BASE_ADDR:
+ return check_module_fused(MODULE_ECSPI4);
+#ifdef ECSPI5_BASE_ADDR
+ case ECSPI5_BASE_ADDR:
+ return check_module_fused(MODULE_ECSPI5);
+#endif
+ default:
+ return 0;
+ }
+}
+
+u32 usb_fused(u32 base_addr)
+{
+ int i = (base_addr - USB_BASE_ADDR) / 0x200;
+
+ return check_module_fused(MODULE_USB_OTG1 + i);
+}
+
+u32 qspi_fused(u32 base_addr)
+{
+ switch (base_addr) {
+#ifdef QSPI1_BASE_ADDR
+ case QSPI1_BASE_ADDR:
+ return check_module_fused(MODULE_QSPI1);
+#endif
+
+#ifdef QSPI2_BASE_ADDR
+ case QSPI2_BASE_ADDR:
+ return check_module_fused(MODULE_QSPI2);
+#endif
+ default:
+ return 0;
+ }
+}
+
+u32 i2c_fused(u32 base_addr)
+{
+ switch (base_addr) {
+ case I2C1_BASE_ADDR:
+ return check_module_fused(MODULE_I2C1);
+ case I2C2_BASE_ADDR:
+ return check_module_fused(MODULE_I2C2);
+ case I2C3_BASE_ADDR:
+ return check_module_fused(MODULE_I2C3);
+#ifdef I2C4_BASE_ADDR
+ case I2C4_BASE_ADDR:
+ return check_module_fused(MODULE_I2C4);
+#endif
+ }
+
+ return 0;
+}
+
+u32 enet_fused(u32 base_addr)
+{
+ switch (base_addr) {
+ case ENET_BASE_ADDR:
+ return check_module_fused(MODULE_ENET1);
+#ifdef ENET2_BASE_ADDR
+ case ENET2_BASE_ADDR:
+ return check_module_fused(MODULE_ENET2);
+#endif
+ default:
+ return 0;
+ }
+}
--
2.16.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH V2 2/4] i2c: mxc: add fuse check
2019-07-23 7:19 [U-Boot] [PATCH V2 1/4] imx: add module fuse support Peng Fan
@ 2019-07-23 7:19 ` Peng Fan
2019-07-23 7:19 ` [U-Boot] [PATCH V2 3/4] usb: mx6: " Peng Fan
2019-07-23 7:19 ` [U-Boot] [PATCH V2 4/4] net: fec: " Peng Fan
2 siblings, 0 replies; 7+ messages in thread
From: Peng Fan @ 2019-07-23 7:19 UTC (permalink / raw)
To: u-boot
Add fuse check for I2C. If the fuse indicates the module
will not work in the SoC, let's fail the initialization.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
V2:
Update commit and debug info
drivers/i2c/mxc_i2c.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index 23119cce65..c5c1190af1 100644
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -18,6 +18,7 @@
#include <asm/arch/imx-regs.h>
#include <linux/errno.h>
#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/sys_proto.h>
#include <asm/io.h>
#include <i2c.h>
#include <watchdog.h>
@@ -740,6 +741,14 @@ void bus_i2c_init(int index, int speed, int unused,
return;
}
+ if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) {
+ if (i2c_fused((u32)mxc_i2c_buses[index].base)) {
+ printf("SoC fuse indicates I2C at 0x%x is unavailable.\n",
+ (u32)mxc_i2c_buses[index].base);
+ return;
+ }
+ }
+
/*
* Warning: Be careful to allow the assignment to a static
* variable here. This function could be called while U-Boot is
@@ -885,6 +894,14 @@ static int mxc_i2c_probe(struct udevice *bus)
if (addr == FDT_ADDR_T_NONE)
return -EINVAL;
+ if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) {
+ if (i2c_fused(addr)) {
+ printf("SoC fuse indicates I2C at 0x%lx is unavailable.\n",
+ addr);
+ return -ENODEV;
+ }
+ }
+
i2c_bus->base = addr;
i2c_bus->index = bus->seq;
i2c_bus->bus = bus;
--
2.16.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH V2 3/4] usb: mx6: add fuse check
2019-07-23 7:19 [U-Boot] [PATCH V2 1/4] imx: add module fuse support Peng Fan
2019-07-23 7:19 ` [U-Boot] [PATCH V2 2/4] i2c: mxc: add fuse check Peng Fan
@ 2019-07-23 7:19 ` Peng Fan
2019-07-23 7:19 ` [U-Boot] [PATCH V2 4/4] net: fec: " Peng Fan
2 siblings, 0 replies; 7+ messages in thread
From: Peng Fan @ 2019-07-23 7:19 UTC (permalink / raw)
To: u-boot
Add fuse check for USB. If the fuse indicates the module
will not work in the SoC, let's fail the initialization.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
V2:
Update commit and debug info
drivers/usb/host/ehci-mx6.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index e9e6ed596d..60b4d1ceb3 100644
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -353,6 +353,14 @@ int ehci_hcd_init(int index, enum usb_init_type init,
if (index > 3)
return -EINVAL;
+ if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) {
+ if (usb_fused((u32)ehci)) {
+ printf("SoC fuse indicates USB at 0x%x is unavailable.\n",
+ (u32)ehci);
+ return -ENODEV;
+ }
+ }
+
ret = ehci_mx6_common_init(ehci, index);
if (ret)
return ret;
@@ -549,6 +557,14 @@ static int ehci_usb_probe(struct udevice *dev)
struct ehci_hcor *hcor;
int ret;
+ if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) {
+ if (usb_fused((u32)ehci)) {
+ printf("SoC fuse indicates USB at 0x%x is unavailable.\n",
+ (u32)ehci);
+ return -ENODEV;
+ }
+ }
+
priv->ehci = ehci;
priv->portnr = dev->seq;
priv->init_type = type;
--
2.16.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH V2 4/4] net: fec: add fuse check
2019-07-23 7:19 [U-Boot] [PATCH V2 1/4] imx: add module fuse support Peng Fan
2019-07-23 7:19 ` [U-Boot] [PATCH V2 2/4] i2c: mxc: add fuse check Peng Fan
2019-07-23 7:19 ` [U-Boot] [PATCH V2 3/4] usb: mx6: " Peng Fan
@ 2019-07-23 7:19 ` Peng Fan
2019-07-23 7:36 ` Joe Hershberger
2 siblings, 1 reply; 7+ messages in thread
From: Peng Fan @ 2019-07-23 7:19 UTC (permalink / raw)
To: u-boot
Add fuse check for fec. If the fuse indicates the module
will not work in the SoC, let's fail the initialization.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
V2:
Update commit and debug info
drivers/net/fec_mxc.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index 96e3ad9a1a..c666874b98 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -1185,6 +1185,13 @@ int fecmxc_initialize_multi(bd_t *bd, int dev_id, int phy_id, uint32_t addr)
#endif
int ret;
+ if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) {
+ if (enet_fused(addr)) {
+ printf("SoC fuse indicates Ethernet at 0x%x is unavailable.\n", addr);
+ return -ENODEV;
+ }
+ }
+
#ifdef CONFIG_FEC_MXC_MDIO_BASE
/*
* The i.MX28 has two ethernet interfaces, but they are not equal.
@@ -1323,6 +1330,13 @@ static int fecmxc_probe(struct udevice *dev)
uint32_t start;
int ret;
+ if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) {
+ if (enet_fused((u32)priv->eth)) {
+ printf("SoC fuse indicates Ethernet at 0x%x is unavailable.\n", (u32)priv->eth);
+ return -ENODEV;
+ }
+ }
+
if (IS_ENABLED(CONFIG_IMX8)) {
ret = clk_get_by_name(dev, "ipg", &priv->ipg_clk);
if (ret < 0) {
--
2.16.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH V2 4/4] net: fec: add fuse check
2019-07-23 7:19 ` [U-Boot] [PATCH V2 4/4] net: fec: " Peng Fan
@ 2019-07-23 7:36 ` Joe Hershberger
0 siblings, 0 replies; 7+ messages in thread
From: Joe Hershberger @ 2019-07-23 7:36 UTC (permalink / raw)
To: u-boot
On Tue, Jul 23, 2019 at 2:21 AM Peng Fan <peng.fan@nxp.com> wrote:
>
> Add fuse check for fec. If the fuse indicates the module
> will not work in the SoC, let's fail the initialization.
>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH v2 2/4] i2c: mxc: add fuse check
2019-08-01 8:45 ` [U-Boot] [PATCH v2 2/4] i2c: mxc: add fuse check Peng Fan
@ 2019-08-01 11:04 ` Heiko Schocher
0 siblings, 0 replies; 7+ messages in thread
From: Heiko Schocher @ 2019-08-01 11:04 UTC (permalink / raw)
To: u-boot
Hello Peng,
Am 01.08.2019 um 10:45 schrieb Peng Fan:
> Add fuse check for I2C. If the fuse indicates the module
> will not work in the SoC, let's fail the initialization.
>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---
>
> V2:
> Fix build for aarch64
>
>
> drivers/i2c/mxc_i2c.c | 17 +++++++++++++++++
> 1 file changed, 17 insertions(+)
>
> diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
> index 23119cce65..7a259547bd 100644
> --- a/drivers/i2c/mxc_i2c.c
> +++ b/drivers/i2c/mxc_i2c.c
> @@ -18,6 +18,7 @@
> #include <asm/arch/imx-regs.h>
> #include <linux/errno.h>
> #include <asm/mach-imx/mxc_i2c.h>
> +#include <asm/mach-imx/sys_proto.h>
> #include <asm/io.h>
> #include <i2c.h>
> #include <watchdog.h>
> @@ -740,6 +741,14 @@ void bus_i2c_init(int index, int speed, int unused,
> return;
> }
>
> + if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) {
> + if (i2c_fused((ulong)mxc_i2c_buses[index].base)) {
> + printf("SoC fuse indicates I2C at 0x%lx is unavailable.\n",
> + (ulong)mxc_i2c_buses[index].base);
> + return;
> + }
> + }
> +
> /*
> * Warning: Be careful to allow the assignment to a static
> * variable here. This function could be called while U-Boot is
> @@ -885,6 +894,14 @@ static int mxc_i2c_probe(struct udevice *bus)
> if (addr == FDT_ADDR_T_NONE)
> return -EINVAL;
>
> + if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) {
> + if (i2c_fused((ulong)addr)) {
> + printf("SoC fuse indicates I2C at 0x%lx is unavailable.\n",
> + (ulong)addr);
> + return -ENODEV;
> + }
> + }
> +
> i2c_bus->base = addr;
> i2c_bus->index = bus->seq;
> i2c_bus->bus = bus;
>
Reviewed-by: Heiko Schocher <hs@denx.de>
bye,
Heiko
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH v2 2/4] i2c: mxc: add fuse check
2019-08-01 8:45 [U-Boot] [PATCH v2 1/4] imx: add module fuse support Peng Fan
@ 2019-08-01 8:45 ` Peng Fan
2019-08-01 11:04 ` Heiko Schocher
0 siblings, 1 reply; 7+ messages in thread
From: Peng Fan @ 2019-08-01 8:45 UTC (permalink / raw)
To: u-boot
Add fuse check for I2C. If the fuse indicates the module
will not work in the SoC, let's fail the initialization.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
V2:
Fix build for aarch64
drivers/i2c/mxc_i2c.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index 23119cce65..7a259547bd 100644
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -18,6 +18,7 @@
#include <asm/arch/imx-regs.h>
#include <linux/errno.h>
#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/sys_proto.h>
#include <asm/io.h>
#include <i2c.h>
#include <watchdog.h>
@@ -740,6 +741,14 @@ void bus_i2c_init(int index, int speed, int unused,
return;
}
+ if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) {
+ if (i2c_fused((ulong)mxc_i2c_buses[index].base)) {
+ printf("SoC fuse indicates I2C at 0x%lx is unavailable.\n",
+ (ulong)mxc_i2c_buses[index].base);
+ return;
+ }
+ }
+
/*
* Warning: Be careful to allow the assignment to a static
* variable here. This function could be called while U-Boot is
@@ -885,6 +894,14 @@ static int mxc_i2c_probe(struct udevice *bus)
if (addr == FDT_ADDR_T_NONE)
return -EINVAL;
+ if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) {
+ if (i2c_fused((ulong)addr)) {
+ printf("SoC fuse indicates I2C at 0x%lx is unavailable.\n",
+ (ulong)addr);
+ return -ENODEV;
+ }
+ }
+
i2c_bus->base = addr;
i2c_bus->index = bus->seq;
i2c_bus->bus = bus;
--
2.16.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-08-01 11:04 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-23 7:19 [U-Boot] [PATCH V2 1/4] imx: add module fuse support Peng Fan
2019-07-23 7:19 ` [U-Boot] [PATCH V2 2/4] i2c: mxc: add fuse check Peng Fan
2019-07-23 7:19 ` [U-Boot] [PATCH V2 3/4] usb: mx6: " Peng Fan
2019-07-23 7:19 ` [U-Boot] [PATCH V2 4/4] net: fec: " Peng Fan
2019-07-23 7:36 ` Joe Hershberger
2019-08-01 8:45 [U-Boot] [PATCH v2 1/4] imx: add module fuse support Peng Fan
2019-08-01 8:45 ` [U-Boot] [PATCH v2 2/4] i2c: mxc: add fuse check Peng Fan
2019-08-01 11:04 ` Heiko Schocher
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.