[U-Boot] [PATCH] MX31: Removed warnings for iomux function
Removed warnings generated in the mx31_set_pad() function.
Signed-off-by: Stefano Babic sbabic@denx.de --- arch/arm/cpu/arm1136/mx31/generic.c | 2 +- arch/arm/include/asm/arch-mx31/mx31.h | 1 + 2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/arm/cpu/arm1136/mx31/generic.c b/arch/arm/cpu/arm1136/mx31/generic.c index cbe8243..db5d3f0 100644 --- a/arch/arm/cpu/arm1136/mx31/generic.c +++ b/arch/arm/cpu/arm1136/mx31/generic.c @@ -97,7 +97,7 @@ void mx31_set_pad(enum iomux_pins pin, u32 config) void *reg;
pin &= IOMUX_PADNUM_MASK; - reg = (IOMUXC_BASE + 0x154) + (pin + 2) / 3 * 4; + reg = (void *)((IOMUXC_BASE + 0x154) + (pin + 2) / 3 * 4); field = (pin + 2) % 3;
l = __raw_readl(reg); diff --git a/arch/arm/include/asm/arch-mx31/mx31.h b/arch/arm/include/asm/arch-mx31/mx31.h index 5a5aa11..a755212 100644 --- a/arch/arm/include/asm/arch-mx31/mx31.h +++ b/arch/arm/include/asm/arch-mx31/mx31.h @@ -27,6 +27,7 @@ extern u32 mx31_get_ipg_clk(void); #define imx_get_uartclk mx31_get_ipg_clk extern void mx31_gpio_mux(unsigned long mode); +extern void mx31_set_pad(enum iomux_pins pin, u32 config);
void mx31_uart1_hw_init(void); void mx31_spi2_hw_init(void);
Hi, Stefano,
-----Original Message----- From: u-boot-bounces@lists.denx.de
[mailto:u-boot-bounces@lists.denx.de]
On Behalf Of Stefano Babic Sent: Tuesday, October 19, 2010 3:24 PM To: u-boot@lists.denx.de Subject: [U-Boot] [PATCH] MX31: Removed warnings for iomux function
Removed warnings generated in the mx31_set_pad() function.
Signed-off-by: Stefano Babic sbabic@denx.de
arch/arm/cpu/arm1136/mx31/generic.c | 2 +- arch/arm/include/asm/arch-mx31/mx31.h | 1 + 2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/arm/cpu/arm1136/mx31/generic.c b/arch/arm/cpu/arm1136/mx31/generic.c index cbe8243..db5d3f0 100644 --- a/arch/arm/cpu/arm1136/mx31/generic.c +++ b/arch/arm/cpu/arm1136/mx31/generic.c @@ -97,7 +97,7 @@ void mx31_set_pad(enum iomux_pins pin, u32 config) void *reg;
pin &= IOMUX_PADNUM_MASK;
- reg = (IOMUXC_BASE + 0x154) + (pin + 2) / 3 * 4;
- reg = (void *)((IOMUXC_BASE + 0x154) + (pin + 2) / 3 * 4);
Any reason we need define void *reg here?
I also found there is some mess for register read/write in this file, for example,
arch/arm/cpu/arm1136/mx31/generic.c:
In function: mx31_gpio_mux unsigned long reg, shift, tmp; tmp = __REG(reg);
while in function: mx31_set_pad u32 field, l; void *reg; l = __raw_readl(reg);
We need take the same code-style, right?
field = (pin + 2) % 3;
l = __raw_readl(reg); diff --git a/arch/arm/include/asm/arch-mx31/mx31.h b/arch/arm/include/asm/arch-mx31/mx31.h index 5a5aa11..a755212 100644 --- a/arch/arm/include/asm/arch-mx31/mx31.h +++ b/arch/arm/include/asm/arch-mx31/mx31.h @@ -27,6 +27,7 @@ extern u32 mx31_get_ipg_clk(void); #define imx_get_uartclk mx31_get_ipg_clk extern void mx31_gpio_mux(unsigned long mode); +extern void mx31_set_pad(enum iomux_pins pin, u32 config);
void mx31_uart1_hw_init(void); void mx31_spi2_hw_init(void); -- 1.7.1
U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Removed warnings generated in the mx31_set_pad() function.
Signed-off-by: Stefano Babic sbabic@denx.de --- arch/arm/cpu/arm1136/mx31/generic.c | 7 +++---- arch/arm/include/asm/arch-mx31/mx31.h | 1 + 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/cpu/arm1136/mx31/generic.c b/arch/arm/cpu/arm1136/mx31/generic.c index cbe8243..8bd23ee 100644 --- a/arch/arm/cpu/arm1136/mx31/generic.c +++ b/arch/arm/cpu/arm1136/mx31/generic.c @@ -93,17 +93,16 @@ void mx31_gpio_mux(unsigned long mode)
void mx31_set_pad(enum iomux_pins pin, u32 config) { - u32 field, l; - void *reg; + u32 field, l, reg;
pin &= IOMUX_PADNUM_MASK; reg = (IOMUXC_BASE + 0x154) + (pin + 2) / 3 * 4; field = (pin + 2) % 3;
- l = __raw_readl(reg); + l = __REG(reg); l &= ~(0x1ff << (field * 10)); l |= config << (field * 10); - __raw_writel(l, reg); + __REG(reg) = l;
}
diff --git a/arch/arm/include/asm/arch-mx31/mx31.h b/arch/arm/include/asm/arch-mx31/mx31.h index 5a5aa11..a755212 100644 --- a/arch/arm/include/asm/arch-mx31/mx31.h +++ b/arch/arm/include/asm/arch-mx31/mx31.h @@ -27,6 +27,7 @@ extern u32 mx31_get_ipg_clk(void); #define imx_get_uartclk mx31_get_ipg_clk extern void mx31_gpio_mux(unsigned long mode); +extern void mx31_set_pad(enum iomux_pins pin, u32 config);
void mx31_uart1_hw_init(void); void mx31_spi2_hw_init(void);
Dear Stefano Babic,
In message 1287512353-31194-1-git-send-email-sbabic@denx.de you wrote:
Removed warnings generated in the mx31_set_pad() function.
Signed-off-by: Stefano Babic sbabic@denx.de
arch/arm/cpu/arm1136/mx31/generic.c | 7 +++---- arch/arm/include/asm/arch-mx31/mx31.h | 1 + 2 files changed, 4 insertions(+), 4 deletions(-)
Applied directly, hope this is OK with you.
Best regards,
Wolfgang Denk
participants (3)
-
Liu Hui-R64343 -
Stefano Babic -
Wolfgang Denk