| Message ID | 20190715182110.21336-14-jagan@amarulasolutions.com |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
On 2019/7/16 上午2:21, Jagan Teki wrote: > dramtype enum numbers as common across all dram controllers > in rockchip, so move the eneum values in common header. > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Reviewed-by: Kever Yang <Kever.yang@rock-chips.com> Thanks, - Kever > --- > arch/arm/include/asm/arch-rockchip/sdram.h | 6 ------ > arch/arm/include/asm/arch-rockchip/sdram_common.h | 8 ++++++++ > arch/arm/include/asm/arch-rockchip/sdram_rk322x.h | 7 ------- > arch/arm/include/asm/arch-rockchip/sdram_rk3399.h | 8 -------- > 4 files changed, 8 insertions(+), 21 deletions(-) > > diff --git a/arch/arm/include/asm/arch-rockchip/sdram.h b/arch/arm/include/asm/arch-rockchip/sdram.h > index bbe425deb9..9220763fa7 100644 > --- a/arch/arm/include/asm/arch-rockchip/sdram.h > +++ b/arch/arm/include/asm/arch-rockchip/sdram.h > @@ -8,12 +8,6 @@ > #ifndef _ASM_ARCH_RK3288_SDRAM_H__ > #define _ASM_ARCH_RK3288_SDRAM_H__ > > -enum { > - DDR3 = 3, > - LPDDR3 = 6, > - UNUSED = 0xFF, > -}; > - > struct rk3288_sdram_channel { > /* > * bit width in address, eg: > diff --git a/arch/arm/include/asm/arch-rockchip/sdram_common.h b/arch/arm/include/asm/arch-rockchip/sdram_common.h > index 82ce3d3fc9..55abcdae77 100644 > --- a/arch/arm/include/asm/arch-rockchip/sdram_common.h > +++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h > @@ -6,6 +6,14 @@ > #ifndef _ASM_ARCH_SDRAM_COMMON_H > #define _ASM_ARCH_SDRAM_COMMON_H > > +enum { > + DDR3 = 0x3, > + LPDDR2 = 0x5, > + LPDDR3 = 0x6, > + LPDDR4 = 0x7, > + UNUSED = 0xFF > +}; > + > struct sdram_cap_info { > unsigned int rank; > /* dram column number, 0 means this channel is invalid */ > diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h b/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h > index d0091a7aaf..336c5d7e8c 100644 > --- a/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h > +++ b/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h > @@ -7,13 +7,6 @@ > > #include <common.h> > > -enum { > - DDR3 = 3, > - LPDDR2 = 5, > - LPDDR3 = 6, > - UNUSED = 0xFF, > -}; > - > struct rk322x_sdram_channel { > /* > * bit width in address, eg: > diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h b/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h > index 65c92cf744..471702f935 100644 > --- a/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h > +++ b/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h > @@ -6,14 +6,6 @@ > #ifndef _ASM_ARCH_SDRAM_RK3399_H > #define _ASM_ARCH_SDRAM_RK3399_H > > -enum { > - DDR3 = 0x3, > - LPDDR2 = 0x5, > - LPDDR3 = 0x6, > - LPDDR4 = 0x7, > - UNUSED = 0xFF > -}; > - > struct rk3399_ddr_pctl_regs { > u32 denali_ctl[332]; > };
diff --git a/arch/arm/include/asm/arch-rockchip/sdram.h b/arch/arm/include/asm/arch-rockchip/sdram.h index bbe425deb9..9220763fa7 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram.h +++ b/arch/arm/include/asm/arch-rockchip/sdram.h @@ -8,12 +8,6 @@ #ifndef _ASM_ARCH_RK3288_SDRAM_H__ #define _ASM_ARCH_RK3288_SDRAM_H__ -enum { - DDR3 = 3, - LPDDR3 = 6, - UNUSED = 0xFF, -}; - struct rk3288_sdram_channel { /* * bit width in address, eg: diff --git a/arch/arm/include/asm/arch-rockchip/sdram_common.h b/arch/arm/include/asm/arch-rockchip/sdram_common.h index 82ce3d3fc9..55abcdae77 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_common.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h @@ -6,6 +6,14 @@ #ifndef _ASM_ARCH_SDRAM_COMMON_H #define _ASM_ARCH_SDRAM_COMMON_H +enum { + DDR3 = 0x3, + LPDDR2 = 0x5, + LPDDR3 = 0x6, + LPDDR4 = 0x7, + UNUSED = 0xFF +}; + struct sdram_cap_info { unsigned int rank; /* dram column number, 0 means this channel is invalid */ diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h b/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h index d0091a7aaf..336c5d7e8c 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h @@ -7,13 +7,6 @@ #include <common.h> -enum { - DDR3 = 3, - LPDDR2 = 5, - LPDDR3 = 6, - UNUSED = 0xFF, -}; - struct rk322x_sdram_channel { /* * bit width in address, eg: diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h b/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h index 65c92cf744..471702f935 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h @@ -6,14 +6,6 @@ #ifndef _ASM_ARCH_SDRAM_RK3399_H #define _ASM_ARCH_SDRAM_RK3399_H -enum { - DDR3 = 0x3, - LPDDR2 = 0x5, - LPDDR3 = 0x6, - LPDDR4 = 0x7, - UNUSED = 0xFF -}; - struct rk3399_ddr_pctl_regs { u32 denali_ctl[332]; };
dramtype enum numbers as common across all dram controllers in rockchip, so move the eneum values in common header. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- arch/arm/include/asm/arch-rockchip/sdram.h | 6 ------ arch/arm/include/asm/arch-rockchip/sdram_common.h | 8 ++++++++ arch/arm/include/asm/arch-rockchip/sdram_rk322x.h | 7 ------- arch/arm/include/asm/arch-rockchip/sdram_rk3399.h | 8 -------- 4 files changed, 8 insertions(+), 21 deletions(-)