Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-29 16:10:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

ARM: uniphier: deprecate umc_dram_init_{start, poll}

Browse source 
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2016-02-26 14:21:52 +09:00
parent 7c9cac9c22
commit a191e0dee0
4 changed files with 18 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/mach-uniphier/dram/umc-ph1-ld4.c
View file

@ -8,6 +8,7 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include <asm/processor.h>
#include "../init.h" #include "../init.h"
#include "ddrphy-regs.h" #include "ddrphy-regs.h"
@ -145,8 +146,9 @@ static int umc_ch_init(void __iomem *dc_base, void __iomem *ca_base,
void __iomem *phy_base = dc_base + 0x00001000; void __iomem *phy_base = dc_base + 0x00001000;
int ret; int ret;
umc_dram_init_start(dc_base); writel(UMC_INITSET_INIT1EN, dc_base + UMC_INITSET);
umc_dram_init_poll(dc_base); while (readl(dc_base + UMC_INITSET) & UMC_INITSTAT_INIT1ST)
cpu_relax();
writel(0x00000101, dc_base + UMC_DIOCTLA); writel(0x00000101, dc_base + UMC_DIOCTLA);

6
arch/arm/mach-uniphier/dram/umc-ph1-pro4.c
View file

@ -8,6 +8,7 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include <asm/processor.h>
#include "../init.h" #include "../init.h"
#include "ddrphy-regs.h" #include "ddrphy-regs.h"
@ -133,8 +134,9 @@ static int umc_ch_init(void __iomem *dc_base, void __iomem *ca_base,
int nr_phy = width / 16; int nr_phy = width / 16;
int phy, ret; int phy, ret;
umc_dram_init_start(dc_base); writel(UMC_INITSET_INIT1EN, dc_base + UMC_INITSET);
umc_dram_init_poll(dc_base); while (readl(dc_base + UMC_INITSET) & UMC_INITSTAT_INIT1ST)
cpu_relax();
for (phy = 0; phy < nr_phy; phy++) { for (phy = 0; phy < nr_phy; phy++) {
writel(0x00000100 | ((1 << (phy + 1)) - 1), writel(0x00000100 | ((1 << (phy + 1)) - 1),

6
arch/arm/mach-uniphier/dram/umc-ph1-sld8.c
View file

@ -8,6 +8,7 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include <asm/processor.h>
#include "../init.h" #include "../init.h"
#include "ddrphy-regs.h" #include "ddrphy-regs.h"
@ -148,8 +149,9 @@ static int umc_ch_init(void __iomem *dc_base, void __iomem *ca_base,
void __iomem *phy_base = dc_base + 0x00001000; void __iomem *phy_base = dc_base + 0x00001000;
int ret; int ret;
umc_dram_init_start(dc_base); writel(UMC_INITSET_INIT1EN, dc_base + UMC_INITSET);
umc_dram_init_poll(dc_base); while (readl(dc_base + UMC_INITSET) & UMC_INITSTAT_INIT1ST)
cpu_relax();
writel(0x00000101, dc_base + UMC_DIOCTLA); writel(0x00000101, dc_base + UMC_DIOCTLA);

23
arch/arm/mach-uniphier/dram/umc-regs.h
View file

@ -9,6 +9,8 @@
#ifndef ARCH_UMC_REGS_H #ifndef ARCH_UMC_REGS_H
#define ARCH_UMC_REGS_H #define ARCH_UMC_REGS_H
#include <linux/bitops.h>
#define UMC_CPURST 0x00000700 #define UMC_CPURST 0x00000700
#define UMC_IDSRST 0x0000070C #define UMC_IDSRST 0x0000070C
#define UMC_IXMRST 0x00000714 #define UMC_IXMRST 0x00000714
@ -46,7 +48,11 @@
#define UMC_CMDCTLA 0x00000000 #define UMC_CMDCTLA 0x00000000
#define UMC_CMDCTLB 0x00000004 #define UMC_CMDCTLB 0x00000004
#define UMC_INITSET 0x00000014 #define UMC_INITSET 0x00000014
#define UMC_INITSET_INIT1EN BIT(1) /* init without power-on wait */
#define UMC_INITSET_INIT0EN BIT(0) /* init with power-on wait */
#define UMC_INITSTAT 0x00000018 #define UMC_INITSTAT 0x00000018
#define UMC_INITSTAT_INIT1ST BIT(1) /* init without power-on wait */
#define UMC_INITSTAT_INIT0ST BIT(0) /* init with power-on wait */
#define UMC_SPCCTLA 0x00000030 #define UMC_SPCCTLA 0x00000030
#define UMC_SPCCTLB 0x00000034 #define UMC_SPCCTLB 0x00000034
#define UMC_SPCSETA 0x00000038 #define UMC_SPCSETA 0x00000038
@ -98,21 +104,4 @@
#define UMC_BITPERPIXELMODE_D0 0x010 #define UMC_BITPERPIXELMODE_D0 0x010
#define UMC_PAIR1DOFF_D0 0x054 #define UMC_PAIR1DOFF_D0 0x054
#ifndef __ASSEMBLY__
#include <linux/types.h>
static inline void umc_dram_init_start(void __iomem *dramcont)
{
writel(0x00000002, dramcont + UMC_INITSET);
}
static inline void umc_dram_init_poll(void __iomem *dramcont)
{
while ((readl(dramcont + UMC_INITSTAT) & 0x00000002))
;
}
#endif
#endif #endif