qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

driver: ram: rockchip: rename sdram_common.* to sdram.* 

Change-Id: Idc6edee2906297d3ab681a36dc58c79283c0eb57
Signed-off-by: YouMin Chen <cym@rock-chips.com>
This commit is contained in:
YouMin Chen 2019-03-07 17:31:43 +08:00
parent 451da917c9
commit e1f97ec39a
25 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/include/asm/arch-rockchip/sdram_common.h → arch/arm/include/asm/arch-rockchip/sdram.h
View File

@ -4,8 +4,8 @@
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
#ifndef _ASM_ARCH_SDRAM_COMMON_H #ifndef _ASM_ARCH_SDRAM_H
#define _ASM_ARCH_SDRAM_COMMON_H #define _ASM_ARCH_SDRAM_H
enum { enum {
DDR4 = 0, DDR4 = 0,

2
arch/arm/mach-rockchip/Makefile
View File

@ -35,7 +35,7 @@ obj-$(CONFIG_ROCKCHIP_DEBUGGER) += rockchip_debugger.o
endif endif
obj-$(CONFIG_$(SPL_TPL_)RAM) += param.o obj-$(CONFIG_$(SPL_TPL_)RAM) += param.o
obj-$(CONFIG_$(SPL_TPL_)RAM) += sdram_common.o obj-$(CONFIG_$(SPL_TPL_)RAM) += sdram.o
obj-$(CONFIG_ROCKCHIP_PX30) += px30/ obj-$(CONFIG_ROCKCHIP_PX30) += px30/
obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036/ obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036/

2
arch/arm/mach-rockchip/rk3036/sdram_rk3036.c
View File

@ -770,7 +770,7 @@ int sdram_init(void)
#if !CONFIG_IS_ENABLED(RAM) #if !CONFIG_IS_ENABLED(RAM)
/* /*
* When CONFIG_RAM is enabled, the dram_init() function is implemented * When CONFIG_RAM is enabled, the dram_init() function is implemented
* in sdram_common.c. * in sdram.c.
*/ */
int dram_init(void) int dram_init(void)
{ {

2
arch/arm/mach-rockchip/rk3066/sdram_rk3066.c
View File

@ -22,7 +22,7 @@
#include <asm/arch/grf_rk3066.h> #include <asm/arch/grf_rk3066.h>
#include <asm/arch/pmu_rk3188.h> #include <asm/arch/pmu_rk3188.h>
#include <asm/arch/sdram_rk3288.h> #include <asm/arch/sdram_rk3288.h>
#include <asm/arch/sdram_common.h> #include <asm/arch/sdram.h>
#include <linux/err.h> #include <linux/err.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;

2
arch/arm/mach-rockchip/rv1108/rv1108.c
View File

@ -7,7 +7,7 @@
#include <common.h> #include <common.h>
#include <asm/io.h> #include <asm/io.h>
#include <ram.h> #include <ram.h>
#include <asm/arch/sdram_common.h> #include <asm/arch/sdram.h>
#include <asm/arch/hardware.h> #include <asm/arch/hardware.h>
#include <asm/arch/grf_rv1108.h> #include <asm/arch/grf_rv1108.h>

2
arch/arm/mach-rockchip/sdram_common.c → arch/arm/mach-rockchip/sdram.c
View File

@ -11,7 +11,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/param.h> #include <asm/arch/param.h>
#include <asm/arch/rk_atags.h> #include <asm/arch/rk_atags.h>
#include <asm/arch/sdram_common.h> #include <asm/arch/sdram.h>
#include <dm/uclass-internal.h> #include <dm/uclass-internal.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;

2
arch/arm/mach-rockchip/spl.c
View File

@ -13,7 +13,7 @@
#ifdef CONFIG_ROCKCHIP_PRELOADER_ATAGS #ifdef CONFIG_ROCKCHIP_PRELOADER_ATAGS
#include <asm/arch/rk_atags.h> #include <asm/arch/rk_atags.h>
#endif #endif
#include <asm/arch/sdram_common.h> #include <asm/arch/sdram.h>
#include <asm/arch-rockchip/sys_proto.h> #include <asm/arch-rockchip/sys_proto.h>
#include <asm/io.h> #include <asm/io.h>

2
cmd/ddr_tool/ddr_test_px30.S
View File

@ -1813,7 +1813,7 @@ _u_boot_list_2_cmd_2_ddr_test:
.file 35 "include/iomux.h" .file 35 "include/iomux.h"
.file 36 "include/log.h" .file 36 "include/log.h"
.file 37 "include/stdio.h" .file 37 "include/stdio.h"
.file 38 "./arch/arm/include/asm/arch/sdram_common.h" .file 38 "./arch/arm/include/asm/arch/sdram.h"
.file 39 "cmd/ddr_tool/../memtester/io_map.h" .file 39 "cmd/ddr_tool/../memtester/io_map.h"
.file 40 "cmd/ddr_tool/../memtester/ddr_tester_common.h" .file 40 "cmd/ddr_tool/../memtester/ddr_tester_common.h"
.file 41 "include/vsprintf.h" .file 41 "include/vsprintf.h"

2
cmd/ddr_tool/ddr_test_rk1808.S
View File

@ -1603,7 +1603,7 @@ _u_boot_list_2_cmd_2_ddr_test:
.file 33 "include/console.h" .file 33 "include/console.h"
.file 34 "include/log.h" .file 34 "include/log.h"
.file 35 "include/stdio.h" .file 35 "include/stdio.h"
.file 36 "./arch/arm/include/asm/arch/sdram_common.h" .file 36 "./arch/arm/include/asm/arch/sdram.h"
.file 37 "cmd/ddr_tool/../memtester/io_map.h" .file 37 "cmd/ddr_tool/../memtester/io_map.h"
.file 38 "cmd/ddr_tool/../memtester/ddr_tester_common.h" .file 38 "cmd/ddr_tool/../memtester/ddr_tester_common.h"
.file 39 "include/vsprintf.h" .file 39 "include/vsprintf.h"

2
cmd/ddr_tool/ddr_test_rk3328.S
View File

@ -1813,7 +1813,7 @@ _u_boot_list_2_cmd_2_ddr_test:
.file 35 "include/iomux.h" .file 35 "include/iomux.h"
.file 36 "include/log.h" .file 36 "include/log.h"
.file 37 "include/stdio.h" .file 37 "include/stdio.h"
.file 38 "./arch/arm/include/asm/arch/sdram_common.h" .file 38 "./arch/arm/include/asm/arch/sdram.h"
.file 39 "cmd/ddr_tool/../memtester/io_map.h" .file 39 "cmd/ddr_tool/../memtester/io_map.h"
.file 40 "cmd/ddr_tool/../memtester/ddr_tester_common.h" .file 40 "cmd/ddr_tool/../memtester/ddr_tester_common.h"
.file 41 "include/vsprintf.h" .file 41 "include/vsprintf.h"

2
cmd/memtester/io_map.c
View File

@ -4,7 +4,7 @@
*/ */
#include <common.h> #include <common.h>
#include <asm/arch/sdram_common.h> #include <asm/arch/sdram.h>
#include "io_map.h" #include "io_map.h"
#define IO_TYPE_1_1_16 0 /* up1 1:1 mode 16bit */ #define IO_TYPE_1_1_16 0 /* up1 1:1 mode 16bit */

2
drivers/ram/rockchip/dmc-rk3368.c
View File

@ -18,7 +18,7 @@
#include <asm/arch/grf_rk3368.h> #include <asm/arch/grf_rk3368.h>
#include <asm/arch/ddr_rk3368.h> #include <asm/arch/ddr_rk3368.h>
#include <asm/arch/sdram_rk3288.h> #include <asm/arch/sdram_rk3288.h>
#include <asm/arch/sdram_common.h> #include <asm/arch/sdram.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;

2
drivers/ram/rockchip/rockchip_sdram.c
View File

@ -14,7 +14,7 @@
#include <asm/arch/grf_rk3036.h> #include <asm/arch/grf_rk3036.h>
#include <asm/arch/grf_rk3308.h> #include <asm/arch/grf_rk3308.h>
#include <asm/arch/rockchip_dmc.h> #include <asm/arch/rockchip_dmc.h>
#include <asm/arch/sdram_common.h> #include <asm/arch/sdram.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;

2
drivers/ram/rockchip/sdram_pctl_px30.c
View File

@ -6,7 +6,7 @@
#include <common.h> #include <common.h>
#include <ram.h> #include <ram.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/sdram_common.h> #include <asm/arch/sdram.h>
#include <asm/arch/sdram_pctl_px30.h> #include <asm/arch/sdram_pctl_px30.h>
/* /*

2
drivers/ram/rockchip/sdram_phy_px30.c
View File

@ -6,7 +6,7 @@
#include <common.h> #include <common.h>
#include <ram.h> #include <ram.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/sdram_common.h> #include <asm/arch/sdram.h>
#include <asm/arch/sdram_share.h> #include <asm/arch/sdram_share.h>
#include <asm/arch/sdram_phy_px30.h> #include <asm/arch/sdram_phy_px30.h>

2
drivers/ram/rockchip/sdram_px30.c
View File

@ -13,7 +13,7 @@
#include <asm/arch/cru_px30.h> #include <asm/arch/cru_px30.h>
#include <asm/arch/grf_px30.h> #include <asm/arch/grf_px30.h>
#include <asm/arch/hardware.h> #include <asm/arch/hardware.h>
#include <asm/arch/sdram_common.h> #include <asm/arch/sdram.h>
#include <asm/arch/sdram_px30.h> #include <asm/arch/sdram_px30.h>
/* /*

2
drivers/ram/rockchip/sdram_rk3128.c
View File

@ -10,7 +10,7 @@
#include <syscon.h> #include <syscon.h>
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
#include <asm/arch/grf_rk3128.h> #include <asm/arch/grf_rk3128.h>
#include <asm/arch/sdram_common.h> #include <asm/arch/sdram.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
struct dram_info { struct dram_info {

2
drivers/ram/rockchip/sdram_rk3188.c
View File

@ -22,7 +22,7 @@
#include <asm/arch/grf_rk3188.h> #include <asm/arch/grf_rk3188.h>
#include <asm/arch/pmu_rk3188.h> #include <asm/arch/pmu_rk3188.h>
#include <asm/arch/sdram_rk3288.h> #include <asm/arch/sdram_rk3288.h>
#include <asm/arch/sdram_common.h> #include <asm/arch/sdram.h>
#include <linux/err.h> #include <linux/err.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;

2
drivers/ram/rockchip/sdram_rk322x.c
View File

@ -18,7 +18,7 @@
#include <asm/arch/hardware.h> #include <asm/arch/hardware.h>
#include <asm/arch/sdram_rk322x.h> #include <asm/arch/sdram_rk322x.h>
#include <asm/arch/uart.h> #include <asm/arch/uart.h>
#include <asm/arch/sdram_common.h> #include <asm/arch/sdram.h>
#include <asm/types.h> #include <asm/types.h>
#include <linux/err.h> #include <linux/err.h>

2
drivers/ram/rockchip/sdram_rk3288.c
View File

@ -22,7 +22,7 @@
#include <asm/arch/grf_rk3288.h> #include <asm/arch/grf_rk3288.h>
#include <asm/arch/pmu_rk3288.h> #include <asm/arch/pmu_rk3288.h>
#include <asm/arch/sdram_rk3288.h> #include <asm/arch/sdram_rk3288.h>
#include <asm/arch/sdram_common.h> #include <asm/arch/sdram.h>
#include <linux/err.h> #include <linux/err.h>
#include <power/regulator.h> #include <power/regulator.h>
#include <power/rk8xx_pmic.h> #include <power/rk8xx_pmic.h>

2
drivers/ram/rockchip/sdram_rk3328.c
View File

@ -16,7 +16,7 @@
#include <asm/arch/cru_rk3328.h> #include <asm/arch/cru_rk3328.h>
#include <asm/arch/grf_rk3328.h> #include <asm/arch/grf_rk3328.h>
#include <asm/arch/rockchip_dmc.h> #include <asm/arch/rockchip_dmc.h>
#include <asm/arch/sdram_common.h> #include <asm/arch/sdram.h>
#include <asm/arch/sdram_rk3328.h> #include <asm/arch/sdram_rk3328.h>
#include <asm/arch/uart.h> #include <asm/arch/uart.h>

2
drivers/ram/rockchip/sdram_rk3399.c
View File

@ -15,7 +15,7 @@
#include <syscon.h> #include <syscon.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
#include <asm/arch/sdram_common.h> #include <asm/arch/sdram.h>
#include <asm/arch/sdram_rk3399.h> #include <asm/arch/sdram_rk3399.h>
#include <asm/arch/cru_rk3399.h> #include <asm/arch/cru_rk3399.h>
#include <asm/arch/grf_rk3399.h> #include <asm/arch/grf_rk3399.h>

2
drivers/ram/rockchip/sdram_rv1108.c
View File

@ -13,7 +13,7 @@
#include <asm/arch/hardware.h> #include <asm/arch/hardware.h>
#include <asm/arch/sdram_rv1108.h> #include <asm/arch/sdram_rv1108.h>
#include <asm/arch/timer.h> #include <asm/arch/timer.h>
#include <asm/arch/sdram_common.h> #include <asm/arch/sdram.h>
struct dram_info info; struct dram_info info;

2
drivers/ram/rockchip/sdram_rv1108_pctl_phy.c
View File

@ -14,7 +14,7 @@
#include <asm/arch/hardware.h> #include <asm/arch/hardware.h>
#include <asm/arch/sdram_rv1108_pctl_phy.h> #include <asm/arch/sdram_rv1108_pctl_phy.h>
#include <asm/arch/timer.h> #include <asm/arch/timer.h>
#include <asm/arch/sdram_common.h> #include <asm/arch/sdram.h>
#if defined(CONFIG_ROCKCHIP_RV1108) #if defined(CONFIG_ROCKCHIP_RV1108)
#include <asm/arch/sdram_rv1108.h> #include <asm/arch/sdram_rv1108.h>

2
drivers/ram/rockchip/sdram_share.c
View File

@ -7,7 +7,7 @@
#include <debug_uart.h> #include <debug_uart.h>
#include <ram.h> #include <ram.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/sdram_common.h> #include <asm/arch/sdram.h>
#include <asm/arch/sdram_share.h> #include <asm/arch/sdram_share.h>
void sdram_print_dram_type(unsigned char dramtype) void sdram_print_dram_type(unsigned char dramtype)