From f0768491db98249b3f54f16dd99a1d8dcdea9f2a Mon Sep 17 00:00:00 2001 From: Kever Yang Date: Wed, 27 Sep 2017 16:11:33 +0800 Subject: rockchip: rk3328: move sdram driver to driver/ram Since we have CONFIG_RAM framwork and its driver folder, move the driver into it. Signed-off-by: Kever Yang Acked-by: Philipp Tomsich Reviewed-by: Philipp Tomsich --- arch/arm/mach-rockchip/rk3328/Makefile | 1 - arch/arm/mach-rockchip/rk3328/sdram_rk3328.c | 60 ---------------------------- drivers/ram/rockchip/Makefile | 1 + drivers/ram/rockchip/sdram_rk3328.c | 60 ++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 61 deletions(-) delete mode 100644 arch/arm/mach-rockchip/rk3328/sdram_rk3328.c create mode 100644 drivers/ram/rockchip/sdram_rk3328.c diff --git a/arch/arm/mach-rockchip/rk3328/Makefile b/arch/arm/mach-rockchip/rk3328/Makefile index 72873e29e6..bbab036a12 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/arch/arm/mach-rockchip/rk3328/sdram_rk3328.c b/arch/arm/mach-rockchip/rk3328/sdram_rk3328.c deleted file mode 100644 index 9637a35e23..0000000000 --- a/arch/arm/mach-rockchip/rk3328/sdram_rk3328.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - * (C) Copyright 2017 Rockchip Electronics Co., Ltd. - * - * SPDX-License-Identifier: GPL-2.0 - */ - -#include -#include -#include -#include -#include -#include -#include - -DECLARE_GLOBAL_DATA_PTR; -struct dram_info { - struct ram_info info; - struct rk3328_grf_regs *grf; -}; - -static int rk3328_dmc_probe(struct udevice *dev) -{ - struct dram_info *priv = dev_get_priv(dev); - - priv->grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF); - debug("%s: grf=%p\n", __func__, priv->grf); - priv->info.base = CONFIG_SYS_SDRAM_BASE; - priv->info.size = rockchip_sdram_size( - (phys_addr_t)&priv->grf->os_reg[2]); - - return 0; -} - -static int rk3328_dmc_get_info(struct udevice *dev, struct ram_info *info) -{ - struct dram_info *priv = dev_get_priv(dev); - - *info = priv->info; - - return 0; -} - -static struct ram_ops rk3328_dmc_ops = { - .get_info = rk3328_dmc_get_info, -}; - - -static const struct udevice_id rk3328_dmc_ids[] = { - { .compatible = "rockchip,rk3328-dmc" }, - { } -}; - -U_BOOT_DRIVER(dmc_rk3328) = { - .name = "rockchip_rk3328_dmc", - .id = UCLASS_RAM, - .of_match = rk3328_dmc_ids, - .ops = &rk3328_dmc_ops, - .probe = rk3328_dmc_probe, - .priv_auto_alloc_size = sizeof(struct dram_info), -}; diff --git a/drivers/ram/rockchip/Makefile b/drivers/ram/rockchip/Makefile index 95aae4846b..6c78eff7fa 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_RK3288) = sdram_rk3288.o +obj-$(CONFIG_ROCKCHIP_RK3328) = sdram_rk3328.o obj-$(CONFIG_ROCKCHIP_RK3399) = sdram_rk3399.o diff --git a/drivers/ram/rockchip/sdram_rk3328.c b/drivers/ram/rockchip/sdram_rk3328.c new file mode 100644 index 0000000000..9637a35e23 --- /dev/null +++ b/drivers/ram/rockchip/sdram_rk3328.c @@ -0,0 +1,60 @@ +/* + * (C) Copyright 2017 Rockchip Electronics Co., Ltd. + * + * SPDX-License-Identifier: GPL-2.0 + */ + +#include +#include +#include +#include +#include +#include +#include + +DECLARE_GLOBAL_DATA_PTR; +struct dram_info { + struct ram_info info; + struct rk3328_grf_regs *grf; +}; + +static int rk3328_dmc_probe(struct udevice *dev) +{ + struct dram_info *priv = dev_get_priv(dev); + + priv->grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF); + debug("%s: grf=%p\n", __func__, priv->grf); + priv->info.base = CONFIG_SYS_SDRAM_BASE; + priv->info.size = rockchip_sdram_size( + (phys_addr_t)&priv->grf->os_reg[2]); + + return 0; +} + +static int rk3328_dmc_get_info(struct udevice *dev, struct ram_info *info) +{ + struct dram_info *priv = dev_get_priv(dev); + + *info = priv->info; + + return 0; +} + +static struct ram_ops rk3328_dmc_ops = { + .get_info = rk3328_dmc_get_info, +}; + + +static const struct udevice_id rk3328_dmc_ids[] = { + { .compatible = "rockchip,rk3328-dmc" }, + { } +}; + +U_BOOT_DRIVER(dmc_rk3328) = { + .name = "rockchip_rk3328_dmc", + .id = UCLASS_RAM, + .of_match = rk3328_dmc_ids, + .ops = &rk3328_dmc_ops, + .probe = rk3328_dmc_probe, + .priv_auto_alloc_size = sizeof(struct dram_info), +}; -- cgit v1.2.3