[U-Boot] [PATCH 0/4] move rockchip sdram driver to driver/ram
move all the Rockchip sdram driver which support CONFIG_RAM into driver/ram folder
Kever Yang (4): rockchip: rk3399: move sdram driver to driver/ram rockchip: rk3188: move sdram driver to driver/ram rockchip: rk3288: move sdram driver to driver/ram rockchip: rk3328: move sdram driver to driver/ram
arch/arm/mach-rockchip/rk3188/Makefile | 1 - arch/arm/mach-rockchip/rk3288/Makefile | 1 - arch/arm/mach-rockchip/rk3328/Makefile | 1 - arch/arm/mach-rockchip/rk3399/Makefile | 1 - drivers/ram/rockchip/Makefile | 4 ++++ .../arm/mach-rockchip/rk3188 => drivers/ram/rockchip}/sdram_rk3188.c | 0 .../arm/mach-rockchip/rk3288 => drivers/ram/rockchip}/sdram_rk3288.c | 0 .../arm/mach-rockchip/rk3328 => drivers/ram/rockchip}/sdram_rk3328.c | 0 .../arm/mach-rockchip/rk3399 => drivers/ram/rockchip}/sdram_rk3399.c | 0 9 files changed, 4 insertions(+), 4 deletions(-) rename {arch/arm/mach-rockchip/rk3188 => drivers/ram/rockchip}/sdram_rk3188.c (100%) rename {arch/arm/mach-rockchip/rk3288 => drivers/ram/rockchip}/sdram_rk3288.c (100%) rename {arch/arm/mach-rockchip/rk3328 => drivers/ram/rockchip}/sdram_rk3328.c (100%) rename {arch/arm/mach-rockchip/rk3399 => drivers/ram/rockchip}/sdram_rk3399.c (100%)
Since we have CONFIG_RAM framwork and its driver folder, move the driver into it.
Signed-off-by: Kever Yang kever.yang@rock-chips.com ---
arch/arm/mach-rockchip/rk3399/Makefile | 1 - drivers/ram/rockchip/Makefile | 1 + {arch/arm/mach-rockchip/rk3399 => drivers/ram/rockchip}/sdram_rk3399.c | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename {arch/arm/mach-rockchip/rk3399 => drivers/ram/rockchip}/sdram_rk3399.c (100%)
diff --git a/arch/arm/mach-rockchip/rk3399/Makefile b/arch/arm/mach-rockchip/rk3399/Makefile index 793ce31..98ebeac 100644 --- a/arch/arm/mach-rockchip/rk3399/Makefile +++ b/arch/arm/mach-rockchip/rk3399/Makefile @@ -6,5 +6,4 @@
obj-y += clk_rk3399.o obj-y += rk3399.o -obj-y += sdram_rk3399.o obj-y += syscon_rk3399.o diff --git a/drivers/ram/rockchip/Makefile b/drivers/ram/rockchip/Makefile index 06ab2fd..52cc809 100644 --- a/drivers/ram/rockchip/Makefile +++ b/drivers/ram/rockchip/Makefile @@ -6,3 +6,4 @@
obj-$(CONFIG_ROCKCHIP_RK3368) = dmc-rk3368.o obj-$(CONFIG_ROCKCHIP_RK322X) = sdram_rk322x.o +obj-$(CONFIG_ROCKCHIP_RK3399) = sdram_rk3399.o diff --git a/arch/arm/mach-rockchip/rk3399/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c similarity index 100% rename from arch/arm/mach-rockchip/rk3399/sdram_rk3399.c rename to drivers/ram/rockchip/sdram_rk3399.c
Since we have CONFIG_RAM framwork and its driver folder, move the driver into it.
Signed-off-by: Kever Yang kever.yang@rock-chips.com
arch/arm/mach-rockchip/rk3399/Makefile | 1 - drivers/ram/rockchip/Makefile | 1 + {arch/arm/mach-rockchip/rk3399 => drivers/ram/rockchip}/sdram_rk3399.c | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename {arch/arm/mach-rockchip/rk3399 => drivers/ram/rockchip}/sdram_rk3399.c (100%)
Acked-by: Philipp Tomsich philipp.tomsich@theobroma-systems.com
Since we have CONFIG_RAM framwork and its driver folder, move the driver into it.
Signed-off-by: Kever Yang kever.yang@rock-chips.com
arch/arm/mach-rockchip/rk3399/Makefile | 1 - drivers/ram/rockchip/Makefile | 1 + {arch/arm/mach-rockchip/rk3399 => drivers/ram/rockchip}/sdram_rk3399.c | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename {arch/arm/mach-rockchip/rk3399 => drivers/ram/rockchip}/sdram_rk3399.c (100%)
Reviewed-by: Philipp Tomsich philipp.tomsich@theobroma-systems.com
Since we have CONFIG_RAM framwork and its driver folder, move the driver into it.
Signed-off-by: Kever Yang kever.yang@rock-chips.com ---
arch/arm/mach-rockchip/rk3188/Makefile | 1 - drivers/ram/rockchip/Makefile | 1 + {arch/arm/mach-rockchip/rk3188 => drivers/ram/rockchip}/sdram_rk3188.c | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename {arch/arm/mach-rockchip/rk3188 => drivers/ram/rockchip}/sdram_rk3188.c (100%)
diff --git a/arch/arm/mach-rockchip/rk3188/Makefile b/arch/arm/mach-rockchip/rk3188/Makefile index 2dc9511..7fa0104 100644 --- a/arch/arm/mach-rockchip/rk3188/Makefile +++ b/arch/arm/mach-rockchip/rk3188/Makefile @@ -6,6 +6,5 @@
ifndef CONFIG_TPL_BUILD obj-y += clk_rk3188.o -obj-y += sdram_rk3188.o obj-y += syscon_rk3188.o endif diff --git a/drivers/ram/rockchip/Makefile b/drivers/ram/rockchip/Makefile index 52cc809..3553849 100644 --- a/drivers/ram/rockchip/Makefile +++ b/drivers/ram/rockchip/Makefile @@ -5,5 +5,6 @@ #
obj-$(CONFIG_ROCKCHIP_RK3368) = dmc-rk3368.o +obj-$(CONFIG_ROCKCHIP_RK3188) = sdram_rk3188.o obj-$(CONFIG_ROCKCHIP_RK322X) = sdram_rk322x.o obj-$(CONFIG_ROCKCHIP_RK3399) = sdram_rk3399.o diff --git a/arch/arm/mach-rockchip/rk3188/sdram_rk3188.c b/drivers/ram/rockchip/sdram_rk3188.c similarity index 100% rename from arch/arm/mach-rockchip/rk3188/sdram_rk3188.c rename to drivers/ram/rockchip/sdram_rk3188.c
Since we have CONFIG_RAM framwork and its driver folder, move the driver into it.
Signed-off-by: Kever Yang kever.yang@rock-chips.com
arch/arm/mach-rockchip/rk3188/Makefile | 1 - drivers/ram/rockchip/Makefile | 1 + {arch/arm/mach-rockchip/rk3188 => drivers/ram/rockchip}/sdram_rk3188.c | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename {arch/arm/mach-rockchip/rk3188 => drivers/ram/rockchip}/sdram_rk3188.c (100%)
Acked-by: Philipp Tomsich philipp.tomsich@theobroma-systems.com
Since we have CONFIG_RAM framwork and its driver folder, move the driver into it.
Signed-off-by: Kever Yang kever.yang@rock-chips.com
arch/arm/mach-rockchip/rk3188/Makefile | 1 - drivers/ram/rockchip/Makefile | 1 + {arch/arm/mach-rockchip/rk3188 => drivers/ram/rockchip}/sdram_rk3188.c | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename {arch/arm/mach-rockchip/rk3188 => drivers/ram/rockchip}/sdram_rk3188.c (100%)
Reviewed-by: Philipp Tomsich philipp.tomsich@theobroma-systems.com
Since we have CONFIG_RAM framwork and its driver folder, move the driver into it.
Signed-off-by: Kever Yang kever.yang@rock-chips.com ---
arch/arm/mach-rockchip/rk3288/Makefile | 1 - drivers/ram/rockchip/Makefile | 1 + {arch/arm/mach-rockchip/rk3288 => drivers/ram/rockchip}/sdram_rk3288.c | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename {arch/arm/mach-rockchip/rk3288 => drivers/ram/rockchip}/sdram_rk3288.c (100%)
diff --git a/arch/arm/mach-rockchip/rk3288/Makefile b/arch/arm/mach-rockchip/rk3288/Makefile index b5b28ef..a0033a0 100644 --- a/arch/arm/mach-rockchip/rk3288/Makefile +++ b/arch/arm/mach-rockchip/rk3288/Makefile @@ -6,5 +6,4 @@
obj-y += clk_rk3288.o obj-y += rk3288.o -obj-y += sdram_rk3288.o obj-y += syscon_rk3288.o diff --git a/drivers/ram/rockchip/Makefile b/drivers/ram/rockchip/Makefile index 3553849..bc76a20 100644 --- a/drivers/ram/rockchip/Makefile +++ b/drivers/ram/rockchip/Makefile @@ -7,4 +7,5 @@ obj-$(CONFIG_ROCKCHIP_RK3368) = dmc-rk3368.o obj-$(CONFIG_ROCKCHIP_RK3188) = sdram_rk3188.o obj-$(CONFIG_ROCKCHIP_RK322X) = sdram_rk322x.o +obj-$(CONFIG_ROCKCHIP_RK3288) = sdram_rk3288.o obj-$(CONFIG_ROCKCHIP_RK3399) = sdram_rk3399.o diff --git a/arch/arm/mach-rockchip/rk3288/sdram_rk3288.c b/drivers/ram/rockchip/sdram_rk3288.c similarity index 100% rename from arch/arm/mach-rockchip/rk3288/sdram_rk3288.c rename to drivers/ram/rockchip/sdram_rk3288.c
Since we have CONFIG_RAM framwork and its driver folder, move the driver into it.
Signed-off-by: Kever Yang kever.yang@rock-chips.com
arch/arm/mach-rockchip/rk3288/Makefile | 1 - drivers/ram/rockchip/Makefile | 1 + {arch/arm/mach-rockchip/rk3288 => drivers/ram/rockchip}/sdram_rk3288.c | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename {arch/arm/mach-rockchip/rk3288 => drivers/ram/rockchip}/sdram_rk3288.c (100%)
Acked-by: Philipp Tomsich philipp.tomsich@theobroma-systems.com
Since we have CONFIG_RAM framwork and its driver folder, move the driver into it.
Signed-off-by: Kever Yang kever.yang@rock-chips.com
arch/arm/mach-rockchip/rk3288/Makefile | 1 - drivers/ram/rockchip/Makefile | 1 + {arch/arm/mach-rockchip/rk3288 => drivers/ram/rockchip}/sdram_rk3288.c | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename {arch/arm/mach-rockchip/rk3288 => drivers/ram/rockchip}/sdram_rk3288.c (100%)
Reviewed-by: Philipp Tomsich philipp.tomsich@theobroma-systems.com
Since we have CONFIG_RAM framwork and its driver folder, move the driver into it.
Signed-off-by: Kever Yang kever.yang@rock-chips.com ---
arch/arm/mach-rockchip/rk3328/Makefile | 1 - drivers/ram/rockchip/Makefile | 1 + {arch/arm/mach-rockchip/rk3328 => drivers/ram/rockchip}/sdram_rk3328.c | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename {arch/arm/mach-rockchip/rk3328 => drivers/ram/rockchip}/sdram_rk3328.c (100%)
diff --git a/arch/arm/mach-rockchip/rk3328/Makefile b/arch/arm/mach-rockchip/rk3328/Makefile index 72873e2..bbab036 100644 --- a/arch/arm/mach-rockchip/rk3328/Makefile +++ b/arch/arm/mach-rockchip/rk3328/Makefile @@ -6,5 +6,4 @@
obj-y += clk_rk3328.o obj-y += rk3328.o -obj-y += sdram_rk3328.o obj-y += syscon_rk3328.o diff --git a/drivers/ram/rockchip/Makefile b/drivers/ram/rockchip/Makefile index bc76a20..45b5fe7 100644 --- a/drivers/ram/rockchip/Makefile +++ b/drivers/ram/rockchip/Makefile @@ -8,4 +8,5 @@ obj-$(CONFIG_ROCKCHIP_RK3368) = dmc-rk3368.o obj-$(CONFIG_ROCKCHIP_RK3188) = sdram_rk3188.o obj-$(CONFIG_ROCKCHIP_RK322X) = sdram_rk322x.o obj-$(CONFIG_ROCKCHIP_RK3288) = sdram_rk3288.o +obj-$(CONFIG_ROCKCHIP_RK3328) = sdram_rk3328.o obj-$(CONFIG_ROCKCHIP_RK3399) = sdram_rk3399.o diff --git a/arch/arm/mach-rockchip/rk3328/sdram_rk3328.c b/drivers/ram/rockchip/sdram_rk3328.c similarity index 100% rename from arch/arm/mach-rockchip/rk3328/sdram_rk3328.c rename to drivers/ram/rockchip/sdram_rk3328.c
Since we have CONFIG_RAM framwork and its driver folder, move the driver into it.
Signed-off-by: Kever Yang kever.yang@rock-chips.com
arch/arm/mach-rockchip/rk3328/Makefile | 1 - drivers/ram/rockchip/Makefile | 1 + {arch/arm/mach-rockchip/rk3328 => drivers/ram/rockchip}/sdram_rk3328.c | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename {arch/arm/mach-rockchip/rk3328 => drivers/ram/rockchip}/sdram_rk3328.c (100%)
Acked-by: Philipp Tomsich philipp.tomsich@theobroma-systems.com
Since we have CONFIG_RAM framwork and its driver folder, move the driver into it.
Signed-off-by: Kever Yang kever.yang@rock-chips.com
arch/arm/mach-rockchip/rk3328/Makefile | 1 - drivers/ram/rockchip/Makefile | 1 + {arch/arm/mach-rockchip/rk3328 => drivers/ram/rockchip}/sdram_rk3328.c | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename {arch/arm/mach-rockchip/rk3328 => drivers/ram/rockchip}/sdram_rk3328.c (100%)
Reviewed-by: Philipp Tomsich philipp.tomsich@theobroma-systems.com
Kever,
On 6 Sep 2017, at 12:00, Kever Yang kever.yang@rock-chips.com wrote:
move all the Rockchip sdram driver which support CONFIG_RAM into driver/ram folder
Kever Yang (4): rockchip: rk3399: move sdram driver to driver/ram rockchip: rk3188: move sdram driver to driver/ram rockchip: rk3288: move sdram driver to driver/ram rockchip: rk3328: move sdram driver to driver/ram
arch/arm/mach-rockchip/rk3188/Makefile | 1 - arch/arm/mach-rockchip/rk3288/Makefile | 1 - arch/arm/mach-rockchip/rk3328/Makefile | 1 - arch/arm/mach-rockchip/rk3399/Makefile | 1 - drivers/ram/rockchip/Makefile | 4 ++++
All of the patches in this series fail to apply cleanly due to a conflict in drivers/ram/rockchip/Makefile.
Could you resubmit against u-boot-rockchip/master?
Thanks, Philipp.
.../arm/mach-rockchip/rk3188 => drivers/ram/rockchip}/sdram_rk3188.c | 0 .../arm/mach-rockchip/rk3288 => drivers/ram/rockchip}/sdram_rk3288.c | 0 .../arm/mach-rockchip/rk3328 => drivers/ram/rockchip}/sdram_rk3328.c | 0 .../arm/mach-rockchip/rk3399 => drivers/ram/rockchip}/sdram_rk3399.c | 0 9 files changed, 4 insertions(+), 4 deletions(-) rename {arch/arm/mach-rockchip/rk3188 => drivers/ram/rockchip}/sdram_rk3188.c (100%) rename {arch/arm/mach-rockchip/rk3288 => drivers/ram/rockchip}/sdram_rk3288.c (100%) rename {arch/arm/mach-rockchip/rk3328 => drivers/ram/rockchip}/sdram_rk3328.c (100%) rename {arch/arm/mach-rockchip/rk3399 => drivers/ram/rockchip}/sdram_rk3399.c (100%)
-- 1.9.1
participants (3)
-
Dr. Philipp Tomsich -
Kever Yang -
Philipp Tomsich