ARM: OMAP: move plat-omap/include/plat/sdrc.h into mach-omap2/sdrc.h

PATCH New Paul Walmsley 2 participants 2 messages Oct 17, 2012

Subsystems (5)

Arm (32-bit) Arm sub-architectures OMAP2+ support OMAP power management support +1 more subsystems

lore

Share & tools

lore

Paul Walmsley

author

2012-10-17 00:46 UTC #0 lore raw

PATCH 1/1 ARM: OMAP: move plat-omap/include/plat/sdrc.h into mach-omap2/sdrc.h

Remove arch/arm/plat-omap/include/plat/sdrc.h by folding its contents into arch/arm/mach-omap2/sdrc.h. The objective is to assist Tony in cleaning out arch/arm/plat-omap/, as his upstreams request.

Signed-off-by Paul Walmsley <[email protected]>

Cc Tony Lindgren <[email protected]>

---

This has a dependency on Tomi's "OMAP: VRFB: convert to platform device" series.

 arch/arm/mach-omap2/board-omap3logic.c             |    1 -
 arch/arm/mach-omap2/clkt2xxx_dpllcore.c            |    2 +-
 arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c       |    2 +-
 arch/arm/mach-omap2/clkt34xx_dpll3m2.c             |    1 -
 arch/arm/mach-omap2/control.c                      |    4 +-
 arch/arm/mach-omap2/gpmc.c                         |    1 -
 arch/arm/mach-omap2/io.c                           |    2 +-
 arch/arm/mach-omap2/pm34xx.c                       |    1 -
 arch/arm/mach-omap2/sdram-hynix-h8mbx00u0mer-0em.h |    2 +-
 arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h  |    2 +-
 arch/arm/mach-omap2/sdram-nokia.c                  |    2 +-
 arch/arm/mach-omap2/sdram-numonyx-m65kxxxxam.h     |    2 +-
 .../mach-omap2/sdram-qimonda-hyb18m512160af-6.h    |    2 +-
 arch/arm/mach-omap2/sdrc.c                         |    1 -
 arch/arm/mach-omap2/sdrc.h                         |  153 +++++++++++++++++-
 arch/arm/mach-omap2/sdrc2xxx.c                     |    1 -
 arch/arm/plat-omap/include/plat/sdrc.h             |  164 --------------------
 17 files changed, 156 insertions(+), 187 deletions(-)
 delete mode 100644 arch/arm/plat-omap/include/plat/sdrc.h

arch/arm/mach-omap2/board-omap3logic.c +0 -1

index 7bd8253..cbcea42 100644
@@ -36,7 +36,6 @@
 
 #include "gpmc-smsc911x.h"
 #include <plat/gpmc.h>
-#include <plat/sdrc.h>
 #include <plat/usb.h>
 
 #include "common.h"

arch/arm/mach-omap2/clkt2xxx_dpllcore.c +1 -1

index 4ae4392..3507659 100644
@@ -27,13 +27,13 @@
 
 #include <plat/clock.h>
 #include <plat/sram.h>
-#include <plat/sdrc.h>
 
 #include "clock.h"
 #include "clock2xxx.h"
 #include "opp2xxx.h"
 #include "cm2xxx_3xxx.h"
 #include "cm-regbits-24xx.h"
+#include "sdrc.h"
 
 /* #define DOWN_VARIABLE_DPLL 1 */		/* Experimental */

arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c +1 -1

index 3524f0e..0cf63e7 100644
@@ -35,7 +35,6 @@
 
 #include <plat/clock.h>
 #include <plat/sram.h>
-#include <plat/sdrc.h>
 
 #include "soc.h"
 #include "clock.h"

@@ -43,6 +42,7 @@
 #include "opp2xxx.h"
 #include "cm2xxx_3xxx.h"
 #include "cm-regbits-24xx.h"
+#include "sdrc.h"
 
 const struct prcm_config *curr_prcm_set;
 const struct prcm_config *rate_table;

arch/arm/mach-omap2/clkt34xx_dpll3m2.c +0 -1

index 7c6da2f..aff6ca4 100644
@@ -23,7 +23,6 @@
 
 #include <plat/clock.h>
 #include <plat/sram.h>
-#include <plat/sdrc.h>
 
 #include "clock.h"
 #include "clock3xxx.h"

arch/arm/mach-omap2/control.c +1 -3

index d1ff839..bf2be5c 100644
@@ -1,7 +1,7 @@
 /*
  * OMAP2/3 System Control Module register access
  *
- * Copyright (C) 2007 Texas Instruments, Inc.
+ * Copyright (C) 2007, 2012 Texas Instruments, Inc.
  * Copyright (C) 2007 Nokia Corporation
  *
  * Written by Paul Walmsley

@@ -15,8 +15,6 @@
 #include <linux/kernel.h>
 #include <linux/io.h>
 
-#include <plat/sdrc.h>
-
 #include "soc.h"
 #include "iomap.h"
 #include "common.h"

arch/arm/mach-omap2/gpmc.c +0 -1

index 5ac5cf3..e7f2b80 100644
@@ -31,7 +31,6 @@
 
 #include <plat/cpu.h>
 #include <plat/gpmc.h>
-#include <plat/sdrc.h>
 #include <plat/omap_device.h>
 
 #include "soc.h"

arch/arm/mach-omap2/io.c +1 -1

index 4234d28..ab82dbe 100644
@@ -26,7 +26,6 @@
 #include <asm/mach/map.h>
 
 #include <plat/sram.h>
-#include <plat/sdrc.h>
 #include <plat/serial.h>
 #include <plat/omap-pm.h>
 #include <plat/omap_hwmod.h>

@@ -43,6 +42,7 @@
 #include "clock2xxx.h"
 #include "clock3xxx.h"
 #include "clock44xx.h"
+#include "sdrc.h"
 
 /*
  * The machine specific code may provide the extra mapping besides the

arch/arm/mach-omap2/pm34xx.c +0 -1

index ba670db..ee0bffc 100644
@@ -38,7 +38,6 @@
 #include <plat/sram.h>
 #include "clockdomain.h"
 #include "powerdomain.h"
-#include <plat/sdrc.h>
 #include <plat/prcm.h>
 #include <plat/gpmc.h>
 #include <plat/dma.h>

arch/arm/mach-omap2/sdram-hynix-h8mbx00u0mer-0em.h +1 -1

index 8bfaf34..1ee58c2 100644
@@ -11,7 +11,7 @@
 #ifndef __ARCH_ARM_MACH_OMAP2_SDRAM_HYNIX_H8MBX00U0MER0EM
 #define __ARCH_ARM_MACH_OMAP2_SDRAM_HYNIX_H8MBX00U0MER0EM
 
-#include <plat/sdrc.h>
+#include "sdrc.h"
 
 /* Hynix H8MBX00U0MER-0EM */
 static struct omap_sdrc_params h8mbx00u0mer0em_sdrc_params[] = {

arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h +1 -1

index a391b49..85cccc0 100644
@@ -14,7 +14,7 @@
 #ifndef ARCH_ARM_MACH_OMAP2_SDRAM_MICRON_MT46H32M32LF
 #define ARCH_ARM_MACH_OMAP2_SDRAM_MICRON_MT46H32M32LF
 
-#include <plat/sdrc.h>
+#include "sdrc.h"
 
 /* Micron MT46H32M32LF-6 */
 /* XXX Using ARE = 0x1 (no autorefresh burst) -- can this be changed? */

arch/arm/mach-omap2/sdram-nokia.c +1 -1

index 845c4fd..5e5702c 100644
@@ -19,9 +19,9 @@
 
 #include "common.h"
 #include <plat/clock.h>
-#include <plat/sdrc.h>
 
 #include "sdram-nokia.h"
+#include "sdrc.h"
 
 /* In picoseconds, except for tREF (ns), tXP, tCKE, tWTR (clks) */
 struct sdram_timings {

arch/arm/mach-omap2/sdram-numonyx-m65kxxxxam.h +1 -1

index cd43529..003f7bf 100644
@@ -11,7 +11,7 @@
 #ifndef __ARCH_ARM_MACH_OMAP2_SDRAM_NUMONYX_M65KXXXXAM
 #define __ARCH_ARM_MACH_OMAP2_SDRAM_NUMONYX_M65KXXXXAM
 
-#include <plat/sdrc.h>
+#include "sdrc.h"
 
 /* Numonyx  M65KXXXXAM */
 static struct omap_sdrc_params m65kxxxxam_sdrc_params[] = {

arch/arm/mach-omap2/sdram-qimonda-hyb18m512160af-6.h +1 -1

index 0e518a7..8dc3de5 100644
@@ -14,7 +14,7 @@
 #ifndef ARCH_ARM_MACH_OMAP2_SDRAM_QIMONDA_HYB18M512160AF6
 #define ARCH_ARM_MACH_OMAP2_SDRAM_QIMONDA_HYB18M512160AF6
 
-#include <plat/sdrc.h>
+#include "sdrc.h"
 
 /* Qimonda HYB18M512160AF-6 */
 static struct omap_sdrc_params hyb18m512160af6_sdrc_params[] = {

arch/arm/mach-omap2/sdrc.c +0 -1

index e3d345f..503d41f9 100644
@@ -27,7 +27,6 @@
 #include <plat/clock.h>
 #include <plat/sram.h>
 
-#include <plat/sdrc.h>
 #include "sdrc.h"
 
 static struct omap_sdrc_params *sdrc_init_params_cs0, *sdrc_init_params_cs1;

arch/arm/mach-omap2/sdrc.h +147 -6

183 lines not on this page · raw message

arch/arm/mach-omap2/sdrc2xxx.c +0 -1

index 73e55e4..f7074ff 100644
@@ -26,7 +26,6 @@
 
 #include <plat/clock.h>
 #include <plat/sram.h>
-#include <plat/sdrc.h>
 
 #include "soc.h"
 #include "iomap.h"

arch/arm/plat-omap/include/plat/sdrc.h deleted +0 ~~-164~~

164 lines not on this page · raw message

Signature · 1 line

1.7.10.4

Tony Lindgren

maintainer

2012-10-17 17:38 UTC #1 lore raw

PATCH 1/1 ARM: OMAP: move plat-omap/include/plat/sdrc.h into mach-omap2/sdrc.h

Quoted 11 lines · Paul Walmsley

Remove arch/arm/plat-omap/include/plat/sdrc.h by folding its contents into arch/arm/mach-omap2/sdrc.h. The objective is to assist Tony in cleaning out arch/arm/plat-omap/, as his upstreams request.
Signed-off-by Paul Walmsley <[email protected]>
Cc Tony Lindgren <[email protected]>
---
This has a dependency on Tomi's "OMAP: VRFB: convert to platform device" series.

Thanks applying this into omap-for-v3.8/cleanup-headers-dss.

Regards,

Tony