I believe this is a nice clean-up of directory path.
include/memory/ has existed just for containing one header,
and it is gone now.
There is no sub-system that takes care of drivers/memory/.
I sent this series some time ago, but I did not get any feedback.
I am resending it to ARM-SOC ML.
I hope Arnd or Olof will take a look at this.
Masahiro Yamada (2):
memory: move jedec_ddr_data.c from lib/ to drivers/memory/
memory: move jedec_ddr.h from include/memory to drivers/memory/
drivers/memory/Kconfig | 8 ++++++++
drivers/memory/Makefile | 1 +
drivers/memory/emif.c | 3 ++-
{include => drivers}/memory/jedec_ddr.h | 6 +++---
{lib => drivers/memory}/jedec_ddr_data.c | 5 +++--
drivers/memory/of_memory.c | 3 ++-
lib/Kconfig | 8 --------
lib/Makefile | 2 --
8 files changed, 19 insertions(+), 17 deletions(-)
rename {include => drivers}/memory/jedec_ddr.h (97%)
rename {lib => drivers/memory}/jedec_ddr_data.c (98%)
--
2.17.1
jedec_ddr_data.c exports 3 symbols, and all of them are only
referenced from drivers/memory/{emif.c,of_memory.c}
drivers/memory/ is a better location than lib/.
I removed the Kconfig prompt "JEDEC DDR data" because it is only
select'ed by TI_EMIF, and there is no other user. There is no good
reason in making it a user-configurable CONFIG option.
Signed-off-by: Masahiro Yamada <[email protected]>
---
drivers/memory/Kconfig | 8 ++++++++
drivers/memory/Makefile | 1 +
{lib => drivers/memory}/jedec_ddr_data.c | 0
lib/Kconfig | 8 --------
lib/Makefile | 2 --
5 files changed, 9 insertions(+), 10 deletions(-)
rename {lib => drivers/memory}/jedec_ddr_data.c (100%)
diff --git a/drivers/memory/Kconfig b/drivers/memory/Kconfig
index 392ad4f5c570..477f0f130e5b 100644
--- a/drivers/memory/Kconfig
+++ b/drivers/memory/Kconfig
@@ -8,6 +8,14 @@ menuconfig MEMORY
if MEMORY
+config DDR
+ bool
+ help
+ Data from JEDEC specs for DDR SDRAM memories,
+ particularly the AC timing parameters and addressing
+ information. This data is useful for drivers handling
+ DDR SDRAM controllers.
+
config ARM_PL172_MPMC
tristate "ARM PL172 MPMC driver"
depends on ARM_AMBA && OF
diff --git a/drivers/memory/Makefile b/drivers/memory/Makefile
index 91ae4eb0e913..9d5c409a1591 100644
--- a/drivers/memory/Makefile
+++ b/drivers/memory/Makefile
@@ -3,6 +3,7 @@
# Makefile for memory devices
#
+obj-$(CONFIG_DDR) += jedec_ddr_data.o
ifeq ($(CONFIG_DDR),y)
obj-$(CONFIG_OF) += of_memory.o
endif
diff --git a/lib/jedec_ddr_data.c b/drivers/memory/jedec_ddr_data.c
similarity index 100%
rename from lib/jedec_ddr_data.c
rename to drivers/memory/jedec_ddr_data.c
diff --git a/lib/Kconfig b/lib/Kconfig
index 90623a0e1942..e09b3e081a53 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -531,14 +531,6 @@ config LRU_CACHE
config CLZ_TAB
bool
-config DDR
- bool "JEDEC DDR data"
- help
- Data from JEDEC specs for DDR SDRAM memories,
- particularly the AC timing parameters and addressing
- information. This data is useful for drivers handling
- DDR SDRAM controllers.
-
config IRQ_POLL
bool "IRQ polling library"
help
diff --git a/lib/Makefile b/lib/Makefile
index fb7697031a79..cb66bc9c5b2f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -206,8 +206,6 @@ obj-$(CONFIG_SIGNATURE) += digsig.o
lib-$(CONFIG_CLZ_TAB) += clz_tab.o
-obj-$(CONFIG_DDR) += jedec_ddr_data.o
-
obj-$(CONFIG_GENERIC_STRNCPY_FROM_USER) += strncpy_from_user.o
obj-$(CONFIG_GENERIC_STRNLEN_USER) += strnlen_user.o
--
2.17.1
On Mon, Jun 03, 2019 at 05:12:31PM +0900, Masahiro Yamada wrote:
>
> I believe this is a nice clean-up of directory path.
>
> include/memory/ has existed just for containing one header,
> and it is gone now.
>
> There is no sub-system that takes care of drivers/memory/.
> I sent this series some time ago, but I did not get any feedback.
>
> I am resending it to ARM-SOC ML.
> I hope Arnd or Olof will take a look at this.
>
>
>
> Masahiro Yamada (2):
> memory: move jedec_ddr_data.c from lib/ to drivers/memory/
> memory: move jedec_ddr.h from include/memory to drivers/memory/
>
> drivers/memory/Kconfig | 8 ++++++++
> drivers/memory/Makefile | 1 +
> drivers/memory/emif.c | 3 ++-
> {include => drivers}/memory/jedec_ddr.h | 6 +++---
> {lib => drivers/memory}/jedec_ddr_data.c | 5 +++--
> drivers/memory/of_memory.c | 3 ++-
> lib/Kconfig | 8 --------
> lib/Makefile | 2 --
> 8 files changed, 19 insertions(+), 17 deletions(-)
> rename {include => drivers}/memory/jedec_ddr.h (97%)
> rename {lib => drivers/memory}/jedec_ddr_data.c (98%)
Applied to drivers branch for 5.3. Thanks!
-Olof