diff mbox

[U-Boot,3/3] dm: mips: Fix warnings in lb60 board

Message ID 1343415515-17755-3-git-send-email-marex@denx.de
State Accepted
Commit 9a16f310c0182e0744341b85c43ec8c4f50ae4dc
Delegated to: Daniel Schwierzeck
Headers show

Commit Message

Marek Vasut July 27, 2012, 6:58 p.m. UTC
The lb60 board accesses the clkgr register, which is 32bit via
16bit IO ops. This causes malfunction. Fix this.

qi_lb60.c: In function ‘cpm_init’:
qi_lb60.c:72:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
qi_lb60.c:84:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Daniel <zpxu@ingenic.cn>
Cc: Shinya Kuribayashi <skuribay@pobox.com>
Cc: Xiangfu Liu <xiangfu@openmobilefree.net>
---
 board/qi/qi_lb60/qi_lb60.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Daniel Schwierzeck Aug. 19, 2012, 6:19 p.m. UTC | #1
2012/7/27 Marek Vasut <marex@denx.de>:
> The lb60 board accesses the clkgr register, which is 32bit via
> 16bit IO ops. This causes malfunction. Fix this.
>
> qi_lb60.c: In function ‘cpm_init’:
> qi_lb60.c:72:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
> qi_lb60.c:84:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Daniel <zpxu@ingenic.cn>
> Cc: Shinya Kuribayashi <skuribay@pobox.com>
> Cc: Xiangfu Liu <xiangfu@openmobilefree.net>
> ---
>  board/qi/qi_lb60/qi_lb60.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

applied to u-boot-mips/master, thanks
Xiangfu Liu Aug. 20, 2012, 5:37 a.m. UTC | #2
Thanks Marek Vasu, Daniel Schwierzeck,

Xiangfu

On 08/20/2012 02:19 AM, Daniel Schwierzeck wrote:
> 2012/7/27 Marek Vasut <marex@denx.de>:
>> The lb60 board accesses the clkgr register, which is 32bit via
>> 16bit IO ops. This causes malfunction. Fix this.
>>
>> qi_lb60.c: In function ‘cpm_init’:
>> qi_lb60.c:72:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
>> qi_lb60.c:84:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
>>
>> Signed-off-by: Marek Vasut <marex@denx.de>
>> Cc: Daniel <zpxu@ingenic.cn>
>> Cc: Shinya Kuribayashi <skuribay@pobox.com>
>> Cc: Xiangfu Liu <xiangfu@openmobilefree.net>
>> ---
>>   board/qi/qi_lb60/qi_lb60.c |    4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> applied to u-boot-mips/master, thanks
>
diff mbox

Patch

diff --git a/board/qi/qi_lb60/qi_lb60.c b/board/qi/qi_lb60/qi_lb60.c
index 3583d01..d975209 100644
--- a/board/qi/qi_lb60/qi_lb60.c
+++ b/board/qi/qi_lb60/qi_lb60.c
@@ -69,7 +69,7 @@  static void gpio_init(void)
 static void cpm_init(void)
 {
 	struct jz4740_cpm *cpm = (struct jz4740_cpm *)JZ4740_CPM_BASE;
-	uint32_t reg = readw(&cpm->clkgr);
+	uint32_t reg = readl(&cpm->clkgr);
 
 	reg |=	CPM_CLKGR_IPU |
 		CPM_CLKGR_CIM |
@@ -81,7 +81,7 @@  static void cpm_init(void)
 		CPM_CLKGR_UDC |
 		CPM_CLKGR_AIC1;
 
-	writew(reg, &cpm->clkgr);
+	writel(reg, &cpm->clkgr);
 }
 
 int board_early_init_f(void)