Merge branch 'next'

Signed-off-by: Tom Rini <trini@konsulko.com>

5 files changed, 256 insertions, 238 deletions

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index a6da6e215de..b07261d3db5 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -112,6 +112,12 @@ config SIFIVE_OTP
 	  Enable support for reading and writing the eMemory OTP on the
 	  SiFive SoCs.
 
+config SMSC_LPC47M
+	bool "LPC47M SMSC driver"
+
+config SMSC_SIO1007
+	bool "SIO1007 SMSC driver"
+
 config VEXPRESS_CONFIG
 	bool "Enable support for Arm Versatile Express config bus"
 	depends on MISC
@@ -267,6 +273,10 @@ config DS4510
 	  and a configurable timer for the supervisor function. The device is
 	  connected over I2C.
 
+config FSL_IIM
+	bool "Enable FSL IC Identification Module (IIM) driver"
+	depends on ARCH_MX31 || ARCH_MX5
+
 config FSL_SEC_MON
 	bool "Enable FSL SEC_MON Driver"
 	help
@@ -326,6 +336,14 @@ config MXC_OCOTP
 	  Programmable memory pages that are stored on the some
 	  Freescale i.MX processors.
 
+config MXS_OCOTP
+	bool "Enable MXS OCOTP Driver"
+	depends on ARCH_MX23 || ARCH_MX28
+	help
+	  If you say Y here, you will get support for the One Time
+	  Programmable memory pages that are stored on the
+	  Freescale i.MXS family of processors.
+
 config NPCM_HOST
 	bool "Enable support espi or LPC for Host"
 	depends on REGMAP && SYSCON
diff --git a/drivers/misc/fsl_ifc.c b/drivers/misc/fsl_ifc.c
index 8fdaacd5e04..58b00587363 100644
--- a/drivers/misc/fsl_ifc.c
+++ b/drivers/misc/fsl_ifc.c
@@ -12,37 +12,37 @@
 struct ifc_regs ifc_cfg_default_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
 	{
 		"cs0",
-#if defined(CONFIG_SYS_CSPR0) && defined(CONFIG_SYS_CSOR0)
-		CONFIG_SYS_CSPR0,
-#ifdef CONFIG_SYS_CSPR0_EXT
-		CONFIG_SYS_CSPR0_EXT,
+#if defined(CFG_SYS_CSPR0) && defined(CFG_SYS_CSOR0)
+		CFG_SYS_CSPR0,
+#ifdef CFG_SYS_CSPR0_EXT
+		CFG_SYS_CSPR0_EXT,
 #else
 		0,
 #endif
-#ifdef CONFIG_SYS_AMASK0
-		CONFIG_SYS_AMASK0,
+#ifdef CFG_SYS_AMASK0
+		CFG_SYS_AMASK0,
 #else
 		0,
 #endif
-		CONFIG_SYS_CSOR0,
+		CFG_SYS_CSOR0,
 		{
-			CONFIG_SYS_CS0_FTIM0,
-			CONFIG_SYS_CS0_FTIM1,
-			CONFIG_SYS_CS0_FTIM2,
-			CONFIG_SYS_CS0_FTIM3,
+			CFG_SYS_CS0_FTIM0,
+			CFG_SYS_CS0_FTIM1,
+			CFG_SYS_CS0_FTIM2,
+			CFG_SYS_CS0_FTIM3,
 		},
-#ifdef CONFIG_SYS_CSOR0_EXT
-		CONFIG_SYS_CSOR0_EXT,
+#ifdef CFG_SYS_CSOR0_EXT
+		CFG_SYS_CSOR0_EXT,
 #else
 		0,
 #endif
-#ifdef CONFIG_SYS_CSPR0_FINAL
-		CONFIG_SYS_CSPR0_FINAL,
+#ifdef CFG_SYS_CSPR0_FINAL
+		CFG_SYS_CSPR0_FINAL,
 #else
 		0,
 #endif
-#ifdef CONFIG_SYS_AMASK0_FINAL
-		CONFIG_SYS_AMASK0_FINAL,
+#ifdef CFG_SYS_AMASK0_FINAL
+		CFG_SYS_AMASK0_FINAL,
 #else
 		0,
 #endif
@@ -52,37 +52,37 @@ struct ifc_regs ifc_cfg_default_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
 #if CONFIG_SYS_FSL_IFC_BANK_COUNT >= 2
 	{
 		"cs1",
-#if defined(CONFIG_SYS_CSPR1) && defined(CONFIG_SYS_CSOR1)
-		CONFIG_SYS_CSPR1,
-#ifdef CONFIG_SYS_CSPR1_EXT
-		CONFIG_SYS_CSPR1_EXT,
+#if defined(CFG_SYS_CSPR1) && defined(CFG_SYS_CSOR1)
+		CFG_SYS_CSPR1,
+#ifdef CFG_SYS_CSPR1_EXT
+		CFG_SYS_CSPR1_EXT,
 #else
 		0,
 #endif
-#ifdef CONFIG_SYS_AMASK1
-		CONFIG_SYS_AMASK1,
+#ifdef CFG_SYS_AMASK1
+		CFG_SYS_AMASK1,
 #else
 		0,
 #endif
-		CONFIG_SYS_CSOR1,
+		CFG_SYS_CSOR1,
 		{
-			CONFIG_SYS_CS1_FTIM0,
-			CONFIG_SYS_CS1_FTIM1,
-			CONFIG_SYS_CS1_FTIM2,
-			CONFIG_SYS_CS1_FTIM3,
+			CFG_SYS_CS1_FTIM0,
+			CFG_SYS_CS1_FTIM1,
+			CFG_SYS_CS1_FTIM2,
+			CFG_SYS_CS1_FTIM3,
 		},
-#ifdef CONFIG_SYS_CSOR1_EXT
-		CONFIG_SYS_CSOR1_EXT,
+#ifdef CFG_SYS_CSOR1_EXT
+		CFG_SYS_CSOR1_EXT,
 #else
 		0,
 #endif
-#ifdef CONFIG_SYS_CSPR1_FINAL
-		CONFIG_SYS_CSPR1_FINAL,
+#ifdef CFG_SYS_CSPR1_FINAL
+		CFG_SYS_CSPR1_FINAL,
 #else
 		0,
 #endif
-#ifdef CONFIG_SYS_AMASK1_FINAL
-		CONFIG_SYS_AMASK1_FINAL,
+#ifdef CFG_SYS_AMASK1_FINAL
+		CFG_SYS_AMASK1_FINAL,
 #else
 		0,
 #endif
@@ -93,37 +93,37 @@ struct ifc_regs ifc_cfg_default_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
 #if CONFIG_SYS_FSL_IFC_BANK_COUNT >= 3
 	{
 		"cs2",
-#if defined(CONFIG_SYS_CSPR2) && defined(CONFIG_SYS_CSOR2)
-		CONFIG_SYS_CSPR2,
-#ifdef CONFIG_SYS_CSPR2_EXT
-		CONFIG_SYS_CSPR2_EXT,
+#if defined(CFG_SYS_CSPR2) && defined(CFG_SYS_CSOR2)
+		CFG_SYS_CSPR2,
+#ifdef CFG_SYS_CSPR2_EXT
+		CFG_SYS_CSPR2_EXT,
 #else
 		0,
 #endif
-#ifdef CONFIG_SYS_AMASK2
-		CONFIG_SYS_AMASK2,
+#ifdef CFG_SYS_AMASK2
+		CFG_SYS_AMASK2,
 #else
 		0,
 #endif
-		CONFIG_SYS_CSOR2,
+		CFG_SYS_CSOR2,
 		{
-			CONFIG_SYS_CS2_FTIM0,
-			CONFIG_SYS_CS2_FTIM1,
-			CONFIG_SYS_CS2_FTIM2,
-			CONFIG_SYS_CS2_FTIM3,
+			CFG_SYS_CS2_FTIM0,
+			CFG_SYS_CS2_FTIM1,
+			CFG_SYS_CS2_FTIM2,
+			CFG_SYS_CS2_FTIM3,
 		},
-#ifdef CONFIG_SYS_CSOR2_EXT
-		CONFIG_SYS_CSOR2_EXT,
+#ifdef CFG_SYS_CSOR2_EXT
+		CFG_SYS_CSOR2_EXT,
 #else
 		0,
 #endif
-#ifdef CONFIG_SYS_CSPR2_FINAL
-		CONFIG_SYS_CSPR2_FINAL,
+#ifdef CFG_SYS_CSPR2_FINAL
+		CFG_SYS_CSPR2_FINAL,
 #else
 		0,
 #endif
-#ifdef CONFIG_SYS_AMASK2_FINAL
-		CONFIG_SYS_AMASK2_FINAL,
+#ifdef CFG_SYS_AMASK2_FINAL
+		CFG_SYS_AMASK2_FINAL,
 #else
 		0,
 #endif
@@ -134,37 +134,37 @@ struct ifc_regs ifc_cfg_default_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
 #if CONFIG_SYS_FSL_IFC_BANK_COUNT >= 4
 	{
 		"cs3",
-#if defined(CONFIG_SYS_CSPR3) && defined(CONFIG_SYS_CSOR3)
-		CONFIG_SYS_CSPR3,
-#ifdef CONFIG_SYS_CSPR3_EXT
-		CONFIG_SYS_CSPR3_EXT,
+#if defined(CFG_SYS_CSPR3) && defined(CFG_SYS_CSOR3)
+		CFG_SYS_CSPR3,
+#ifdef CFG_SYS_CSPR3_EXT
+		CFG_SYS_CSPR3_EXT,
 #else
 		0,
 #endif
-#ifdef CONFIG_SYS_AMASK3
-		CONFIG_SYS_AMASK3,
+#ifdef CFG_SYS_AMASK3
+		CFG_SYS_AMASK3,
 #else
 		0,
 #endif
-		CONFIG_SYS_CSOR3,
+		CFG_SYS_CSOR3,
 		{
-			CONFIG_SYS_CS3_FTIM0,
-			CONFIG_SYS_CS3_FTIM1,
-			CONFIG_SYS_CS3_FTIM2,
-			CONFIG_SYS_CS3_FTIM3,
+			CFG_SYS_CS3_FTIM0,
+			CFG_SYS_CS3_FTIM1,
+			CFG_SYS_CS3_FTIM2,
+			CFG_SYS_CS3_FTIM3,
 		},
-#ifdef CONFIG_SYS_CSOR3_EXT
-		CONFIG_SYS_CSOR3_EXT,
+#ifdef CFG_SYS_CSOR3_EXT
+		CFG_SYS_CSOR3_EXT,
 #else
 		0,
 #endif
-#ifdef CONFIG_SYS_CSPR3_FINAL
-		CONFIG_SYS_CSPR3_FINAL,
+#ifdef CFG_SYS_CSPR3_FINAL
+		CFG_SYS_CSPR3_FINAL,
 #else
 		0,
 #endif
-#ifdef CONFIG_SYS_AMASK3_FINAL
-		CONFIG_SYS_AMASK3_FINAL,
+#ifdef CFG_SYS_AMASK3_FINAL
+		CFG_SYS_AMASK3_FINAL,
 #else
 		0,
 #endif
@@ -175,37 +175,37 @@ struct ifc_regs ifc_cfg_default_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
 #if CONFIG_SYS_FSL_IFC_BANK_COUNT >= 5
 	{
 		"cs4",
-#if defined(CONFIG_SYS_CSPR4) && defined(CONFIG_SYS_CSOR4)
-		CONFIG_SYS_CSPR4,
-#ifdef CONFIG_SYS_CSPR4_EXT
-		CONFIG_SYS_CSPR4_EXT,
+#if defined(CFG_SYS_CSPR4) && defined(CFG_SYS_CSOR4)
+		CFG_SYS_CSPR4,
+#ifdef CFG_SYS_CSPR4_EXT
+		CFG_SYS_CSPR4_EXT,
 #else
 		0,
 #endif
-#ifdef CONFIG_SYS_AMASK4
-		CONFIG_SYS_AMASK4,
+#ifdef CFG_SYS_AMASK4
+		CFG_SYS_AMASK4,
 #else
 		0,
 #endif
-		CONFIG_SYS_CSOR4,
+		CFG_SYS_CSOR4,
 		{
-			CONFIG_SYS_CS4_FTIM0,
-			CONFIG_SYS_CS4_FTIM1,
-			CONFIG_SYS_CS4_FTIM2,
-			CONFIG_SYS_CS4_FTIM3,
+			CFG_SYS_CS4_FTIM0,
+			CFG_SYS_CS4_FTIM1,
+			CFG_SYS_CS4_FTIM2,
+			CFG_SYS_CS4_FTIM3,
 		},
-#ifdef CONFIG_SYS_CSOR4_EXT
-		CONFIG_SYS_CSOR4_EXT,
+#ifdef CFG_SYS_CSOR4_EXT
+		CFG_SYS_CSOR4_EXT,
 #else
 		0,
 #endif
-#ifdef CONFIG_SYS_CSPR4_FINAL
-		CONFIG_SYS_CSPR4_FINAL,
+#ifdef CFG_SYS_CSPR4_FINAL
+		CFG_SYS_CSPR4_FINAL,
 #else
 		0,
 #endif
-#ifdef CONFIG_SYS_AMASK4_FINAL
-		CONFIG_SYS_AMASK4_FINAL,
+#ifdef CFG_SYS_AMASK4_FINAL
+		CFG_SYS_AMASK4_FINAL,
 #else
 		0,
 #endif
@@ -257,37 +257,37 @@ struct ifc_regs ifc_cfg_default_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
 #if CONFIG_SYS_FSL_IFC_BANK_COUNT >= 7
 	{
 		"cs6",
-#if defined(CONFIG_SYS_CSPR6) && defined(CONFIG_SYS_CSOR6)
-		CONFIG_SYS_CSPR6,
-#ifdef CONFIG_SYS_CSPR6_EXT
-		CONFIG_SYS_CSPR6_EXT,
+#if defined(CFG_SYS_CSPR6) && defined(CFG_SYS_CSOR6)
+		CFG_SYS_CSPR6,
+#ifdef CFG_SYS_CSPR6_EXT
+		CFG_SYS_CSPR6_EXT,
 #else
 		0,
 #endif
-#ifdef CONFIG_SYS_AMASK6
-		CONFIG_SYS_AMASK6,
+#ifdef CFG_SYS_AMASK6
+		CFG_SYS_AMASK6,
 #else
 		0,
 #endif
-		CONFIG_SYS_CSOR6,
+		CFG_SYS_CSOR6,
 		{
-			CONFIG_SYS_CS6_FTIM0,
-			CONFIG_SYS_CS6_FTIM1,
-			CONFIG_SYS_CS6_FTIM2,
-			CONFIG_SYS_CS6_FTIM3,
+			CFG_SYS_CS6_FTIM0,
+			CFG_SYS_CS6_FTIM1,
+			CFG_SYS_CS6_FTIM2,
+			CFG_SYS_CS6_FTIM3,
 		},
-#ifdef CONFIG_SYS_CSOR6_EXT
-		CONFIG_SYS_CSOR6_EXT,
+#ifdef CFG_SYS_CSOR6_EXT
+		CFG_SYS_CSOR6_EXT,
 #else
 		0,
 #endif
-#ifdef CONFIG_SYS_CSPR6_FINAL
-		CONFIG_SYS_CSPR6_FINAL,
+#ifdef CFG_SYS_CSPR6_FINAL
+		CFG_SYS_CSPR6_FINAL,
 #else
 		0,
 #endif
-#ifdef CONFIG_SYS_AMASK6_FINAL
-		CONFIG_SYS_AMASK6_FINAL,
+#ifdef CFG_SYS_AMASK6_FINAL
+		CFG_SYS_AMASK6_FINAL,
 #else
 		0,
 #endif
@@ -298,37 +298,37 @@ struct ifc_regs ifc_cfg_default_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
 #if CONFIG_SYS_FSL_IFC_BANK_COUNT >= 8
 	{
 		"cs7",
-#if defined(CONFIG_SYS_CSPR7) && defined(CONFIG_SYS_CSOR7)
-		CONFIG_SYS_CSPR7,
-#ifdef CONFIG_SYS_CSPR7_EXT
-		CONFIG_SYS_CSPR7_EXT,
+#if defined(CFG_SYS_CSPR7) && defined(CFG_SYS_CSOR7)
+		CFG_SYS_CSPR7,
+#ifdef CFG_SYS_CSPR7_EXT
+		CFG_SYS_CSPR7_EXT,
 #else
 		0,
 #endif
-#ifdef CONFIG_SYS_AMASK7
-		CONFIG_SYS_AMASK7,
+#ifdef CFG_SYS_AMASK7
+		CFG_SYS_AMASK7,
 #else
 		0,
 #endif
-		CONFIG_SYS_CSOR7,
-#ifdef CONFIG_SYS_CSOR7_EXT
-		CONFIG_SYS_CSOR7_EXT,
+		CFG_SYS_CSOR7,
+#ifdef CFG_SYS_CSOR7_EXT
+		CFG_SYS_CSOR7_EXT,
 #else
 		0,
 #endif
 		{
-			CONFIG_SYS_CS7_FTIM0,
-			CONFIG_SYS_CS7_FTIM1,
-			CONFIG_SYS_CS7_FTIM2,
-			CONFIG_SYS_CS7_FTIM3,
+			CFG_SYS_CS7_FTIM0,
+			CFG_SYS_CS7_FTIM1,
+			CFG_SYS_CS7_FTIM2,
+			CFG_SYS_CS7_FTIM3,
 		},
-#ifdef CONFIG_SYS_CSPR7_FINAL
-		CONFIG_SYS_CSPR7_FINAL,
+#ifdef CFG_SYS_CSPR7_FINAL
+		CFG_SYS_CSPR7_FINAL,
 #else
 		0,
 #endif
-#ifdef CONFIG_SYS_AMASK7_FINAL
-		CONFIG_SYS_AMASK7_FINAL,
+#ifdef CFG_SYS_AMASK7_FINAL
+		CFG_SYS_AMASK7_FINAL,
 #else
 		0,
 #endif
@@ -412,91 +412,91 @@ void init_final_memctl_regs(void)
 #else
 void init_early_memctl_regs(void)
 {
-#if defined(CONFIG_SYS_CSPR0) && defined(CONFIG_SYS_CSOR0)
-	set_ifc_ftim(IFC_CS0, IFC_FTIM0, CONFIG_SYS_CS0_FTIM0);
-	set_ifc_ftim(IFC_CS0, IFC_FTIM1, CONFIG_SYS_CS0_FTIM1);
-	set_ifc_ftim(IFC_CS0, IFC_FTIM2, CONFIG_SYS_CS0_FTIM2);
-	set_ifc_ftim(IFC_CS0, IFC_FTIM3, CONFIG_SYS_CS0_FTIM3);
+#if defined(CFG_SYS_CSPR0) && defined(CFG_SYS_CSOR0)
+	set_ifc_ftim(IFC_CS0, IFC_FTIM0, CFG_SYS_CS0_FTIM0);
+	set_ifc_ftim(IFC_CS0, IFC_FTIM1, CFG_SYS_CS0_FTIM1);
+	set_ifc_ftim(IFC_CS0, IFC_FTIM2, CFG_SYS_CS0_FTIM2);
+	set_ifc_ftim(IFC_CS0, IFC_FTIM3, CFG_SYS_CS0_FTIM3);
 
 #ifndef CONFIG_A003399_NOR_WORKAROUND
-#ifdef CONFIG_SYS_CSPR0_EXT
-	set_ifc_cspr_ext(IFC_CS0, CONFIG_SYS_CSPR0_EXT);
+#ifdef CFG_SYS_CSPR0_EXT
+	set_ifc_cspr_ext(IFC_CS0, CFG_SYS_CSPR0_EXT);
 #endif
-#ifdef CONFIG_SYS_CSOR0_EXT
-	set_ifc_csor_ext(IFC_CS0, CONFIG_SYS_CSOR0_EXT);
+#ifdef CFG_SYS_CSOR0_EXT
+	set_ifc_csor_ext(IFC_CS0, CFG_SYS_CSOR0_EXT);
 #endif
-	set_ifc_cspr(IFC_CS0, CONFIG_SYS_CSPR0);
-	set_ifc_amask(IFC_CS0, CONFIG_SYS_AMASK0);
-	set_ifc_csor(IFC_CS0, CONFIG_SYS_CSOR0);
+	set_ifc_cspr(IFC_CS0, CFG_SYS_CSPR0);
+	set_ifc_amask(IFC_CS0, CFG_SYS_AMASK0);
+	set_ifc_csor(IFC_CS0, CFG_SYS_CSOR0);
 #endif
 #endif
 
-#ifdef CONFIG_SYS_CSPR1_EXT
-	set_ifc_cspr_ext(IFC_CS1, CONFIG_SYS_CSPR1_EXT);
+#ifdef CFG_SYS_CSPR1_EXT
+	set_ifc_cspr_ext(IFC_CS1, CFG_SYS_CSPR1_EXT);
 #endif
-#ifdef CONFIG_SYS_CSOR1_EXT
-	set_ifc_csor_ext(IFC_CS1, CONFIG_SYS_CSOR1_EXT);
+#ifdef CFG_SYS_CSOR1_EXT
+	set_ifc_csor_ext(IFC_CS1, CFG_SYS_CSOR1_EXT);
 #endif
-#if defined(CONFIG_SYS_CSPR1) && defined(CONFIG_SYS_CSOR1)
-	set_ifc_ftim(IFC_CS1, IFC_FTIM0, CONFIG_SYS_CS1_FTIM0);
-	set_ifc_ftim(IFC_CS1, IFC_FTIM1, CONFIG_SYS_CS1_FTIM1);
-	set_ifc_ftim(IFC_CS1, IFC_FTIM2, CONFIG_SYS_CS1_FTIM2);
-	set_ifc_ftim(IFC_CS1, IFC_FTIM3, CONFIG_SYS_CS1_FTIM3);
+#if defined(CFG_SYS_CSPR1) && defined(CFG_SYS_CSOR1)
+	set_ifc_ftim(IFC_CS1, IFC_FTIM0, CFG_SYS_CS1_FTIM0);
+	set_ifc_ftim(IFC_CS1, IFC_FTIM1, CFG_SYS_CS1_FTIM1);
+	set_ifc_ftim(IFC_CS1, IFC_FTIM2, CFG_SYS_CS1_FTIM2);
+	set_ifc_ftim(IFC_CS1, IFC_FTIM3, CFG_SYS_CS1_FTIM3);
 
-	set_ifc_csor(IFC_CS1, CONFIG_SYS_CSOR1);
-	set_ifc_amask(IFC_CS1, CONFIG_SYS_AMASK1);
-	set_ifc_cspr(IFC_CS1, CONFIG_SYS_CSPR1);
+	set_ifc_csor(IFC_CS1, CFG_SYS_CSOR1);
+	set_ifc_amask(IFC_CS1, CFG_SYS_AMASK1);
+	set_ifc_cspr(IFC_CS1, CFG_SYS_CSPR1);
 #endif
 
-#ifdef CONFIG_SYS_CSPR2_EXT
-	set_ifc_cspr_ext(IFC_CS2, CONFIG_SYS_CSPR2_EXT);
+#ifdef CFG_SYS_CSPR2_EXT
+	set_ifc_cspr_ext(IFC_CS2, CFG_SYS_CSPR2_EXT);
 #endif
-#ifdef CONFIG_SYS_CSOR2_EXT
-	set_ifc_csor_ext(IFC_CS2, CONFIG_SYS_CSOR2_EXT);
+#ifdef CFG_SYS_CSOR2_EXT
+	set_ifc_csor_ext(IFC_CS2, CFG_SYS_CSOR2_EXT);
 #endif
-#if defined(CONFIG_SYS_CSPR2) && defined(CONFIG_SYS_CSOR2)
-	set_ifc_ftim(IFC_CS2, IFC_FTIM0, CONFIG_SYS_CS2_FTIM0);
-	set_ifc_ftim(IFC_CS2, IFC_FTIM1, CONFIG_SYS_CS2_FTIM1);
-	set_ifc_ftim(IFC_CS2, IFC_FTIM2, CONFIG_SYS_CS2_FTIM2);
-	set_ifc_ftim(IFC_CS2, IFC_FTIM3, CONFIG_SYS_CS2_FTIM3);
+#if defined(CFG_SYS_CSPR2) && defined(CFG_SYS_CSOR2)
+	set_ifc_ftim(IFC_CS2, IFC_FTIM0, CFG_SYS_CS2_FTIM0);
+	set_ifc_ftim(IFC_CS2, IFC_FTIM1, CFG_SYS_CS2_FTIM1);
+	set_ifc_ftim(IFC_CS2, IFC_FTIM2, CFG_SYS_CS2_FTIM2);
+	set_ifc_ftim(IFC_CS2, IFC_FTIM3, CFG_SYS_CS2_FTIM3);
 
-	set_ifc_csor(IFC_CS2, CONFIG_SYS_CSOR2);
-	set_ifc_amask(IFC_CS2, CONFIG_SYS_AMASK2);
-	set_ifc_cspr(IFC_CS2, CONFIG_SYS_CSPR2);
+	set_ifc_csor(IFC_CS2, CFG_SYS_CSOR2);
+	set_ifc_amask(IFC_CS2, CFG_SYS_AMASK2);
+	set_ifc_cspr(IFC_CS2, CFG_SYS_CSPR2);
 #endif
 
-#ifdef CONFIG_SYS_CSPR3_EXT
-	set_ifc_cspr_ext(IFC_CS3, CONFIG_SYS_CSPR3_EXT);
+#ifdef CFG_SYS_CSPR3_EXT
+	set_ifc_cspr_ext(IFC_CS3, CFG_SYS_CSPR3_EXT);
 #endif
-#ifdef CONFIG_SYS_CSOR3_EXT
-	set_ifc_csor_ext(IFC_CS3, CONFIG_SYS_CSOR3_EXT);
+#ifdef CFG_SYS_CSOR3_EXT
+	set_ifc_csor_ext(IFC_CS3, CFG_SYS_CSOR3_EXT);
 #endif
-#if defined(CONFIG_SYS_CSPR3) && defined(CONFIG_SYS_CSOR3)
-	set_ifc_ftim(IFC_CS3, IFC_FTIM0, CONFIG_SYS_CS3_FTIM0);
-	set_ifc_ftim(IFC_CS3, IFC_FTIM1, CONFIG_SYS_CS3_FTIM1);
-	set_ifc_ftim(IFC_CS3, IFC_FTIM2, CONFIG_SYS_CS3_FTIM2);
-	set_ifc_ftim(IFC_CS3, IFC_FTIM3, CONFIG_SYS_CS3_FTIM3);
+#if defined(CFG_SYS_CSPR3) && defined(CFG_SYS_CSOR3)
+	set_ifc_ftim(IFC_CS3, IFC_FTIM0, CFG_SYS_CS3_FTIM0);
+	set_ifc_ftim(IFC_CS3, IFC_FTIM1, CFG_SYS_CS3_FTIM1);
+	set_ifc_ftim(IFC_CS3, IFC_FTIM2, CFG_SYS_CS3_FTIM2);
+	set_ifc_ftim(IFC_CS3, IFC_FTIM3, CFG_SYS_CS3_FTIM3);
 
-	set_ifc_cspr(IFC_CS3, CONFIG_SYS_CSPR3);
-	set_ifc_amask(IFC_CS3, CONFIG_SYS_AMASK3);
-	set_ifc_csor(IFC_CS3, CONFIG_SYS_CSOR3);
+	set_ifc_cspr(IFC_CS3, CFG_SYS_CSPR3);
+	set_ifc_amask(IFC_CS3, CFG_SYS_AMASK3);
+	set_ifc_csor(IFC_CS3, CFG_SYS_CSOR3);
 #endif
 
-#ifdef CONFIG_SYS_CSPR4_EXT
-	set_ifc_cspr_ext(IFC_CS4, CONFIG_SYS_CSPR4_EXT);
+#ifdef CFG_SYS_CSPR4_EXT
+	set_ifc_cspr_ext(IFC_CS4, CFG_SYS_CSPR4_EXT);
 #endif
-#ifdef CONFIG_SYS_CSOR4_EXT
-	set_ifc_csor_ext(IFC_CS4, CONFIG_SYS_CSOR4_EXT);
+#ifdef CFG_SYS_CSOR4_EXT
+	set_ifc_csor_ext(IFC_CS4, CFG_SYS_CSOR4_EXT);
 #endif
-#if defined(CONFIG_SYS_CSPR4) && defined(CONFIG_SYS_CSOR4)
-	set_ifc_ftim(IFC_CS4, IFC_FTIM0, CONFIG_SYS_CS4_FTIM0);
-	set_ifc_ftim(IFC_CS4, IFC_FTIM1, CONFIG_SYS_CS4_FTIM1);
-	set_ifc_ftim(IFC_CS4, IFC_FTIM2, CONFIG_SYS_CS4_FTIM2);
-	set_ifc_ftim(IFC_CS4, IFC_FTIM3, CONFIG_SYS_CS4_FTIM3);
+#if defined(CFG_SYS_CSPR4) && defined(CFG_SYS_CSOR4)
+	set_ifc_ftim(IFC_CS4, IFC_FTIM0, CFG_SYS_CS4_FTIM0);
+	set_ifc_ftim(IFC_CS4, IFC_FTIM1, CFG_SYS_CS4_FTIM1);
+	set_ifc_ftim(IFC_CS4, IFC_FTIM2, CFG_SYS_CS4_FTIM2);
+	set_ifc_ftim(IFC_CS4, IFC_FTIM3, CFG_SYS_CS4_FTIM3);
 
-	set_ifc_cspr(IFC_CS4, CONFIG_SYS_CSPR4);
-	set_ifc_amask(IFC_CS4, CONFIG_SYS_AMASK4);
-	set_ifc_csor(IFC_CS4, CONFIG_SYS_CSOR4);
+	set_ifc_cspr(IFC_CS4, CFG_SYS_CSPR4);
+	set_ifc_amask(IFC_CS4, CFG_SYS_AMASK4);
+	set_ifc_csor(IFC_CS4, CFG_SYS_CSOR4);
 #endif
 
 #ifdef CONFIG_SYS_CSPR5_EXT
@@ -516,66 +516,66 @@ void init_early_memctl_regs(void)
 	set_ifc_csor(IFC_CS5, CONFIG_SYS_CSOR5);
 #endif
 
-#ifdef CONFIG_SYS_CSPR6_EXT
-	set_ifc_cspr_ext(IFC_CS6, CONFIG_SYS_CSPR6_EXT);
+#ifdef CFG_SYS_CSPR6_EXT
+	set_ifc_cspr_ext(IFC_CS6, CFG_SYS_CSPR6_EXT);
 #endif
-#ifdef CONFIG_SYS_CSOR6_EXT
-	set_ifc_csor_ext(IFC_CS6, CONFIG_SYS_CSOR6_EXT);
+#ifdef CFG_SYS_CSOR6_EXT
+	set_ifc_csor_ext(IFC_CS6, CFG_SYS_CSOR6_EXT);
 #endif
-#if defined(CONFIG_SYS_CSPR6) && defined(CONFIG_SYS_CSOR6)
-	set_ifc_ftim(IFC_CS6, IFC_FTIM0, CONFIG_SYS_CS6_FTIM0);
-	set_ifc_ftim(IFC_CS6, IFC_FTIM1, CONFIG_SYS_CS6_FTIM1);
-	set_ifc_ftim(IFC_CS6, IFC_FTIM2, CONFIG_SYS_CS6_FTIM2);
-	set_ifc_ftim(IFC_CS6, IFC_FTIM3, CONFIG_SYS_CS6_FTIM3);
+#if defined(CFG_SYS_CSPR6) && defined(CFG_SYS_CSOR6)
+	set_ifc_ftim(IFC_CS6, IFC_FTIM0, CFG_SYS_CS6_FTIM0);
+	set_ifc_ftim(IFC_CS6, IFC_FTIM1, CFG_SYS_CS6_FTIM1);
+	set_ifc_ftim(IFC_CS6, IFC_FTIM2, CFG_SYS_CS6_FTIM2);
+	set_ifc_ftim(IFC_CS6, IFC_FTIM3, CFG_SYS_CS6_FTIM3);
 
-	set_ifc_cspr(IFC_CS6, CONFIG_SYS_CSPR6);
-	set_ifc_amask(IFC_CS6, CONFIG_SYS_AMASK6);
-	set_ifc_csor(IFC_CS6, CONFIG_SYS_CSOR6);
+	set_ifc_cspr(IFC_CS6, CFG_SYS_CSPR6);
+	set_ifc_amask(IFC_CS6, CFG_SYS_AMASK6);
+	set_ifc_csor(IFC_CS6, CFG_SYS_CSOR6);
 #endif
 
-#ifdef CONFIG_SYS_CSPR7_EXT
-	set_ifc_cspr_ext(IFC_CS7, CONFIG_SYS_CSPR7_EXT);
+#ifdef CFG_SYS_CSPR7_EXT
+	set_ifc_cspr_ext(IFC_CS7, CFG_SYS_CSPR7_EXT);
 #endif
-#ifdef CONFIG_SYS_CSOR7_EXT
-	set_ifc_csor_ext(IFC_CS7, CONFIG_SYS_CSOR7_EXT);
+#ifdef CFG_SYS_CSOR7_EXT
+	set_ifc_csor_ext(IFC_CS7, CFG_SYS_CSOR7_EXT);
 #endif
-#if defined(CONFIG_SYS_CSPR7) && defined(CONFIG_SYS_CSOR7)
-	set_ifc_ftim(IFC_CS7, IFC_FTIM0, CONFIG_SYS_CS7_FTIM0);
-	set_ifc_ftim(IFC_CS7, IFC_FTIM1, CONFIG_SYS_CS7_FTIM1);
-	set_ifc_ftim(IFC_CS7, IFC_FTIM2, CONFIG_SYS_CS7_FTIM2);
-	set_ifc_ftim(IFC_CS7, IFC_FTIM3, CONFIG_SYS_CS7_FTIM3);
+#if defined(CFG_SYS_CSPR7) && defined(CFG_SYS_CSOR7)
+	set_ifc_ftim(IFC_CS7, IFC_FTIM0, CFG_SYS_CS7_FTIM0);
+	set_ifc_ftim(IFC_CS7, IFC_FTIM1, CFG_SYS_CS7_FTIM1);
+	set_ifc_ftim(IFC_CS7, IFC_FTIM2, CFG_SYS_CS7_FTIM2);
+	set_ifc_ftim(IFC_CS7, IFC_FTIM3, CFG_SYS_CS7_FTIM3);
 
-	set_ifc_cspr(IFC_CS7, CONFIG_SYS_CSPR7);
-	set_ifc_amask(IFC_CS7, CONFIG_SYS_AMASK7);
-	set_ifc_csor(IFC_CS7, CONFIG_SYS_CSOR7);
+	set_ifc_cspr(IFC_CS7, CFG_SYS_CSPR7);
+	set_ifc_amask(IFC_CS7, CFG_SYS_AMASK7);
+	set_ifc_csor(IFC_CS7, CFG_SYS_CSOR7);
 #endif
 }
 
 void init_final_memctl_regs(void)
 {
-#ifdef CONFIG_SYS_CSPR0_FINAL
-	set_ifc_cspr(IFC_CS0, CONFIG_SYS_CSPR0_FINAL);
+#ifdef CFG_SYS_CSPR0_FINAL
+	set_ifc_cspr(IFC_CS0, CFG_SYS_CSPR0_FINAL);
 #endif
-#ifdef CONFIG_SYS_AMASK0_FINAL
-	set_ifc_amask(IFC_CS0, CONFIG_SYS_AMASK0);
+#ifdef CFG_SYS_AMASK0_FINAL
+	set_ifc_amask(IFC_CS0, CFG_SYS_AMASK0);
 #endif
-#ifdef CONFIG_SYS_CSPR1_FINAL
-	set_ifc_cspr(IFC_CS1, CONFIG_SYS_CSPR1_FINAL);
+#ifdef CFG_SYS_CSPR1_FINAL
+	set_ifc_cspr(IFC_CS1, CFG_SYS_CSPR1_FINAL);
 #endif
-#ifdef CONFIG_SYS_AMASK1_FINAL
-	set_ifc_amask(IFC_CS1, CONFIG_SYS_AMASK1_FINAL);
+#ifdef CFG_SYS_AMASK1_FINAL
+	set_ifc_amask(IFC_CS1, CFG_SYS_AMASK1_FINAL);
 #endif
-#ifdef CONFIG_SYS_CSPR2_FINAL
-	set_ifc_cspr(IFC_CS2, CONFIG_SYS_CSPR2_FINAL);
+#ifdef CFG_SYS_CSPR2_FINAL
+	set_ifc_cspr(IFC_CS2, CFG_SYS_CSPR2_FINAL);
 #endif
-#ifdef CONFIG_SYS_AMASK2_FINAL
-	set_ifc_amask(IFC_CS2, CONFIG_SYS_AMASK2);
+#ifdef CFG_SYS_AMASK2_FINAL
+	set_ifc_amask(IFC_CS2, CFG_SYS_AMASK2);
 #endif
-#ifdef CONFIG_SYS_CSPR3_FINAL
-	set_ifc_cspr(IFC_CS3, CONFIG_SYS_CSPR3_FINAL);
+#ifdef CFG_SYS_CSPR3_FINAL
+	set_ifc_cspr(IFC_CS3, CFG_SYS_CSPR3_FINAL);
 #endif
-#ifdef CONFIG_SYS_AMASK3_FINAL
-	set_ifc_amask(IFC_CS3, CONFIG_SYS_AMASK3);
+#ifdef CFG_SYS_AMASK3_FINAL
+	set_ifc_amask(IFC_CS3, CFG_SYS_AMASK3);
 #endif
 }
 #endif
diff --git a/drivers/misc/fsl_portals.c b/drivers/misc/fsl_portals.c
index 30a9409e5ab..6b831281e96 100644
--- a/drivers/misc/fsl_portals.c
+++ b/drivers/misc/fsl_portals.c
@@ -20,25 +20,25 @@
 #endif
 #include <fsl_qbman.h>
 
-#define MAX_BPORTALS (CONFIG_SYS_BMAN_CINH_SIZE / CONFIG_SYS_BMAN_SP_CINH_SIZE)
-#define MAX_QPORTALS (CONFIG_SYS_QMAN_CINH_SIZE / CONFIG_SYS_QMAN_SP_CINH_SIZE)
+#define MAX_BPORTALS (CFG_SYS_BMAN_CINH_SIZE / CFG_SYS_BMAN_SP_CINH_SIZE)
+#define MAX_QPORTALS (CFG_SYS_QMAN_CINH_SIZE / CFG_SYS_QMAN_SP_CINH_SIZE)
 void setup_qbman_portals(void)
 {
-	void __iomem *bpaddr = (void *)CONFIG_SYS_BMAN_CINH_BASE +
-				CONFIG_SYS_BMAN_SWP_ISDR_REG;
-	void __iomem *qpaddr = (void *)CONFIG_SYS_QMAN_CINH_BASE +
-				CONFIG_SYS_QMAN_SWP_ISDR_REG;
+	void __iomem *bpaddr = (void *)CFG_SYS_BMAN_CINH_BASE +
+				CFG_SYS_BMAN_SWP_ISDR_REG;
+	void __iomem *qpaddr = (void *)CFG_SYS_QMAN_CINH_BASE +
+				CFG_SYS_QMAN_SWP_ISDR_REG;
 	struct ccsr_qman *qman = (void *)CFG_SYS_FSL_QMAN_ADDR;
 
 	/* Set the Qman initiator BAR to match the LAW (for DQRR stashing) */
 #ifdef CONFIG_PHYS_64BIT
-	out_be32(&qman->qcsp_bare, (u32)(CONFIG_SYS_QMAN_MEM_PHYS >> 32));
+	out_be32(&qman->qcsp_bare, (u32)(CFG_SYS_QMAN_MEM_PHYS >> 32));
 #endif
-	out_be32(&qman->qcsp_bar, (u32)CONFIG_SYS_QMAN_MEM_PHYS);
+	out_be32(&qman->qcsp_bar, (u32)CFG_SYS_QMAN_MEM_PHYS);
 #ifdef CONFIG_FSL_CORENET
 	int i;
 
-	for (i = 0; i < CONFIG_SYS_QMAN_NUM_PORTALS; i++) {
+	for (i = 0; i < CFG_SYS_QMAN_NUM_PORTALS; i++) {
 		u8 sdest = qp_info[i].sdest;
 		u16 fliodn = qp_info[i].fliodn;
 		u16 dliodn = qp_info[i].dliodn;
@@ -53,7 +53,7 @@ void setup_qbman_portals(void)
 #if defined(CONFIG_ARCH_LS1043A) || defined(CONFIG_ARCH_LS1046A)
 	int i;
 
-	for (i = 0; i < CONFIG_SYS_QMAN_NUM_PORTALS; i++) {
+	for (i = 0; i < CFG_SYS_QMAN_NUM_PORTALS; i++) {
 		u8 sdest = qp_info[i].sdest;
 		u16 ficid = qp_info[i].ficid;
 		u16 dicid = qp_info[i].dicid;
@@ -68,10 +68,10 @@ void setup_qbman_portals(void)
 #endif
 
 	/* Change default state of BMan ISDR portals to all 1s */
-	inhibit_portals(bpaddr, CONFIG_SYS_BMAN_NUM_PORTALS, MAX_BPORTALS,
-			CONFIG_SYS_BMAN_SP_CINH_SIZE);
-	inhibit_portals(qpaddr, CONFIG_SYS_QMAN_NUM_PORTALS, MAX_QPORTALS,
-			CONFIG_SYS_QMAN_SP_CINH_SIZE);
+	inhibit_portals(bpaddr, CFG_SYS_BMAN_NUM_PORTALS, MAX_BPORTALS,
+			CFG_SYS_BMAN_SP_CINH_SIZE);
+	inhibit_portals(qpaddr, CFG_SYS_QMAN_NUM_PORTALS, MAX_QPORTALS,
+			CFG_SYS_QMAN_SP_CINH_SIZE);
 }
 
 void inhibit_portals(void __iomem *addr, int max_portals,
@@ -257,7 +257,7 @@ defined(CONFIG_ARCH_LS1046A)
 #endif
 
 #ifdef CONFIG_SYS_DPAA_FMAN
-		for (j = 0; j < CONFIG_SYS_NUM_FMAN; j++) {
+		for (j = 0; j < CFG_SYS_NUM_FMAN; j++) {
 			char name[] = "fman@0";
 
 			name[sizeof(name) - 2] = '0' + j;
diff --git a/drivers/misc/fsl_sec_mon.c b/drivers/misc/fsl_sec_mon.c
index 321bd27fd32..3597ee22242 100644
--- a/drivers/misc/fsl_sec_mon.c
+++ b/drivers/misc/fsl_sec_mon.c
@@ -10,7 +10,7 @@
 static u32 get_sec_mon_state(void)
 {
 	struct ccsr_sec_mon_regs *sec_mon_regs = (void *)
-						(CONFIG_SYS_SEC_MON_ADDR);
+						(CFG_SYS_SEC_MON_ADDR);
 	return sec_mon_in32(&sec_mon_regs->hp_stat) & HPSR_SSM_ST_MASK;
 }
 
@@ -19,7 +19,7 @@ static int set_sec_mon_state_non_sec(void)
 	u32 sts;
 	int timeout = 10;
 	struct ccsr_sec_mon_regs *sec_mon_regs = (void *)
-						(CONFIG_SYS_SEC_MON_ADDR);
+						(CFG_SYS_SEC_MON_ADDR);
 
 	sts = get_sec_mon_state();
 
@@ -120,7 +120,7 @@ static int set_sec_mon_state_soft_fail(void)
 	u32 sts;
 	int timeout = 10;
 	struct ccsr_sec_mon_regs *sec_mon_regs = (void *)
-						(CONFIG_SYS_SEC_MON_ADDR);
+						(CFG_SYS_SEC_MON_ADDR);
 
 	printf("SEC_MON state transitioning to Soft Fail.\n");
 	sec_mon_setbits32(&sec_mon_regs->hp_com, HPCOMR_SW_FSV);
diff --git a/drivers/misc/gsc.c b/drivers/misc/gsc.c
index ec24ca807b0..65c9c2c6ce3 100644
--- a/drivers/misc/gsc.c
+++ b/drivers/misc/gsc.c
@@ -77,7 +77,7 @@ enum {
 	GSC_SC_RST_CAUSE_MAX		= 10,
 };
 
-#if (IS_ENABLED(CONFIG_DM_I2C))
+#if CONFIG_IS_ENABLED(DM_I2C)
 
 struct gsc_priv {
 	int gscver;