Commit 3a1e7c188db75644eb716b04e1adb6d01c266891
1 parent
e7cbfb4f2d
Exists in
smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga
and in
5 other branches
MLK-19181-6 arm: imx8m: Fix compile warning
In file included from arch/arm/mach-imx/imx8m/soc.c:11:0:
arch/arm/mach-imx/imx8m/soc.c: In function ‘imx_gpc_set_m_core_pgc’:
./arch/arm/include/asm/io.h:44:28: warning: cast to pointer from integer of differen t size [-Wint-to-pointer-cast]
#define __arch_getl(a) (*(volatile unsigned int *)(a))
^
./arch/arm/include/asm/io.h:122:31: note: in expansion of macro ‘__arch_getl’
#define readl(c) ({ u32 __v = __arch_getl(c); __iormb(); __v; })
^~~~~~~~~~~
arch/arm/mach-imx/imx8m/soc.c:427:8: note: in expansion of macro ‘readl’
val = readl(GPC_BASE_ADDR + offset);
^~~~~
./arch/arm/include/asm/io.h:49:29: warning: cast to pointer from integer of differen t size [-Wint-to-pointer-cast]
#define __arch_putl(v,a) (*(volatile unsigned int *)(a) = (v))
^
./arch/arm/include/asm/io.h:117:48: note: in expansion of macro ‘__arch_putl’
#define writel(v,c) ({ u32 __v = v; __iowmb(); __arch_putl(__v,c); __v; })
^~~~~~~~~~~
arch/arm/mach-imx/imx8m/soc.c:432:2: note: in expansion of macro ‘writel’
writel(val, GPC_BASE_ADDR + offset);
^~~~~~
arch/arm/mach-imx/imx8m/soc.c: In function ‘imx8m_usb_power’:
arch/arm/mach-imx/imx8m/soc.c:453:16: warning: unused variable ‘ret’ [-Wunused-varia ble]
unsigned long ret;
^~~
Signed-off-by: Li Jun <jun.li@nxp.com>
Showing 1 changed file with 6 additions and 8 deletions Side-by-side Diff
arch/arm/mach-imx/imx8m/soc.c
| ... | ... | @@ -422,14 +422,15 @@ |
| 422 | 422 | |
| 423 | 423 | void imx_gpc_set_m_core_pgc(unsigned int offset, bool pdn) |
| 424 | 424 | { |
| 425 | - uintptr_t val; | |
| 425 | + uint32_t val; | |
| 426 | + uintptr_t reg = GPC_BASE_ADDR + offset; | |
| 426 | 427 | |
| 427 | - val = readl(GPC_BASE_ADDR + offset); | |
| 428 | + val = readl(reg); | |
| 428 | 429 | val &= ~(0x1 << PGC_PCR); |
| 429 | 430 | |
| 430 | 431 | if(pdn) |
| 431 | 432 | val |= 0x1 << PGC_PCR; |
| 432 | - writel(val, GPC_BASE_ADDR + offset); | |
| 433 | + writel(val, reg); | |
| 433 | 434 | } |
| 434 | 435 | |
| 435 | 436 | void imx8m_usb_power_domain(uint32_t domain_id, bool on) |
| 436 | 437 | |
| ... | ... | @@ -450,16 +451,13 @@ |
| 450 | 451 | |
| 451 | 452 | int imx8m_usb_power(int usb_id, bool on) |
| 452 | 453 | { |
| 453 | - unsigned long ret; | |
| 454 | - | |
| 455 | 454 | if (usb_id > 1) |
| 456 | 455 | return -EINVAL; |
| 457 | 456 | #ifdef CONFIG_SPL_BUILD |
| 458 | 457 | imx8m_usb_power_domain(2 + usb_id, on); |
| 459 | 458 | #else |
| 460 | - ret = call_imx_sip(FSL_SIP_GPC, | |
| 461 | - FSL_SIP_CONFIG_GPC_PM_DOMAIN, 2 + usb_id, on, 0); | |
| 462 | - if (ret) | |
| 459 | + if (call_imx_sip(FSL_SIP_GPC, FSL_SIP_CONFIG_GPC_PM_DOMAIN, | |
| 460 | + 2 + usb_id, on, 0)) | |
| 463 | 461 | return -EPERM; |
| 464 | 462 | #endif |
| 465 | 463 | return 0; |