Skip to contentSkip to conversation

imx-common: consider mux_ctrl_ofs when setting mux_mode

PATCH New Peng Fan 3 participants 4 messages Sep 23, 2015 – Sep 24, 2015

Subsystems (2)
lore
Share & tools
lore

Peng Fan

author
#0 lore raw

PATCH v2 1/1 imx-common: consider mux_ctrl_ofs when setting mux_mode

Some i.MXes use __NA_ or 0 to avoid setting mux_mode, but the following patch only take i.MX6/7 into consideration.

"c3c8a5748897b24f18618047804317167a531dd3 imx-common: fix iomux settings"

Use is_soc_type(MXC_CPU_MX7) to avoid breaking other i.MXes when setting mux_mode.

In this patch, switch to use "asm/imx-common/sys_proto.h" to avoid build break for "is_soc_type" for vf610 and mx25.

Cc Bhuvanchandra DV <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Fabio Estevam <[email protected]>

---

Changes v2:
refine commit msg, "add mx25".
use cleaner way to for setting mux code, following Beno?t's suggestion.

 arch/arm/imx-common/iomux-v3.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
arch/arm/imx-common/iomux-v3.c +3 -4
index 9b9cf58..228d5f8 100644
@@ -11,10 +11,8 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
-#if !defined(CONFIG_MX25) && !defined(CONFIG_VF610)
-#include <asm/arch/sys_proto.h>
-#endif
 #include <asm/imx-common/iomux-v3.h>
+#include <asm/imx-common/sys_proto.h>
 
 static void *base = (void *)IOMUXC_BASE_ADDR;
 
@@ -53,7 +51,8 @@ void imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad)
 	}
 #endif
 
-	__raw_writel(mux_mode, base + mux_ctrl_ofs);
+	if (is_soc_type(MXC_SOC_MX7) || mux_ctrl_ofs)
+		__raw_writel(mux_mode, base + mux_ctrl_ofs);
 
 	if (sel_input_ofs)
 		__raw_writel(sel_input, base + sel_input_ofs);
Signature · 1 line
1.8.4
#1 lore raw

PATCH v2 1/1 imx-common: consider mux_ctrl_ofs when setting mux_mode

Hi Peng,

Quoted 42 lines · Peng Fan

Some i.MXes use __NA_ or 0 to avoid setting mux_mode, but the following patch only take i.MX6/7 into consideration.

"c3c8a5748897b24f18618047804317167a531dd3 imx-common: fix iomux settings"

Use is_soc_type(MXC_CPU_MX7) to avoid breaking other i.MXes when setting mux_mode.

In this patch, switch to use "asm/imx-common/sys_proto.h" to avoid build break for "is_soc_type" for vf610 and mx25.

Cc Bhuvanchandra DV <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Fabio Estevam <[email protected]>

---

Changes v2:
refine commit msg, "add mx25".
use cleaner way to for setting mux code, following Beno?t's suggestion.

 arch/arm/imx-common/iomux-v3.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
arch/arm/imx-common/iomux-v3.c +1 -3
index 9b9cf58..228d5f8 100644
@@ -11,10 +11,8 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
-#if !defined(CONFIG_MX25) && !defined(CONFIG_VF610)
-#include <asm/arch/sys_proto.h>
-#endif
 #include <asm/imx-common/iomux-v3.h>
+#include <asm/imx-common/sys_proto.h>
 
 static void *base = (void *)IOMUXC_BASE_ADDR;
 

arch/arm/imx-common/iomux-v3.c void imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad) · line 58

Quoted 9 lines
arch/arm/imx-common/iomux-v3.c +2 -1
@@ -53,7 +51,8 @@ void imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad)
 	}
 #endif
 
-	__raw_writel(mux_mode, base + mux_ctrl_ofs);
+	if (is_soc_type(MXC_SOC_MX7) || mux_ctrl_ofs)
+		__raw_writel(mux_mode, base + mux_ctrl_ofs);
 
 	if (sel_input_ofs)
 		__raw_writel(sel_input, base + sel_input_ofs);

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#2 lore raw

PATCH v2 1/1 imx-common: consider mux_ctrl_ofs when setting mux_mode

In reply to Peng Fan

Hi Peng,

Quoted 2 lines · Peng Fan

Some i.MXes use __NA_ or 0 to avoid setting mux_mode, but the following patch only take i.MX6/7 into consideration.

Small typo that I missed to report in v1: "takes". This can probably be fixed when applying.

Quoted 49 lines

"c3c8a5748897b24f18618047804317167a531dd3 imx-common: fix iomux settings"

Use is_soc_type(MXC_CPU_MX7) to avoid breaking other i.MXes when setting mux_mode.

In this patch, switch to use "asm/imx-common/sys_proto.h" to avoid build break for "is_soc_type" for vf610 and mx25.

Cc Bhuvanchandra DV <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Fabio Estevam <[email protected]>

---

Changes v2:
refine commit msg, "add mx25".
use cleaner way to for setting mux code, following Beno?t's suggestion.

 arch/arm/imx-common/iomux-v3.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
arch/arm/imx-common/iomux-v3.c +3 -5
index 9b9cf58..228d5f8 100644
@@ -11,10 +11,8 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
-#if !defined(CONFIG_MX25) && !defined(CONFIG_VF610)
-#include <asm/arch/sys_proto.h>
-#endif
 #include <asm/imx-common/iomux-v3.h>
+#include <asm/imx-common/sys_proto.h>
 
 static void *base = (void *)IOMUXC_BASE_ADDR;
 
@@ -53,7 +51,8 @@ void imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad)
        }
 #endif
 
-       __raw_writel(mux_mode, base + mux_ctrl_ofs);
+       if (is_soc_type(MXC_SOC_MX7) || mux_ctrl_ofs)
+               __raw_writel(mux_mode, base + mux_ctrl_ofs);
 
        if (sel_input_ofs)
                __raw_writel(sel_input, base + sel_input_ofs);
--
Quoted 1 line

1.8.4

Best regards,
Beno?t

#3 lore raw

PATCH v2 1/1 imx-common: consider mux_ctrl_ofs when setting mux_mode

In reply to Peng Fan
Quoted 8 lines · Peng Fan

Some i.MXes use __NA_ or 0 to avoid setting mux_mode, but the following patch only take i.MX6/7 into consideration.

"c3c8a5748897b24f18618047804317167a531dd3 imx-common: fix iomux settings"

Use is_soc_type(MXC_CPU_MX7) to avoid breaking other i.MXes when setting mux_mode.

Quoted 9 lines

In this patch, switch to use "asm/imx-common/sys_proto.h" to avoid build break for "is_soc_type" for vf610 and mx25.

Cc Bhuvanchandra DV <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Fabio Estevam <[email protected]>

---

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================