imx-common: consider mux_ctrl_ofs when setting mux_mode
Subsystems (2)
PATCH 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.
--- arch/arm/imx-common/iomux-v3.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
arch/arm/imx-common/iomux-v3.c +6 -4
@@ -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,11 @@ 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 )) +__raw_writel (mux_mode, base + mux_ctrl_ofs); +else +if (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
PATCH 1/1 imx-common: consider mux_ctrl_ofs when setting mux_mode
Hi Peng,
Quoted 10 lines · Peng Fan
Some i.MXes use
__NA_or 0 to avoid settingmux_mode, but the following patch only take i.MX6/7 into consideration."
c3c8a5748897b24f18618047804317167a531dd3imx-common: fix iomux settings"Use
is_soc_type(MXC_CPU_MX7)to avoid breaking other i.MXes when settingmux_mode.In this patch, switch to use "
asm/imx-common/sys_proto.h" to avoid build break for "is_soc_type" for vf610.
And probably for i.MX25 too.
Quoted 25 lines
Signed-off-by Peng Fan <[email protected]>Cc Bhuvanchandra DV <[email protected]>Cc Stefano Babic <[email protected]>Cc Fabio Estevam <[email protected]>--- arch/arm/imx-common/iomux-v3.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)arch/arm/imx-common/iomux-v3.c +1
-3@@ -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 +5
-1@@ -53,7 +51,11 @@ 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 )) +__raw_writel (mux_mode, base + mux_ctrl_ofs); +else +if (mux_ctrl_ofs) +__raw_writel (mux_mode, base + mux_ctrl_ofs);
Or, in order to avoid duplicating the line:
+ if (is_soc_type(MXC_SOC_MX7) || mux_ctrl_ofs)
+ __raw_writel(mux_mode, base + mux_ctrl_ofs);
Quoted 5 lines
arch/arm/imx-common/iomux-v3.c +0
-1if (sel_input_ofs)__raw_writel (sel_input, base + sel_input_ofs); --1.8.4
Best regards,
Beno?t
PATCH 1/1 imx-common: consider mux_ctrl_ofs when setting mux_mode
Hi Beno?t,
Quoted 52 lines · Beno?t Th?baudeau
Hi Peng,
Quoted 10 lines · Peng Fan
Some i.MXes use
__NA_or 0 to avoid settingmux_mode, but the following patch only take i.MX6/7 into consideration."
c3c8a5748897b24f18618047804317167a531dd3imx-common: fix iomux settings"Use
is_soc_type(MXC_CPU_MX7)to avoid breaking other i.MXes when settingmux_mode.In this patch, switch to use "
asm/imx-common/sys_proto.h" to avoid build break for "is_soc_type" for vf610.And probably for i.MX25 too.
Quoted 25 lines
Signed-off-by Peng Fan <[email protected]>Cc Bhuvanchandra DV <[email protected]>Cc Stefano Babic <[email protected]>Cc Fabio Estevam <[email protected]>--- arch/arm/imx-common/iomux-v3.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)arch/arm/imx-common/iomux-v3.c +1
-3@@ -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 +5
-1@@ -53,7 +51,11 @@ 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 )) +__raw_writel (mux_mode, base + mux_ctrl_ofs); +else +if (mux_ctrl_ofs) +__raw_writel (mux_mode, base + mux_ctrl_ofs);Or, in order to avoid duplicating the line:
Review
Quoted 2 lines
(quoted diff) +2
-0+ if (is_soc_type(MXC_SOC_MX7) || mux_ctrl_ofs) + __raw_writel(mux_mode, base + mux_ctrl_ofs);
Good. Will use this way in V2.
Thanks,
Peng.
Quoted 9 lines
Quoted 6 lines
arch/arm/imx-common/iomux-v3.c +0
-1if (sel_input_ofs)__raw_writel (sel_input, base + sel_input_ofs); --1.8.4
Best regards,
Beno?t