Patchwork [U-Boot,v2] mx35 iomux: correct offsets of IOMUX registers

login
register
mail settings
Submitter Philip Paeps
Date April 9, 2013, 10:44 p.m.
Message ID <1365547471-5071-1-git-send-email-philip@paeps.cx>
Download mbox | patch
Permalink /patch/235269/
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show

Comments

Philip Paeps - April 9, 2013, 10:44 p.m.
This makes mxc_iomux_set_input() work correctly.  Previously, the
incorrect offset of IOMUXSW_INPUT_CTL caused mxc_iomux_set_input()
to write to the wrong register, possibly resulting in unexpected
behaviour.

Signed-off-by: Philip Paeps <philip@paeps.cx>
---
Changes in v2:
 - While here, also correct the offset of the last pad control
   register.  This is mostly cosmetic.

 arch/arm/cpu/arm1136/mx35/iomux.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Stefano Babic - April 10, 2013, 6:23 a.m.
On 10/04/2013 00:44, Philip Paeps wrote:
> This makes mxc_iomux_set_input() work correctly.  Previously, the
> incorrect offset of IOMUXSW_INPUT_CTL caused mxc_iomux_set_input()
> to write to the wrong register, possibly resulting in unexpected
> behaviour.
> 
> Signed-off-by: Philip Paeps <philip@paeps.cx>
> ---

Hi Philip,

> Changes in v2:
>  - While here, also correct the offset of the last pad control
>    register.  This is mostly cosmetic.
> 
>  arch/arm/cpu/arm1136/mx35/iomux.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/cpu/arm1136/mx35/iomux.c b/arch/arm/cpu/arm1136/mx35/iomux.c
> index a302575..698909e 100644
> --- a/arch/arm/cpu/arm1136/mx35/iomux.c
> +++ b/arch/arm/cpu/arm1136/mx35/iomux.c
> @@ -34,8 +34,8 @@ enum iomux_reg_addr {
>  	IOMUXSW_MUX_CTL = IOMUXC_BASE_ADDR + 4,		/* MUX control */
>  	IOMUXSW_MUX_END = IOMUXC_BASE_ADDR + 0x324,	/* last MUX control */
>  	IOMUXSW_PAD_CTL = IOMUXC_BASE_ADDR + 0x328,	/* Pad control */
> -	IOMUXSW_PAD_END = IOMUXC_BASE_ADDR + 0x794,	/* last Pad control */
> -	IOMUXSW_INPUT_CTL = IOMUXC_BASE_ADDR + 0x7AC,	/* input select */
> +	IOMUXSW_PAD_END = IOMUXC_BASE_ADDR + 0x7A4,	/* last Pad control */
> +	IOMUXSW_INPUT_CTL = IOMUXC_BASE_ADDR + 0x7A8,	/* input select */
>  	IOMUXSW_INPUT_END = IOMUXC_BASE_ADDR + 0x9F4,	/* last input select */
>  };

You're right, offset were wrong.

Acked-by: Stefano Babic <sbabic@denx.de>

Best regards,
Stefano Babic
Stefano Babic - April 16, 2013, 11:01 a.m.
On 10/04/2013 00:44, Philip Paeps wrote:
> This makes mxc_iomux_set_input() work correctly.  Previously, the
> incorrect offset of IOMUXSW_INPUT_CTL caused mxc_iomux_set_input()
> to write to the wrong register, possibly resulting in unexpected
> behaviour.
> 
> Signed-off-by: Philip Paeps <philip@paeps.cx>
> ---

Applied to u-boot-imx, -next branch, thanks.

Best regards,
Stefano Babic

Patch

diff --git a/arch/arm/cpu/arm1136/mx35/iomux.c b/arch/arm/cpu/arm1136/mx35/iomux.c
index a302575..698909e 100644
--- a/arch/arm/cpu/arm1136/mx35/iomux.c
+++ b/arch/arm/cpu/arm1136/mx35/iomux.c
@@ -34,8 +34,8 @@  enum iomux_reg_addr {
 	IOMUXSW_MUX_CTL = IOMUXC_BASE_ADDR + 4,		/* MUX control */
 	IOMUXSW_MUX_END = IOMUXC_BASE_ADDR + 0x324,	/* last MUX control */
 	IOMUXSW_PAD_CTL = IOMUXC_BASE_ADDR + 0x328,	/* Pad control */
-	IOMUXSW_PAD_END = IOMUXC_BASE_ADDR + 0x794,	/* last Pad control */
-	IOMUXSW_INPUT_CTL = IOMUXC_BASE_ADDR + 0x7AC,	/* input select */
+	IOMUXSW_PAD_END = IOMUXC_BASE_ADDR + 0x7A4,	/* last Pad control */
+	IOMUXSW_INPUT_CTL = IOMUXC_BASE_ADDR + 0x7A8,	/* input select */
 	IOMUXSW_INPUT_END = IOMUXC_BASE_ADDR + 0x9F4,	/* last input select */
 };