V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

ARM: UniPhier: use <linux/sizes.h> for readability 

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
This commit is contained in:
Masahiro Yamada 2015-01-21 15:27:46 +09:00
parent ee94ee3464
commit 4a35d60718
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
arch/arm/include/asm/arch-uniphier/sg-regs.h
View File

@ -101,6 +101,7 @@
#else #else
#include <linux/types.h> #include <linux/types.h>
#include <linux/sizes.h>
#include <asm/io.h> #include <asm/io.h>
static inline void sg_set_pinsel(int n, int value) static inline void sg_set_pinsel(int n, int value)
@ -111,23 +112,23 @@ static inline void sg_set_pinsel(int n, int value)
static inline u32 sg_memconf_val_ch0(unsigned long size, int num) static inline u32 sg_memconf_val_ch0(unsigned long size, int num)
{ {
int size_mb = (size >> 20) / num; int size_mb = size / num;
u32 ret; u32 ret;
switch (size_mb) { switch (size_mb) {
case 64: case SZ_64M:
ret = SG_MEMCONF_CH0_SIZE_64MB; ret = SG_MEMCONF_CH0_SIZE_64MB;
break; break;
case 128: case SZ_128M:
ret = SG_MEMCONF_CH0_SIZE_128MB; ret = SG_MEMCONF_CH0_SIZE_128MB;
break; break;
case 256: case SZ_256M:
ret = SG_MEMCONF_CH0_SIZE_256MB; ret = SG_MEMCONF_CH0_SIZE_256MB;
break; break;
case 512: case SZ_512M:
ret = SG_MEMCONF_CH0_SIZE_512MB; ret = SG_MEMCONF_CH0_SIZE_512MB;
break; break;
case 1024: case SZ_1G:
ret = SG_MEMCONF_CH0_SIZE_1024MB; ret = SG_MEMCONF_CH0_SIZE_1024MB;
break; break;
default: default:
@ -151,23 +152,23 @@ static inline u32 sg_memconf_val_ch0(unsigned long size, int num)
static inline u32 sg_memconf_val_ch1(unsigned long size, int num) static inline u32 sg_memconf_val_ch1(unsigned long size, int num)
{ {
int size_mb = (size >> 20) / num; int size_mb = size / num;
u32 ret; u32 ret;
switch (size_mb) { switch (size_mb) {
case 64: case SZ_64M:
ret = SG_MEMCONF_CH1_SIZE_64MB; ret = SG_MEMCONF_CH1_SIZE_64MB;
break; break;
case 128: case SZ_128M:
ret = SG_MEMCONF_CH1_SIZE_128MB; ret = SG_MEMCONF_CH1_SIZE_128MB;
break; break;
case 256: case SZ_256M:
ret = SG_MEMCONF_CH1_SIZE_256MB; ret = SG_MEMCONF_CH1_SIZE_256MB;
break; break;
case 512: case SZ_512M:
ret = SG_MEMCONF_CH1_SIZE_512MB; ret = SG_MEMCONF_CH1_SIZE_512MB;
break; break;
case 1024: case SZ_1G:
ret = SG_MEMCONF_CH1_SIZE_1024MB; ret = SG_MEMCONF_CH1_SIZE_1024MB;
break; break;
default: default: