diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2019-06-03 17:12:33 +0900 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-06-17 04:45:21 -0700 |
| commit | 5ec47cda74e98ad2f723f93b4a97ba87638338aa (patch) | |
| tree | ed3e9856fce5d3474844ad12bdd664716e7597c7 | |
| parent | 7b43b8fdc9a6283c0b9405542c4406cfa1e5689a (diff) | |
memory: move jedec_ddr.h from include/memory to drivers/memory/
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>
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | drivers/memory/emif.c | 3 | ||||
| -rw-r--r-- | drivers/memory/jedec_ddr.h (renamed from include/memory/jedec_ddr.h) | 6 | ||||
| -rw-r--r-- | drivers/memory/jedec_ddr_data.c | 5 | ||||
| -rw-r--r-- | drivers/memory/of_memory.c | 3 |
4 files changed, 10 insertions, 7 deletions
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 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" /** |