* [RESEND PATCH 1/2] memory: move jedec_ddr_data.c from lib/ to drivers/memory/
2019-06-03 8:12 [RESEND PATCH 0/2] memory: move jedec_ddr_data.c and jedec_ddr.h to drivers/memory/ Masahiro Yamada
@ 2019-06-03 8:12 ` Masahiro Yamada
2019-06-03 8:12 ` [RESEND PATCH 2/2] memory: move jedec_ddr.h from include/memory " Masahiro Yamada
2019-06-17 11:45 ` [RESEND PATCH 0/2] memory: move jedec_ddr_data.c and jedec_ddr.h " Olof Johansson
2 siblings, 0 replies; 4+ messages in thread
From: Masahiro Yamada @ 2019-06-03 8:12 UTC (permalink / raw)
To: arm, Olof Johansson, Arnd Bergmann
Cc: Masahiro Yamada, linux-kernel, linux-arm-kernel
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 <yamada.masahiro@socionext.com>
---
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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread* [RESEND PATCH 2/2] memory: move jedec_ddr.h from include/memory to drivers/memory/
2019-06-03 8:12 [RESEND PATCH 0/2] memory: move jedec_ddr_data.c and jedec_ddr.h to drivers/memory/ Masahiro Yamada
2019-06-03 8:12 ` [RESEND PATCH 1/2] memory: move jedec_ddr_data.c from lib/ " Masahiro Yamada
@ 2019-06-03 8:12 ` Masahiro Yamada
2019-06-17 11:45 ` [RESEND PATCH 0/2] memory: move jedec_ddr_data.c and jedec_ddr.h " Olof Johansson
2 siblings, 0 replies; 4+ messages in thread
From: Masahiro Yamada @ 2019-06-03 8:12 UTC (permalink / raw)
To: arm, Olof Johansson, Arnd Bergmann
Cc: Masahiro Yamada, linux-kernel, linux-arm-kernel,
Santosh Shilimkar
Now that jedec_ddr_data.c was moved from lib/ to drivers/memory/,
<memory/jedec_ddr.h> is included only from drivers/memory/.
Make it a local header of drivers/memory/.
The directory include/memory is now gone.
While I am here, I also changed #include <linux/module.h> to
<linux/export.h>. Because CONFIG_DDR is bool, jedec_ddr_data.c is
never compiled as a module.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
drivers/memory/emif.c | 3 ++-
{include => drivers}/memory/jedec_ddr.h | 6 +++---
drivers/memory/jedec_ddr_data.c | 5 +++--
drivers/memory/of_memory.c | 3 ++-
4 files changed, 10 insertions(+), 7 deletions(-)
rename {include => drivers}/memory/jedec_ddr.h (97%)
diff --git a/drivers/memory/emif.c b/drivers/memory/emif.c
index 2f214440008c..32cad7540d78 100644
--- a/drivers/memory/emif.c
+++ b/drivers/memory/emif.c
@@ -26,8 +26,9 @@
#include <linux/list.h>
#include <linux/spinlock.h>
#include <linux/pm.h>
-#include <memory/jedec_ddr.h>
+
#include "emif.h"
+#include "jedec_ddr.h"
#include "of_memory.h"
/**
diff --git a/include/memory/jedec_ddr.h b/drivers/memory/jedec_ddr.h
similarity index 97%
rename from include/memory/jedec_ddr.h
rename to drivers/memory/jedec_ddr.h
index ddad0f870e5d..a2094a9a588e 100644
--- a/include/memory/jedec_ddr.h
+++ b/drivers/memory/jedec_ddr.h
@@ -9,8 +9,8 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
-#ifndef __LINUX_JEDEC_DDR_H
-#define __LINUX_JEDEC_DDR_H
+#ifndef __JEDEC_DDR_H
+#define __JEDEC_DDR_H
#include <linux/types.h>
@@ -172,4 +172,4 @@ extern const struct lpddr2_timings
lpddr2_jedec_timings[NUM_DDR_TIMING_TABLE_ENTRIES];
extern const struct lpddr2_min_tck lpddr2_jedec_min_tck;
-#endif /* __LINUX_JEDEC_DDR_H */
+#endif /* __JEDEC_DDR_H */
diff --git a/drivers/memory/jedec_ddr_data.c b/drivers/memory/jedec_ddr_data.c
index 6d2cbf1d567f..1f9ca0f23407 100644
--- a/drivers/memory/jedec_ddr_data.c
+++ b/drivers/memory/jedec_ddr_data.c
@@ -10,8 +10,9 @@
* published by the Free Software Foundation.
*/
-#include <memory/jedec_ddr.h>
-#include <linux/module.h>
+#include <linux/export.h>
+
+#include "jedec_ddr.h"
/* LPDDR2 addressing details from JESD209-2 section 2.4 */
const struct lpddr2_addressing
diff --git a/drivers/memory/of_memory.c b/drivers/memory/of_memory.c
index 12a61f558644..46539b27a3fb 100644
--- a/drivers/memory/of_memory.c
+++ b/drivers/memory/of_memory.c
@@ -10,8 +10,9 @@
#include <linux/list.h>
#include <linux/of.h>
#include <linux/gfp.h>
-#include <memory/jedec_ddr.h>
#include <linux/export.h>
+
+#include "jedec_ddr.h"
#include "of_memory.h"
/**
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [RESEND PATCH 0/2] memory: move jedec_ddr_data.c and jedec_ddr.h to drivers/memory/
2019-06-03 8:12 [RESEND PATCH 0/2] memory: move jedec_ddr_data.c and jedec_ddr.h to drivers/memory/ Masahiro Yamada
2019-06-03 8:12 ` [RESEND PATCH 1/2] memory: move jedec_ddr_data.c from lib/ " Masahiro Yamada
2019-06-03 8:12 ` [RESEND PATCH 2/2] memory: move jedec_ddr.h from include/memory " Masahiro Yamada
@ 2019-06-17 11:45 ` Olof Johansson
2 siblings, 0 replies; 4+ messages in thread
From: Olof Johansson @ 2019-06-17 11:45 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Santosh Shilimkar, arm, linux-arm-kernel, Arnd Bergmann,
linux-kernel
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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread