From e1f97ec39adccac9463624bcf83443c432cd1497 Mon Sep 17 00:00:00 2001 From: YouMin Chen Date: Thu, 7 Mar 2019 17:31:43 +0800 Subject: [PATCH] driver: ram: rockchip: rename sdram_common.* to sdram.* Change-Id: Idc6edee2906297d3ab681a36dc58c79283c0eb57 Signed-off-by: YouMin Chen --- .../arm/include/asm/arch-rockchip/{sdram_common.h => sdram.h} | 4 ++-- arch/arm/mach-rockchip/Makefile | 2 +- arch/arm/mach-rockchip/rk3036/sdram_rk3036.c | 2 +- arch/arm/mach-rockchip/rk3066/sdram_rk3066.c | 2 +- arch/arm/mach-rockchip/rv1108/rv1108.c | 2 +- arch/arm/mach-rockchip/{sdram_common.c => sdram.c} | 2 +- arch/arm/mach-rockchip/spl.c | 2 +- cmd/ddr_tool/ddr_test_px30.S | 2 +- cmd/ddr_tool/ddr_test_rk1808.S | 2 +- cmd/ddr_tool/ddr_test_rk3328.S | 2 +- cmd/memtester/io_map.c | 2 +- drivers/ram/rockchip/dmc-rk3368.c | 2 +- drivers/ram/rockchip/rockchip_sdram.c | 2 +- drivers/ram/rockchip/sdram_pctl_px30.c | 2 +- drivers/ram/rockchip/sdram_phy_px30.c | 2 +- drivers/ram/rockchip/sdram_px30.c | 2 +- drivers/ram/rockchip/sdram_rk3128.c | 2 +- drivers/ram/rockchip/sdram_rk3188.c | 2 +- drivers/ram/rockchip/sdram_rk322x.c | 2 +- drivers/ram/rockchip/sdram_rk3288.c | 2 +- drivers/ram/rockchip/sdram_rk3328.c | 2 +- drivers/ram/rockchip/sdram_rk3399.c | 2 +- drivers/ram/rockchip/sdram_rv1108.c | 2 +- drivers/ram/rockchip/sdram_rv1108_pctl_phy.c | 2 +- drivers/ram/rockchip/sdram_share.c | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) rename arch/arm/include/asm/arch-rockchip/{sdram_common.h => sdram.h} (97%) rename arch/arm/mach-rockchip/{sdram_common.c => sdram.c} (99%) diff --git a/arch/arm/include/asm/arch-rockchip/sdram_common.h b/arch/arm/include/asm/arch-rockchip/sdram.h similarity index 97% rename from arch/arm/include/asm/arch-rockchip/sdram_common.h rename to arch/arm/include/asm/arch-rockchip/sdram.h index 0d2c29916b..11d61533e1 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_common.h +++ b/arch/arm/include/asm/arch-rockchip/sdram.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: GPL-2.0+ */ -#ifndef _ASM_ARCH_SDRAM_COMMON_H -#define _ASM_ARCH_SDRAM_COMMON_H +#ifndef _ASM_ARCH_SDRAM_H +#define _ASM_ARCH_SDRAM_H enum { DDR4 = 0, diff --git a/arch/arm/mach-rockchip/Makefile b/arch/arm/mach-rockchip/Makefile index 946f32f1a1..e09b1e8be4 100644 --- a/arch/arm/mach-rockchip/Makefile +++ b/arch/arm/mach-rockchip/Makefile @@ -35,7 +35,7 @@ obj-$(CONFIG_ROCKCHIP_DEBUGGER) += rockchip_debugger.o endif 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_RK3036) += rk3036/ diff --git a/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c b/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c index 55abfd2166..d00714ff1a 100644 --- a/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c +++ b/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c @@ -770,7 +770,7 @@ int sdram_init(void) #if !CONFIG_IS_ENABLED(RAM) /* * When CONFIG_RAM is enabled, the dram_init() function is implemented - * in sdram_common.c. + * in sdram.c. */ int dram_init(void) { diff --git a/arch/arm/mach-rockchip/rk3066/sdram_rk3066.c b/arch/arm/mach-rockchip/rk3066/sdram_rk3066.c index b38e32efe5..4367ad86d4 100644 --- a/arch/arm/mach-rockchip/rk3066/sdram_rk3066.c +++ b/arch/arm/mach-rockchip/rk3066/sdram_rk3066.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/mach-rockchip/rv1108/rv1108.c b/arch/arm/mach-rockchip/rv1108/rv1108.c index e88f27f5d9..cd81758702 100644 --- a/arch/arm/mach-rockchip/rv1108/rv1108.c +++ b/arch/arm/mach-rockchip/rv1108/rv1108.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/arch/arm/mach-rockchip/sdram_common.c b/arch/arm/mach-rockchip/sdram.c similarity index 99% rename from arch/arm/mach-rockchip/sdram_common.c rename to arch/arm/mach-rockchip/sdram.c index f71aacc9cd..53e356ce60 100644 --- a/arch/arm/mach-rockchip/sdram_common.c +++ b/arch/arm/mach-rockchip/sdram.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c index 042e53ec2f..53fe711cb2 100644 --- a/arch/arm/mach-rockchip/spl.c +++ b/arch/arm/mach-rockchip/spl.c @@ -13,7 +13,7 @@ #ifdef CONFIG_ROCKCHIP_PRELOADER_ATAGS #include #endif -#include +#include #include #include diff --git a/cmd/ddr_tool/ddr_test_px30.S b/cmd/ddr_tool/ddr_test_px30.S index a6c7352e3a..a6e9854df8 100644 --- a/cmd/ddr_tool/ddr_test_px30.S +++ b/cmd/ddr_tool/ddr_test_px30.S @@ -1813,7 +1813,7 @@ _u_boot_list_2_cmd_2_ddr_test: .file 35 "include/iomux.h" .file 36 "include/log.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 40 "cmd/ddr_tool/../memtester/ddr_tester_common.h" .file 41 "include/vsprintf.h" diff --git a/cmd/ddr_tool/ddr_test_rk1808.S b/cmd/ddr_tool/ddr_test_rk1808.S index 6e8e95f038..156f79f587 100644 --- a/cmd/ddr_tool/ddr_test_rk1808.S +++ b/cmd/ddr_tool/ddr_test_rk1808.S @@ -1603,7 +1603,7 @@ _u_boot_list_2_cmd_2_ddr_test: .file 33 "include/console.h" .file 34 "include/log.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 38 "cmd/ddr_tool/../memtester/ddr_tester_common.h" .file 39 "include/vsprintf.h" diff --git a/cmd/ddr_tool/ddr_test_rk3328.S b/cmd/ddr_tool/ddr_test_rk3328.S index a6c7352e3a..a6e9854df8 100644 --- a/cmd/ddr_tool/ddr_test_rk3328.S +++ b/cmd/ddr_tool/ddr_test_rk3328.S @@ -1813,7 +1813,7 @@ _u_boot_list_2_cmd_2_ddr_test: .file 35 "include/iomux.h" .file 36 "include/log.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 40 "cmd/ddr_tool/../memtester/ddr_tester_common.h" .file 41 "include/vsprintf.h" diff --git a/cmd/memtester/io_map.c b/cmd/memtester/io_map.c index ed45a0137e..252576b2ba 100644 --- a/cmd/memtester/io_map.c +++ b/cmd/memtester/io_map.c @@ -4,7 +4,7 @@ */ #include -#include +#include #include "io_map.h" #define IO_TYPE_1_1_16 0 /* up1 1:1 mode 16bit */ diff --git a/drivers/ram/rockchip/dmc-rk3368.c b/drivers/ram/rockchip/dmc-rk3368.c index cb1a88cb82..47b92fe8f0 100644 --- a/drivers/ram/rockchip/dmc-rk3368.c +++ b/drivers/ram/rockchip/dmc-rk3368.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/ram/rockchip/rockchip_sdram.c b/drivers/ram/rockchip/rockchip_sdram.c index 437e675e30..a2ce76ed13 100644 --- a/drivers/ram/rockchip/rockchip_sdram.c +++ b/drivers/ram/rockchip/rockchip_sdram.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/ram/rockchip/sdram_pctl_px30.c b/drivers/ram/rockchip/sdram_pctl_px30.c index 247d9317b3..ff87239ce8 100644 --- a/drivers/ram/rockchip/sdram_pctl_px30.c +++ b/drivers/ram/rockchip/sdram_pctl_px30.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include /* diff --git a/drivers/ram/rockchip/sdram_phy_px30.c b/drivers/ram/rockchip/sdram_phy_px30.c index ad139d8107..d185e67b8c 100644 --- a/drivers/ram/rockchip/sdram_phy_px30.c +++ b/drivers/ram/rockchip/sdram_phy_px30.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/ram/rockchip/sdram_px30.c b/drivers/ram/rockchip/sdram_px30.c index c3f56a18be..f0a4e27089 100644 --- a/drivers/ram/rockchip/sdram_px30.c +++ b/drivers/ram/rockchip/sdram_px30.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include /* diff --git a/drivers/ram/rockchip/sdram_rk3128.c b/drivers/ram/rockchip/sdram_rk3128.c index 68b0830884..85015d4bdd 100644 --- a/drivers/ram/rockchip/sdram_rk3128.c +++ b/drivers/ram/rockchip/sdram_rk3128.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include DECLARE_GLOBAL_DATA_PTR; struct dram_info { diff --git a/drivers/ram/rockchip/sdram_rk3188.c b/drivers/ram/rockchip/sdram_rk3188.c index 3c094b8f44..0c7b3da927 100644 --- a/drivers/ram/rockchip/sdram_rk3188.c +++ b/drivers/ram/rockchip/sdram_rk3188.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/ram/rockchip/sdram_rk322x.c b/drivers/ram/rockchip/sdram_rk322x.c index 8df2039288..76f3aca6b9 100644 --- a/drivers/ram/rockchip/sdram_rk322x.c +++ b/drivers/ram/rockchip/sdram_rk322x.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/ram/rockchip/sdram_rk3288.c b/drivers/ram/rockchip/sdram_rk3288.c index 8bc58c3f58..ada28c0ca3 100644 --- a/drivers/ram/rockchip/sdram_rk3288.c +++ b/drivers/ram/rockchip/sdram_rk3288.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/ram/rockchip/sdram_rk3328.c b/drivers/ram/rockchip/sdram_rk3328.c index 1941e1c9e2..929f8bc248 100644 --- a/drivers/ram/rockchip/sdram_rk3328.c +++ b/drivers/ram/rockchip/sdram_rk3328.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index 11641468cc..def2ba3f36 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/ram/rockchip/sdram_rv1108.c b/drivers/ram/rockchip/sdram_rv1108.c index 696e24838c..0d1e2f4a59 100644 --- a/drivers/ram/rockchip/sdram_rv1108.c +++ b/drivers/ram/rockchip/sdram_rv1108.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include struct dram_info info; diff --git a/drivers/ram/rockchip/sdram_rv1108_pctl_phy.c b/drivers/ram/rockchip/sdram_rv1108_pctl_phy.c index d5b6749251..ea730703f1 100644 --- a/drivers/ram/rockchip/sdram_rv1108_pctl_phy.c +++ b/drivers/ram/rockchip/sdram_rv1108_pctl_phy.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #if defined(CONFIG_ROCKCHIP_RV1108) #include diff --git a/drivers/ram/rockchip/sdram_share.c b/drivers/ram/rockchip/sdram_share.c index 9ec9906c60..a366350ff8 100644 --- a/drivers/ram/rockchip/sdram_share.c +++ b/drivers/ram/rockchip/sdram_share.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include void sdram_print_dram_type(unsigned char dramtype)