* [U-Boot] [PATCH V2] imx-common: consider mux_ctrl_ofs when setting mux_mode
@ 2015-09-23 3:13 Peng Fan
2015-09-23 7:51 ` Stefano Babic
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Peng Fan @ 2015-09-23 3:13 UTC (permalink / raw)
To: u-boot
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.
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Cc: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
---
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(-)
diff --git a/arch/arm/imx-common/iomux-v3.c b/arch/arm/imx-common/iomux-v3.c
index 9b9cf58..228d5f8 100644
--- a/arch/arm/imx-common/iomux-v3.c
+++ b/arch/arm/imx-common/iomux-v3.c
@@ -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);
--
1.8.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* [U-Boot] [PATCH V2] imx-common: consider mux_ctrl_ofs when setting mux_mode
2015-09-23 3:13 [U-Boot] [PATCH V2] imx-common: consider mux_ctrl_ofs when setting mux_mode Peng Fan
@ 2015-09-23 7:51 ` Stefano Babic
2015-09-23 20:48 ` Benoît Thébaudeau
2015-09-24 9:28 ` Stefano Babic
2 siblings, 0 replies; 4+ messages in thread
From: Stefano Babic @ 2015-09-23 7:51 UTC (permalink / raw)
To: u-boot
Hi Peng,
On 23/09/2015 05:13, Peng Fan wrote:
> 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.
>
> Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
> Cc: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Fabio Estevam <fabio.estevam@freescale.com>
> ---
>
> 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(-)
>
> diff --git a/arch/arm/imx-common/iomux-v3.c b/arch/arm/imx-common/iomux-v3.c
> index 9b9cf58..228d5f8 100644
> --- a/arch/arm/imx-common/iomux-v3.c
> +++ b/arch/arm/imx-common/iomux-v3.c
> @@ -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);
>
Acked-by: Stefano Babic <sbabic@denx.de>
Best regards,
Stefano Babic
--
=====================================================================
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
=====================================================================
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH V2] imx-common: consider mux_ctrl_ofs when setting mux_mode
2015-09-23 3:13 [U-Boot] [PATCH V2] imx-common: consider mux_ctrl_ofs when setting mux_mode Peng Fan
2015-09-23 7:51 ` Stefano Babic
@ 2015-09-23 20:48 ` Benoît Thébaudeau
2015-09-24 9:28 ` Stefano Babic
2 siblings, 0 replies; 4+ messages in thread
From: Benoît Thébaudeau @ 2015-09-23 20:48 UTC (permalink / raw)
To: u-boot
Hi Peng,
On Wed, Sep 23, 2015 at 5:13 AM, Peng Fan <Peng.Fan@freescale.com> wrote:
> 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.
>
> "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.
>
> Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
> Cc: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Fabio Estevam <fabio.estevam@freescale.com>
> ---
>
> 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(-)
>
> diff --git a/arch/arm/imx-common/iomux-v3.c b/arch/arm/imx-common/iomux-v3.c
> index 9b9cf58..228d5f8 100644
> --- a/arch/arm/imx-common/iomux-v3.c
> +++ b/arch/arm/imx-common/iomux-v3.c
> @@ -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);
> --
> 1.8.4
Reviewed-by: Beno?t Th?baudeau <benoit.thebaudeau.dev@gmail.com>
Best regards,
Beno?t
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH V2] imx-common: consider mux_ctrl_ofs when setting mux_mode
2015-09-23 3:13 [U-Boot] [PATCH V2] imx-common: consider mux_ctrl_ofs when setting mux_mode Peng Fan
2015-09-23 7:51 ` Stefano Babic
2015-09-23 20:48 ` Benoît Thébaudeau
@ 2015-09-24 9:28 ` Stefano Babic
2 siblings, 0 replies; 4+ messages in thread
From: Stefano Babic @ 2015-09-24 9:28 UTC (permalink / raw)
To: u-boot
On 23/09/2015 05:13, Peng Fan wrote:
> 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.
>
> Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
> Cc: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Fabio Estevam <fabio.estevam@freescale.com>
> ---
>
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
--
=====================================================================
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
=====================================================================
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-09-24 9:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-23 3:13 [U-Boot] [PATCH V2] imx-common: consider mux_ctrl_ofs when setting mux_mode Peng Fan
2015-09-23 7:51 ` Stefano Babic
2015-09-23 20:48 ` Benoît Thébaudeau
2015-09-24 9:28 ` Stefano Babic
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox