diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2023-11-10 14:00:16 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-11-13 13:48:03 +0100 |
commit | 461069130338418aa1542df9e6db51e5b7532c5b (patch) | |
tree | 60baf6478731e90138dfcb057a3c4b661080fd98 /drivers/ddr | |
parent | 57cd650433301613889c91b15a6cbbcc084c7412 (diff) | |
download | barebox-461069130338418aa1542df9e6db51e5b7532c5b.tar.gz barebox-461069130338418aa1542df9e6db51e5b7532c5b.tar.xz |
ddr: imx8m: rename driver to imx
The i.MX8M ddr driver can be re-used for i.MX93, so drop the '8m' suffix
from the driver directories and Kconfig options.
Link: https://lore.barebox.org/20231110130028.2123895-2-s.hauer@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/ddr')
-rw-r--r-- | drivers/ddr/Kconfig | 2 | ||||
-rw-r--r-- | drivers/ddr/Makefile | 2 | ||||
-rw-r--r-- | drivers/ddr/imx/Kconfig (renamed from drivers/ddr/imx8m/Kconfig) | 6 | ||||
-rw-r--r-- | drivers/ddr/imx/Makefile | 7 | ||||
-rw-r--r-- | drivers/ddr/imx/ddrphy_csr.c (renamed from drivers/ddr/imx8m/ddrphy_csr.c) | 0 | ||||
-rw-r--r-- | drivers/ddr/imx/ddrphy_train.c (renamed from drivers/ddr/imx8m/ddrphy_train.c) | 0 | ||||
-rw-r--r-- | drivers/ddr/imx/ddrphy_utils.c (renamed from drivers/ddr/imx8m/ddrphy_utils.c) | 0 | ||||
-rw-r--r-- | drivers/ddr/imx/helper.c (renamed from drivers/ddr/imx8m/helper.c) | 0 | ||||
-rw-r--r-- | drivers/ddr/imx/imx8m_ddr_init.c (renamed from drivers/ddr/imx8m/ddr_init.c) | 0 | ||||
-rw-r--r-- | drivers/ddr/imx8m/Makefile | 7 |
10 files changed, 14 insertions, 10 deletions
diff --git a/drivers/ddr/Kconfig b/drivers/ddr/Kconfig index 17d01ab658..0b0d7a8893 100644 --- a/drivers/ddr/Kconfig +++ b/drivers/ddr/Kconfig @@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only source "drivers/ddr/fsl/Kconfig" -source "drivers/ddr/imx8m/Kconfig" +source "drivers/ddr/imx/Kconfig" diff --git a/drivers/ddr/Makefile b/drivers/ddr/Makefile index 0b5ac949a4..e5d7bd14db 100644 --- a/drivers/ddr/Makefile +++ b/drivers/ddr/Makefile @@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_DDR_FSL) += fsl/ -obj-$(CONFIG_IMX8M_DRAM) += imx8m/ +obj-$(CONFIG_IMX_DRAM) += imx/ diff --git a/drivers/ddr/imx8m/Kconfig b/drivers/ddr/imx/Kconfig index 720448f551..43e9181582 100644 --- a/drivers/ddr/imx8m/Kconfig +++ b/drivers/ddr/imx/Kconfig @@ -1,8 +1,12 @@ # SPDX-License-Identifier: GPL-2.0-only -menu "i.MX8M DDR controllers" +menu "i.MX DDR controllers" depends on ARCH_IMX8MQ || ARCH_IMX8MM || ARCH_IMX8MN || ARCH_IMX8MP +config IMX_DRAM + bool + config IMX8M_DRAM + select IMX_DRAM bool "imx8m dram controller support" endmenu diff --git a/drivers/ddr/imx/Makefile b/drivers/ddr/imx/Makefile new file mode 100644 index 0000000000..62d09e731a --- /dev/null +++ b/drivers/ddr/imx/Makefile @@ -0,0 +1,7 @@ +# +# Copyright 2018 NXP +# +# SPDX-License-Identifier: GPL-2.0+ +# +pbl-$(CONFIG_IMX_DRAM) += helper.o ddrphy_utils.o ddrphy_train.o ddrphy_csr.o +pbl-$(CONFIG_IMX8M_DRAM) += imx8m_ddr_init.o diff --git a/drivers/ddr/imx8m/ddrphy_csr.c b/drivers/ddr/imx/ddrphy_csr.c index d1cbf8f880..d1cbf8f880 100644 --- a/drivers/ddr/imx8m/ddrphy_csr.c +++ b/drivers/ddr/imx/ddrphy_csr.c diff --git a/drivers/ddr/imx8m/ddrphy_train.c b/drivers/ddr/imx/ddrphy_train.c index 6a98fa0545..6a98fa0545 100644 --- a/drivers/ddr/imx8m/ddrphy_train.c +++ b/drivers/ddr/imx/ddrphy_train.c diff --git a/drivers/ddr/imx8m/ddrphy_utils.c b/drivers/ddr/imx/ddrphy_utils.c index 353a265136..353a265136 100644 --- a/drivers/ddr/imx8m/ddrphy_utils.c +++ b/drivers/ddr/imx/ddrphy_utils.c diff --git a/drivers/ddr/imx8m/helper.c b/drivers/ddr/imx/helper.c index 98e4084958..98e4084958 100644 --- a/drivers/ddr/imx8m/helper.c +++ b/drivers/ddr/imx/helper.c diff --git a/drivers/ddr/imx8m/ddr_init.c b/drivers/ddr/imx/imx8m_ddr_init.c index 9a86280d9c..9a86280d9c 100644 --- a/drivers/ddr/imx8m/ddr_init.c +++ b/drivers/ddr/imx/imx8m_ddr_init.c diff --git a/drivers/ddr/imx8m/Makefile b/drivers/ddr/imx8m/Makefile deleted file mode 100644 index 2be313900f..0000000000 --- a/drivers/ddr/imx8m/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -# Copyright 2018 NXP -# -# SPDX-License-Identifier: GPL-2.0+ -# - -pbl-$(CONFIG_IMX8M_DRAM) += helper.o ddrphy_utils.o ddrphy_train.o ddrphy_csr.o ddr_init.o |