ARM: OMAP: Move plat/dma*.h, omap-secure.h headers as part of single zImage work

PATCH New Lokesh Vutla 2 participants 9 messages Oct 1, 2012 – Oct 2, 2012

Subsystems (17)

Arm (32-bit) Media (V4L/DVB) USB Arm sub-architectures +13 more subsystems

lore

Share & tools

lore

Lokesh Vutla

author

2012-10-01 18:46 UTC #0 lore raw

v2 cover ARM: OMAP: Move plat/dma*.h, omap-secure.h headers as part of single zImage work

Patch 1:
Dropping the file plat/dma44xx.h as none of the omap44xx dma channel definitions are used.
Patch 2:
Moving OMAP1 DMA channel definitions to mach-omap1
Patch 3:
Moving OMAP2+ DMA channel definitions to mach-omap2
Patch 4:
Moving plat/dma.h to plat-omap/dma-omap.h
Patch 5:
Removing omap_reserve() callback from all omap1 board files.
Patch 6:
Defining omap_reserve() locally to mach-omap2.
Patch 7:
Move plat/omap-secure.h locally to mach-omap2

Lokesh Vutla (7):
ARM: OMAP: DMA: Removing plat/dma-44xx.h
ARM: OMAP1: DMA: Moving OMAP1 DMA channel definitions to mach-omap1
ARM: OMAP2+: DMA: Moving OMAP2 DMA channel definitions to mach-omap2
ARM: OMAP: DMA: Move plat/dma.h to plat-omap/dma-omap.h
ARM: OMAP1: Remove omap_reserve() callback for all omap1 boards
ARM: OMAP2+: Move omap_reserve() locally to mach-omap2
ARM: OMAP: Move plat/omap-secure.h locally to mach-omap2

 arch/arm/mach-omap1/board-ams-delta.c              |    1 -
 arch/arm/mach-omap1/board-fsample.c                |    1 -
 arch/arm/mach-omap1/board-generic.c                |    1 -
 arch/arm/mach-omap1/board-h2.c                     |    4 +-
 arch/arm/mach-omap1/board-h3.c                     |    3 +-
 arch/arm/mach-omap1/board-htcherald.c              |    1 -
 arch/arm/mach-omap1/board-innovator.c              |    1 -
 arch/arm/mach-omap1/board-nokia770.c               |    1 -
 arch/arm/mach-omap1/board-osk.c                    |    1 -
 arch/arm/mach-omap1/board-palmte.c                 |    4 +-
 arch/arm/mach-omap1/board-palmtt.c                 |    4 +-
 arch/arm/mach-omap1/board-palmz71.c                |    4 +-
 arch/arm/mach-omap1/board-perseus2.c               |    1 -
 arch/arm/mach-omap1/board-sx1.c                    |    4 +-
 arch/arm/mach-omap1/board-voiceblue.c              |    1 -
 arch/arm/mach-omap1/devices.c                      |    3 +-
 arch/arm/mach-omap1/dma.c                          |    4 +-
 arch/arm/mach-omap1/dma.h                          |   83 +++++++++
 arch/arm/mach-omap1/io.c                           |    2 +-
 arch/arm/mach-omap1/lcd_dma.c                      |    4 +-
 arch/arm/mach-omap1/mcbsp.c                        |    3 +-
 arch/arm/mach-omap1/pm.c                           |    2 +-
 arch/arm/mach-omap2/board-3430sdp.c                |    2 +-
 arch/arm/mach-omap2/board-h4.c                     |    2 +-
 arch/arm/mach-omap2/board-rx51-peripherals.c       |    2 +-
 arch/arm/mach-omap2/board-rx51.c                   |    2 +-
 arch/arm/mach-omap2/common.c                       |   20 +++
 arch/arm/mach-omap2/common.h                       |    1 +
 arch/arm/mach-omap2/devices.c                      |    3 +-
 arch/arm/mach-omap2/dma.c                          |    2 +-
 arch/arm/mach-omap2/dma.h                          |  131 ++++++++++++++
 arch/arm/mach-omap2/io.c                           |    2 +-
 arch/arm/mach-omap2/mcbsp.c                        |    2 +-
 arch/arm/mach-omap2/omap-secure.c                  |    1 -
 arch/arm/mach-omap2/omap-secure.h                  |    7 +
 arch/arm/mach-omap2/omap4-common.c                 |    2 +-
 arch/arm/mach-omap2/omap_hwmod_2420_data.c         |    2 +-
 arch/arm/mach-omap2/omap_hwmod_2430_data.c         |    2 +-
 .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c |    3 +-
 arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c |    2 +-
 arch/arm/mach-omap2/omap_hwmod_33xx_data.c         |    2 +-
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c         |    3 +-
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c         |    2 +-
 arch/arm/mach-omap2/pm24xx.c                       |    2 +-
 arch/arm/mach-omap2/pm34xx.c                       |    2 +-
 arch/arm/mach-omap2/serial.c                       |    2 +-
 arch/arm/plat-omap/common.c                        |   23 +--
 arch/arm/plat-omap/dma.c                           |    2 +-
 .../include/{plat/dma.h => plat-omap/dma-omap.h}   |  181 +-------------------
 arch/arm/plat-omap/include/plat/common.h           |    1 -
 arch/arm/plat-omap/include/plat/dma-44xx.h         |  147 ----------------
 arch/arm/plat-omap/include/plat/omap-secure.h      |   14 --
 drivers/crypto/omap-aes.c                          |    2 +-
 drivers/crypto/omap-sham.c                         |    2 +-
 drivers/dma/omap-dma.c                             |    2 +-
 drivers/media/platform/omap/omap_vout.c            |    2 +-
 drivers/media/platform/omap/omap_vout_vrfb.c       |    4 +-
 drivers/media/platform/omap3isp/isphist.c          |    2 +
 drivers/media/platform/omap3isp/ispstat.h          |    2 +-
 drivers/media/platform/soc_camera/omap1_camera.c   |    4 +-
 drivers/mmc/host/omap.c                            |   12 +-
 drivers/mtd/nand/omap2.c                           |    4 +-
 drivers/mtd/onenand/omap2.c                        |    2 +-
 drivers/usb/gadget/omap_udc.c                      |    4 +-
 drivers/usb/musb/tusb6010_omap.c                   |    9 +-
 drivers/video/omap/lcdc.c                          |    2 +-
 drivers/video/omap/omapfb_main.c                   |    2 +-
 drivers/video/omap/sossi.c                         |    2 +-
 68 files changed, 331 insertions(+), 428 deletions(-)
 create mode 100644 arch/arm/mach-omap1/dma.h
 create mode 100644 arch/arm/mach-omap2/dma.h
 rename arch/arm/plat-omap/include/{plat/dma.h => plat-omap/dma-omap.h} (61%)
 delete mode 100644 arch/arm/plat-omap/include/plat/dma-44xx.h
 delete mode 100644 arch/arm/plat-omap/include/plat/omap-secure.h

Signature · 1 line

1.7.10.4

Lokesh Vutla

author

2012-10-01 18:47 UTC #1 lore raw

PATCH v2 1/7 ARM: OMAP: DMA: Removing plat/dma-44xx.h

None of the DMA channel definitions defined in
plat/dma-44xx.h are used. So removing it.

Signed-off-by Lokesh Vutla <[email protected]>

---
 arch/arm/plat-omap/include/plat/dma-44xx.h |  147 ----------------------------
 arch/arm/plat-omap/include/plat/dma.h      |    3 -
 2 files changed, 150 deletions(-)
 delete mode 100644 arch/arm/plat-omap/include/plat/dma-44xx.h

arch/arm/plat-omap/include/plat/dma-44xx.h deleted +0 -0

deleted file mode 100644
index 1f767cb..0000000

arch/arm/plat-omap/include/plat/dma.h +0 -3

index 0a87b05..e413bd8 100644
@@ -28,9 +28,6 @@
  * the omap drivers hwmod adapted.
  */
 
-/* Move omap4 specific defines to dma-44xx.h */
-#include "dma-44xx.h"
-
 #define INT_DMA_LCD			25
 
 /* DMA channels for omap1 */

Signature · 1 line

1.7.10.4

Lokesh Vutla

author

2012-10-01 18:47 UTC #2 lore raw

PATCH v2 2/7 ARM: OMAP1: DMA: Moving OMAP1 DMA channel definitions to mach-omap1

In reply to Lokesh Vutla

Some of the omap1 dma channel definitions are used by some drivers. For moving omap1 dma channel definitions to mach-omap1/, the used ones should be defined locally to driver. Driver can eliminate it by using DT, platform data, or IORESOURCE_DMA.
And moving OMAP1 DMA channel definitions to mach-omap1

Signed-off-by Lokesh Vutla <[email protected]>

---
 arch/arm/mach-omap1/board-h2.c                   |    1 +
 arch/arm/mach-omap1/board-palmte.c               |    1 +
 arch/arm/mach-omap1/board-palmtt.c               |    1 +
 arch/arm/mach-omap1/board-palmz71.c              |    1 +
 arch/arm/mach-omap1/board-sx1.c                  |    1 +
 arch/arm/mach-omap1/devices.c                    |    1 +
 arch/arm/mach-omap1/dma.c                        |    2 +
 arch/arm/mach-omap1/dma.h                        |   83 ++++++++++++++++++++++
 arch/arm/mach-omap1/lcd_dma.c                    |    2 +
 arch/arm/mach-omap1/mcbsp.c                      |    1 +
 arch/arm/plat-omap/include/plat/dma.h            |   66 -----------------
 drivers/media/platform/omap/omap_vout_vrfb.c     |    2 +
 drivers/media/platform/soc_camera/omap1_camera.c |    1 +
 drivers/mmc/host/omap.c                          |    4 ++
 drivers/usb/gadget/omap_udc.c                    |    2 +
 15 files changed, 103 insertions(+), 66 deletions(-)
 create mode 100644 arch/arm/mach-omap1/dma.h

arch/arm/mach-omap1/board-h2.c +1 -0

index a2e53e1..72855ce 100644
@@ -50,6 +50,7 @@
 
 #include "common.h"
 #include "board-h2.h"
+#include "dma.h"
 
 /* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */
 #define OMAP1610_ETHR_START		0x04000300

arch/arm/mach-omap1/board-palmte.c +1 -0

index 1c578d5..75ac3cd 100644
@@ -45,6 +45,7 @@
 #include <mach/usb.h>
 
 #include "common.h"
+#include "dma.h"
 
 #define PALMTE_USBDETECT_GPIO	0
 #define PALMTE_USB_OR_DC_GPIO	1

arch/arm/mach-omap1/board-palmtt.c +1 -0

index 9715809..14e1847 100644
@@ -45,6 +45,7 @@
 #include <mach/usb.h>
 
 #include "common.h"
+#include "dma.h"
 
 #define PALMTT_USBDETECT_GPIO	0
 #define PALMTT_CABLE_GPIO	1

arch/arm/mach-omap1/board-palmz71.c +1 -0

index e311032..e403bc9 100644
@@ -47,6 +47,7 @@
 #include <mach/usb.h>
 
 #include "common.h"
+#include "dma.h"
 
 #define PALMZ71_USBDETECT_GPIO	0
 #define PALMZ71_PENIRQ_GPIO	6

arch/arm/mach-omap1/board-sx1.c +1 -0

index 13bf2cc..1248fcc 100644
@@ -45,6 +45,7 @@
 #include <mach/usb.h>
 
 #include "common.h"
+#include "dma.h"
 
 /* Write to I2C device */
 int sx1_i2c_write_byte(u8 devaddr, u8 regoffset, u8 value)

arch/arm/mach-omap1/devices.c +1 -0

index 0cc54dd..890db8f 100644
@@ -30,6 +30,7 @@
 
 #include "common.h"
 #include "clock.h"
+#include "dma.h"
 
 #if defined(CONFIG_SND_SOC) || defined(CONFIG_SND_SOC_MODULE)

arch/arm/mach-omap1/dma.c +2 -0

index 29007fe..40f1dc4 100644
@@ -30,6 +30,8 @@
 
 #include <mach/irqs.h>
 
+#include "dma.h"
+
 #define OMAP1_DMA_BASE			(0xfffed800)
 #define OMAP1_LOGICAL_DMA_CH_COUNT	17
 #define OMAP1_DMA_STRIDE		0x40

arch/arm/mach-omap1/dma.h new file +83 -0

83 lines not on this page · raw message

arch/arm/mach-omap1/lcd_dma.c +2 -0

index ed42628..9a54d3b 100644
@@ -32,6 +32,8 @@
 #include <mach/hardware.h>
 #include <mach/lcdc.h>
 
+#include "dma.h"
+
 int omap_lcd_dma_running(void)
 {
 	/*

arch/arm/mach-omap1/mcbsp.c +1 -0

index bdc2e75..b92f15a 100644
@@ -27,6 +27,7 @@
 #include <mach/irqs.h>
 
 #include "iomap.h"
+#include "dma.h"
 
 #define DPS_RSTCT2_PER_EN	(1 << 0)
 #define DSP_RSTCT2_WD_PER_EN	(1 << 1)

arch/arm/plat-omap/include/plat/dma.h +0 ~~-66~~

74 lines not on this page · raw message

drivers/media/platform/omap/omap_vout_vrfb.c +2 -0

index 4be26abf6c..11d7a29 100644
@@ -22,6 +22,8 @@
 #include "omap_voutdef.h"
 #include "omap_voutlib.h"
 
+#define OMAP_DMA_NO_DEVICE	0
+
 /*
  * Function for allocating video buffers
  */

drivers/media/platform/soc_camera/omap1_camera.c +1 -0

index fa08c76..3046dba 100644
@@ -40,6 +40,7 @@
 #define DRIVER_NAME		"omap1-camera"
 #define DRIVER_VERSION		"0.0.2"
 
+#define OMAP_DMA_CAMERA_IF_RX		20
 
 /*
  * ---------------------------------------------------------------------------

drivers/mmc/host/omap.c +4 -0

index 48ad361..b2cf37b 100644
@@ -84,6 +84,10 @@
 #define OMAP_MMC_CMDTYPE_AC	2
 #define OMAP_MMC_CMDTYPE_ADTC	3
 
+#define OMAP_DMA_MMC_TX		21
+#define OMAP_DMA_MMC_RX		22
+#define OMAP_DMA_MMC2_TX	54
+#define OMAP_DMA_MMC2_RX	55
 
 #define DRIVER_NAME "mmci-omap"

drivers/usb/gadget/omap_udc.c +2 -0

index 2a4749c..024c0b9 100644
@@ -61,6 +61,8 @@
 #define	DRIVER_DESC	"OMAP UDC driver"
 #define	DRIVER_VERSION	"4 October 2004"
 
+#define OMAP_DMA_USB_W2FC_TX0		29
+
 /*
  * The OMAP UDC needs _very_ early endpoint setup:  before enabling the
  * D+ pullup to allow enumeration.  That's too early for the gadget

Signature · 1 line

1.7.10.4

Lokesh Vutla

author

2012-10-01 18:47 UTC #3 lore raw

PATCH v2 3/7 ARM: OMAP2+: DMA: Moving OMAP2+ DMA channel definitions to mach-omap2

In reply to Lokesh Vutla

Similar to omap1, some of the omap2+ dma channel definitions are used by some drivers. For moving omap2+ dma channel definitions to mach-omap2/, the used ones should be defined locally to driver. Drivers can eliminate it using DT, platform data, or IORESOURCE_DMA And moving omap2+ DMA channel definitions to mach-omap2

Signed-off-by Lokesh Vutla <[email protected]>

---
 arch/arm/mach-omap2/devices.c                      |    1 +
 arch/arm/mach-omap2/dma.h                          |  131 ++++++++++++++++++++
 .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c |    1 +
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c         |    1 +
 arch/arm/plat-omap/include/plat/dma.h              |  110 ----------------
 drivers/media/platform/omap3isp/isphist.c          |    2 +
 drivers/mmc/host/omap.c                            |    6 +
 drivers/mtd/nand/omap2.c                           |    2 +
 drivers/usb/musb/tusb6010_omap.c                   |    7 ++
 9 files changed, 151 insertions(+), 110 deletions(-)
 create mode 100644 arch/arm/mach-omap2/dma.h

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

index d092d2a8..998152c 100644
@@ -34,6 +34,7 @@
 #include "mux.h"
 #include "control.h"
 #include "devices.h"
+#include "dma.h"
 
 #define L3_MODULES_MAX_LEN 12
 #define L3_MODULES 3

arch/arm/mach-omap2/dma.h new file +131 -0

131 lines not on this page · raw message

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

index 8851bbb..04b99de 100644
@@ -16,6 +16,7 @@
 #include "hdq1w.h"
 
 #include "omap_hwmod_common_data.h"
+#include "dma.h"
 
 /* UART */

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

index 94b38af..deff845 100644
@@ -35,6 +35,7 @@
 #include "prm-regbits-34xx.h"
 #include "cm-regbits-34xx.h"
 #include "wd_timer.h"
+#include "dma.h"
 
 /*
  * OMAP3xxx hardware module integration data

arch/arm/plat-omap/include/plat/dma.h +0 ~~-110~~

116 lines not on this page · raw message

drivers/media/platform/omap3isp/isphist.c +2 -0

index d1a8dee..e7f9c42 100644
@@ -34,6 +34,8 @@
 #include "ispreg.h"
 #include "isphist.h"
 
+#define OMAP24XX_DMA_NO_DEVICE		0
+
 #define HIST_CONFIG_DMA	1
 
 #define HIST_USING_DMA(hist) ((hist)->dma_ch >= 0)

drivers/mmc/host/omap.c +6 -0

index b2cf37b..9664fa9 100644
@@ -89,6 +89,12 @@
 #define OMAP_DMA_MMC2_TX	54
 #define OMAP_DMA_MMC2_RX	55
 
+#define OMAP24XX_DMA_MMC2_TX	47
+#define OMAP24XX_DMA_MMC2_RX	48
+#define OMAP24XX_DMA_MMC1_TX	61
+#define OMAP24XX_DMA_MMC1_RX	62
+
+
 #define DRIVER_NAME "mmci-omap"
 
 /* Specifies how often in millisecs to poll for card status changes

drivers/mtd/nand/omap2.c +2 -0

index 5b31386..3105f22 100644
@@ -111,6 +111,8 @@
 #define	ECCCLEAR			0x100
 #define	ECC1				0x1
 
+#define OMAP24XX_DMA_GPMC		4
+
 /* oob info generated runtime depending on ecc algorithm and layout selected */
 static struct nand_ecclayout omap_oobinfo;
 /* Define some generic bad / good block scan pattern which are used

drivers/usb/musb/tusb6010_omap.c +7 -0

index 7a62b95..c032fc2 100644
@@ -25,6 +25,13 @@
 
 #define MAX_DMAREQ		5	/* REVISIT: Really 6, but req5 not OK */
 
+#define OMAP24XX_DMA_EXT_DMAREQ0	2
+#define OMAP24XX_DMA_EXT_DMAREQ1	3
+#define OMAP242X_DMA_EXT_DMAREQ2	14
+#define OMAP242X_DMA_EXT_DMAREQ3	15
+#define OMAP242X_DMA_EXT_DMAREQ4	16
+#define OMAP242X_DMA_EXT_DMAREQ5	64
+
 struct tusb_omap_dma_ch {
 	struct musb		*musb;
 	void __iomem		*tbase;

Signature · 1 line

1.7.10.4

Lokesh Vutla

author

2012-10-01 18:47 UTC #4 lore raw

PATCH v2 4/7 ARM: OMAP: DMA: Move plat/dma.h to plat-omap/dma-omap.h

In reply to Lokesh Vutla

Move plat/dma.h to plat-omap/dma-omap.h as part of single zImage work

Signed-off-by Lokesh Vutla <[email protected]>

---
 arch/arm/mach-omap1/board-h2.c                                  |    2 +-
 arch/arm/mach-omap1/board-h3.c                                  |    2 +-
 arch/arm/mach-omap1/board-palmte.c                              |    2 +-
 arch/arm/mach-omap1/board-palmtt.c                              |    2 +-
 arch/arm/mach-omap1/board-palmz71.c                             |    2 +-
 arch/arm/mach-omap1/board-sx1.c                                 |    2 +-
 arch/arm/mach-omap1/devices.c                                   |    2 +-
 arch/arm/mach-omap1/dma.c                                       |    2 +-
 arch/arm/mach-omap1/io.c                                        |    2 +-
 arch/arm/mach-omap1/lcd_dma.c                                   |    2 +-
 arch/arm/mach-omap1/mcbsp.c                                     |    2 +-
 arch/arm/mach-omap1/pm.c                                        |    2 +-
 arch/arm/mach-omap2/board-3430sdp.c                             |    2 +-
 arch/arm/mach-omap2/board-h4.c                                  |    2 +-
 arch/arm/mach-omap2/board-rx51-peripherals.c                    |    2 +-
 arch/arm/mach-omap2/board-rx51.c                                |    2 +-
 arch/arm/mach-omap2/devices.c                                   |    2 +-
 arch/arm/mach-omap2/dma.c                                       |    2 +-
 arch/arm/mach-omap2/io.c                                        |    2 +-
 arch/arm/mach-omap2/mcbsp.c                                     |    2 +-
 arch/arm/mach-omap2/omap_hwmod_2420_data.c                      |    2 +-
 arch/arm/mach-omap2/omap_hwmod_2430_data.c                      |    2 +-
 arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c         |    2 +-
 arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c              |    2 +-
 arch/arm/mach-omap2/omap_hwmod_33xx_data.c                      |    2 +-
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c                      |    2 +-
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c                      |    2 +-
 arch/arm/mach-omap2/pm24xx.c                                    |    2 +-
 arch/arm/mach-omap2/pm34xx.c                                    |    2 +-
 arch/arm/mach-omap2/serial.c                                    |    2 +-
 arch/arm/plat-omap/common.c                                     |    2 +-
 arch/arm/plat-omap/dma.c                                        |    2 +-
 arch/arm/plat-omap/include/{plat/dma.h => plat-omap/dma-omap.h} |    2 +-
 drivers/crypto/omap-aes.c                                       |    2 +-
 drivers/crypto/omap-sham.c                                      |    2 +-
 drivers/dma/omap-dma.c                                          |    2 +-
 drivers/media/platform/omap/omap_vout.c                         |    2 +-
 drivers/media/platform/omap/omap_vout_vrfb.c                    |    2 +-
 drivers/media/platform/omap3isp/ispstat.h                       |    2 +-
 drivers/media/platform/soc_camera/omap1_camera.c                |    3 +--
 drivers/mmc/host/omap.c                                         |    2 +-
 drivers/mtd/nand/omap2.c                                        |    2 +-
 drivers/mtd/onenand/omap2.c                                     |    2 +-
 drivers/usb/gadget/omap_udc.c                                   |    2 +-
 drivers/usb/musb/tusb6010_omap.c                                |    2 +-
 drivers/video/omap/lcdc.c                                       |    2 +-
 drivers/video/omap/omapfb_main.c                                |    2 +-
 drivers/video/omap/sossi.c                                      |    2 +-
 48 files changed, 48 insertions(+), 49 deletions(-)
 rename arch/arm/plat-omap/include/{plat/dma.h => plat-omap/dma-omap.h} (99%)

arch/arm/mach-omap1/board-h2.c +1 -1

index 72855ce..4c2cb8e 100644
@@ -39,8 +39,8 @@
 #include <asm/mach/map.h>
 
 #include <mach/mux.h>
-#include <plat/dma.h>
 #include <plat/tc.h>
+#include <plat-omap/dma-omap.h>
 #include <mach/irda.h>
 #include <linux/platform_data/keypad-omap.h>
 #include <mach/flash.h>

arch/arm/mach-omap1/board-h3.c +1 -1

index fa98327..3e638b8 100644
@@ -43,7 +43,7 @@
 #include <mach/mux.h>
 #include <plat/tc.h>
 #include <linux/platform_data/keypad-omap.h>
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 #include <mach/flash.h>
 
 #include <mach/hardware.h>

arch/arm/mach-omap1/board-palmte.c +1 -1

index 75ac3cd..eac94c2 100644
@@ -37,7 +37,7 @@
 #include <mach/flash.h>
 #include <mach/mux.h>
 #include <plat/tc.h>
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 #include <mach/irda.h>
 #include <linux/platform_data/keypad-omap.h>

arch/arm/mach-omap1/board-palmtt.c +1 -1

index 14e1847..3c06c0b 100644
@@ -36,10 +36,10 @@
 #include <plat/led.h>
 #include <mach/flash.h>
 #include <mach/mux.h>
-#include <plat/dma.h>
 #include <plat/tc.h>
 #include <mach/irda.h>
 #include <linux/platform_data/keypad-omap.h>
+#include <plat-omap/dma-omap.h>
 
 #include <mach/hardware.h>
 #include <mach/usb.h>

arch/arm/mach-omap1/board-palmz71.c +1 -1

index e403bc9..be16edd 100644
@@ -38,10 +38,10 @@
 
 #include <mach/flash.h>
 #include <mach/mux.h>
-#include <plat/dma.h>
 #include <plat/tc.h>
 #include <mach/irda.h>
 #include <linux/platform_data/keypad-omap.h>
+#include <plat-omap/dma-omap.h>
 
 #include <mach/hardware.h>
 #include <mach/usb.h>

arch/arm/mach-omap1/board-sx1.c +1 -1

index 1248fcc..f4c5db9 100644
@@ -36,7 +36,7 @@
 
 #include <mach/flash.h>
 #include <mach/mux.h>
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 #include <mach/irda.h>
 #include <plat/tc.h>
 #include <mach/board-sx1.h>

arch/arm/mach-omap1/devices.c +1 -1

index 890db8f..efd20c3 100644
@@ -21,8 +21,8 @@
 
 #include <plat/tc.h>
 #include <mach/mux.h>
-#include <plat/dma.h>
 #include <plat/mmc.h>
+#include <plat-omap/dma-omap.h>
 
 #include <mach/omap7xx.h>
 #include <mach/camera.h>

arch/arm/mach-omap1/dma.c +1 -1

index 40f1dc4..9159417 100644
@@ -25,7 +25,7 @@
 #include <linux/device.h>
 #include <linux/io.h>
 
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 #include <plat/tc.h>
 
 #include <mach/irqs.h>

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

index 6a5baab..244cc75 100644
@@ -18,7 +18,7 @@
 
 #include <mach/mux.h>
 #include <plat/tc.h>
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 
 #include "iomap.h"
 #include "common.h"

arch/arm/mach-omap1/lcd_dma.c +1 -1

index 9a54d3b..7ed8c18 100644
@@ -27,7 +27,7 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 
 #include <mach/hardware.h>
 #include <mach/lcdc.h>

arch/arm/mach-omap1/mcbsp.c +1 -1

index b92f15a..3d461e1 100644
@@ -19,7 +19,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 #include <mach/mux.h>
 #include <plat/cpu.h>
 #include <linux/platform_data/asoc-ti-mcbsp.h>

arch/arm/mach-omap1/pm.c +1 -1

index 47ec161..8f9726f 100644
@@ -54,8 +54,8 @@
 #include <plat/sram.h>
 #include <plat/tc.h>
 #include <mach/mux.h>
-#include <plat/dma.h>
 #include <plat/dmtimer.h>
+#include <plat-omap/dma-omap.h>
 
 #include <mach/irqs.h>

arch/arm/mach-omap2/board-3430sdp.c +1 -1

index 96cd369..2abbd6a 100644
@@ -32,7 +32,7 @@
 
 #include <plat/usb.h>
 #include "common.h"
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 #include <plat/gpmc.h>
 #include <video/omapdss.h>
 #include <video/omap-panel-tfp410.h>

arch/arm/mach-omap2/board-h4.c +1 -1

index f6c48dd..be92783 100644
@@ -32,7 +32,7 @@
 #include <asm/mach/map.h>
 
 #include <plat/menelaus.h>
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 #include <plat/gpmc.h>
 #include "debug-devices.h"

arch/arm/mach-omap2/board-rx51-peripherals.c +1 -1

index ed85fb8..67369ef 100644
@@ -31,7 +31,7 @@
 #include <asm/system_info.h>
 
 #include "common.h"
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 #include <plat/gpmc.h>
 #include <plat/omap-pm.h>
 #include "gpmc-smc91x.h"

arch/arm/mach-omap2/board-rx51.c +1 -1

index 7bbb05d..d255572 100644
@@ -24,9 +24,9 @@
 #include <asm/mach/map.h>
 
 #include "common.h"
-#include <plat/dma.h>
 #include <plat/gpmc.h>
 #include <plat/usb.h>
+#include <plat-omap/dma-omap.h>
 
 #include "mux.h"
 #include "pm.h"

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

index 998152c..53084e2 100644
@@ -24,7 +24,7 @@
 #include <asm/mach/map.h>
 
 #include "iomap.h"
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 #include <plat/omap_hwmod.h>
 #include <plat/omap_device.h>
 #include "omap4-keypad.h"

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

index ff75abe..4e3ac6b 100644
@@ -30,7 +30,7 @@
 
 #include <plat/omap_hwmod.h>
 #include <plat/omap_device.h>
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 
 #define OMAP2_DMA_STRIDE	0x60

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

index 4234d28..42a4b9c 100644
@@ -31,7 +31,7 @@
 #include <plat/omap-pm.h>
 #include <plat/omap_hwmod.h>
 #include <plat/multi.h>
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 
 #include "soc.h"
 #include "iomap.h"

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

index 37f8f94..b2c7f23 100644
@@ -20,7 +20,7 @@
 #include <linux/slab.h>
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 #include <plat/omap_device.h>
 #include <linux/pm_runtime.h>

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

index 10575a1..3b275c8 100644
@@ -15,7 +15,7 @@
 #include <linux/platform_data/spi-omap2-mcspi.h>
 
 #include <plat/omap_hwmod.h>
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 #include <plat/serial.h>
 #include <plat/i2c.h>
 #include <plat/dmtimer.h>

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

index 60de70f..7e44a63 100644
@@ -16,7 +16,7 @@
 #include <linux/platform_data/spi-omap2-mcspi.h>
 
 #include <plat/omap_hwmod.h>
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 #include <plat/serial.h>
 #include <plat/i2c.h>
 #include <plat/dmtimer.h>

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

index 04b99de..f5756bd 100644
@@ -11,8 +11,8 @@
  */
 #include <plat/omap_hwmod.h>
 #include <plat/serial.h>
-#include <plat/dma.h>
 #include <plat/common.h>
+#include <plat-omap/dma-omap.h>
 #include "hdq1w.h"
 
 #include "omap_hwmod_common_data.h"

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

index feeb401..e3f889e 100644
@@ -11,7 +11,7 @@
 #include <plat/omap_hwmod.h>
 #include <plat/serial.h>
 #include <linux/platform_data/gpio-omap.h>
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 #include <plat/dmtimer.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>

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

index 59d5c1c..f7f3c2d 100644
@@ -18,7 +18,7 @@
 #include <plat/cpu.h>
 #include <linux/platform_data/gpio-omap.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 #include <plat/mmc.h>
 #include <plat/i2c.h>

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

index deff845..c96a197 100644
@@ -17,8 +17,8 @@
 #include <linux/power/smartreflex.h>
 #include <linux/platform_data/gpio-omap.h>
 
+#include <plat-omap/dma-omap.h>
 #include <plat/omap_hwmod.h>
-#include <plat/dma.h>
 #include <plat/serial.h>
 #include "l3_3xxx.h"
 #include "l4_3xxx.h"

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

index 4c92f23..2f6a416 100644
@@ -24,7 +24,7 @@
 
 #include <plat/omap_hwmod.h>
 #include <plat/i2c.h>
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 #include <plat/mmc.h>

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

index 8af6cd6..601a49b 100644
@@ -38,7 +38,7 @@
 
 #include <plat/clock.h>
 #include <plat/sram.h>
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 
 #include "common.h"
 #include "prm2xxx_3xxx.h"

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

index ba670db..baee872 100644
@@ -41,7 +41,7 @@
 #include <plat/sdrc.h>
 #include <plat/prcm.h>
 #include <plat/gpmc.h>
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 
 #include "common.h"
 #include "cm2xxx_3xxx.h"

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

index 0405c81..67c4196 100644
@@ -29,7 +29,7 @@
 
 #include <plat/omap-serial.h>
 #include "common.h"
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 #include <plat/omap_hwmod.h>
 #include <plat/omap_device.h>
 #include <plat/omap-pm.h>

arch/arm/plat-omap/common.c +1 -1

index 111315a..b388e87 100644
@@ -19,7 +19,7 @@
 #include <plat/common.h>
 #include <plat/vram.h>
 #include <linux/platform_data/dsp-omap.h>
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 
 #include <plat/omap-secure.h>

arch/arm/plat-omap/dma.c +1 -1

index c76ed8b..53c970d 100644
@@ -37,8 +37,8 @@
 #include <linux/delay.h>
 
 #include <plat/cpu.h>
-#include <plat/dma.h>
 #include <plat/tc.h>
+#include <plat-omap/dma-omap.h>
 
 /*
  * MAX_LOGICAL_DMA_CH_COUNT: the maximum number of logical DMA

arch/arm/plat-omap/include/plat-omap/dma-omap.h renamed from arch/arm/plat-omap/include/plat/dma.h +1 -1

similarity index 99%
rename from arch/arm/plat-omap/include/plat/dma.h
rename to arch/arm/plat-omap/include/plat-omap/dma-omap.h
index 3f81458..222be7e 100644
@@ -1,5 +1,5 @@
 /*
- *  arch/arm/plat-omap/include/mach/dma.h
+ *  OMAP DMA handling defines and function
  *
  *  Copyright (C) 2003 Nokia Corporation
  *  Author: Juha Yrj?l? <[email protected]>

drivers/crypto/omap-aes.c +1 -1

index 093a8af..3e61feb 100644
@@ -30,7 +30,7 @@
 #include <crypto/aes.h>
 
 #include <plat/cpu.h>
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 
 /* OMAP TRM gives bitfields as start:end, where start is the higher bit
    number. For example 7:0 */

drivers/crypto/omap-sham.c +1 -1

index a3fd6fc..6d79695 100644
@@ -38,7 +38,7 @@
 #include <crypto/internal/hash.h>
 
 #include <plat/cpu.h>
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 #include <mach/irqs.h>
 
 #define SHA_REG_DIGEST(x)		(0x00 + ((x) * 0x04))

drivers/dma/omap-dma.c +1 -1

index bb2d8e7..0b4fa50 100644
@@ -20,7 +20,7 @@
 #include "virt-dma.h"
 
 #include <plat/cpu.h>
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 
 struct omap_dmadev {
 	struct dma_device ddev;

drivers/media/platform/omap/omap_vout.c +1 -1

index c9783fb..fd5b4c7 100644
@@ -45,7 +45,7 @@
 #include <media/v4l2-ioctl.h>
 
 #include <plat/cpu.h>
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 #include <plat/vrfb.h>
 #include <video/omapdss.h>

drivers/media/platform/omap/omap_vout_vrfb.c +1 -1

index 11d7a29..bed4cbb 100644
@@ -16,7 +16,7 @@
 #include <media/videobuf-dma-contig.h>
 #include <media/v4l2-device.h>
 
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 #include <plat/vrfb.h>
 
 #include "omap_voutdef.h"

drivers/media/platform/omap3isp/ispstat.h +1 -1

index 9b7c865..5a1c8c8 100644
@@ -30,8 +30,8 @@
 
 #include <linux/types.h>
 #include <linux/omap3isp.h>
-#include <plat/dma.h>
 #include <media/v4l2-event.h>
+#include <plat-omap/dma-omap.h>
 
 #include "isp.h"
 #include "ispvideo.h"

drivers/media/platform/soc_camera/omap1_camera.c +1 -2

index 3046dba..cadb553 100644
@@ -34,8 +34,7 @@
 #include <media/videobuf-dma-contig.h>
 #include <media/videobuf-dma-sg.h>
 
-#include <plat/dma.h>
-
+#include <plat-omap/dma-omap.h>
 
 #define DRIVER_NAME		"omap1-camera"
 #define DRIVER_VERSION		"0.0.2"

drivers/mmc/host/omap.c +1 -1

index 9664fa9..c59c4d2 100644
@@ -30,7 +30,7 @@
 #include <linux/slab.h>
 
 #include <plat/mmc.h>
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 
 #define	OMAP_MMC_REG_CMD	0x00
 #define	OMAP_MMC_REG_ARGL	0x01

drivers/mtd/nand/omap2.c +1 -1

index 3105f22..2cbdb8e 100644
@@ -27,7 +27,7 @@
 #include <linux/bch.h>
 #endif
 
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 #include <plat/gpmc.h>
 #include <linux/platform_data/mtd-nand-omap2.h>

drivers/mtd/onenand/omap2.c +1 -1

index 1961be9..b846eaf 100644
@@ -42,7 +42,7 @@
 #include <linux/platform_data/mtd-onenand-omap2.h>
 #include <asm/gpio.h>
 
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 #include <plat/cpu.h>
 
 #define DRIVER_NAME "omap2-onenand"

drivers/usb/gadget/omap_udc.c +1 -1

index 024c0b9..23afa06 100644
@@ -44,7 +44,7 @@
 #include <asm/unaligned.h>
 #include <asm/mach-types.h>
 
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 
 #include <mach/usb.h>

drivers/usb/musb/tusb6010_omap.c +1 -1

index c032fc2..bfca114 100644
@@ -16,7 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 
 #include "musb_core.h"
 #include "tusb6010.h"

drivers/video/omap/lcdc.c +1 -1

index 7767338..c39d6e4 100644
@@ -31,7 +31,7 @@
 #include <linux/gfp.h>
 
 #include <mach/lcdc.h>
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 
 #include <asm/mach-types.h>

drivers/video/omap/omapfb_main.c +1 -1

index 4351c43..1b5ee8e 100644
@@ -30,7 +30,7 @@
 #include <linux/uaccess.h>
 #include <linux/module.h>
 
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 
 #include "omapfb.h"
 #include "lcdc.h"

drivers/video/omap/sossi.c +1 -1

index f79c137..c510a44 100644
@@ -25,7 +25,7 @@
 #include <linux/io.h>
 #include <linux/interrupt.h>
 
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
 
 #include "omapfb.h"
 #include "lcdc.h"

Signature · 1 line

1.7.10.4

Lokesh Vutla

author

2012-10-01 18:47 UTC #5 lore raw

PATCH v2 5/7 ARM: OMAP1: Remove omap_reserve() callback for all omap1 boards

In reply to Lokesh Vutla

omap_reserve() is a stub for omap1. So dropping
omap_reserve callback from all OMAP1 board files.

Signed-off-by Lokesh Vutla <[email protected]>

---
 arch/arm/mach-omap1/board-ams-delta.c |    1 -
 arch/arm/mach-omap1/board-fsample.c   |    1 -
 arch/arm/mach-omap1/board-generic.c   |    1 -
 arch/arm/mach-omap1/board-h2.c        |    1 -
 arch/arm/mach-omap1/board-h3.c        |    1 -
 arch/arm/mach-omap1/board-htcherald.c |    1 -
 arch/arm/mach-omap1/board-innovator.c |    1 -
 arch/arm/mach-omap1/board-nokia770.c  |    1 -
 arch/arm/mach-omap1/board-osk.c       |    1 -
 arch/arm/mach-omap1/board-palmte.c    |    1 -
 arch/arm/mach-omap1/board-palmtt.c    |    1 -
 arch/arm/mach-omap1/board-palmz71.c   |    1 -
 arch/arm/mach-omap1/board-perseus2.c  |    1 -
 arch/arm/mach-omap1/board-sx1.c       |    1 -
 arch/arm/mach-omap1/board-voiceblue.c |    1 -
 15 files changed, 15 deletions(-)

arch/arm/mach-omap1/board-ams-delta.c +0 -1

index 9518bf5..e50b022 100644
@@ -613,7 +613,6 @@ MACHINE_START(AMS_DELTA, "Amstrad E3 (Delta)")
 	.atag_offset	= 0x100,
 	.map_io		= ams_delta_map_io,
 	.init_early	= omap1_init_early,
-	.reserve	= omap_reserve,
 	.init_irq	= omap1_init_irq,
 	.init_machine	= ams_delta_init,
 	.init_late	= ams_delta_init_late,

arch/arm/mach-omap1/board-fsample.c +0 -1

index 4b6de70..acd3ba6 100644
@@ -362,7 +362,6 @@ MACHINE_START(OMAP_FSAMPLE, "OMAP730 F-Sample")
 	.atag_offset	= 0x100,
 	.map_io		= omap_fsample_map_io,
 	.init_early	= omap1_init_early,
-	.reserve	= omap_reserve,
 	.init_irq	= omap1_init_irq,
 	.init_machine	= omap_fsample_init,
 	.init_late	= omap1_init_late,

arch/arm/mach-omap1/board-generic.c +0 -1

index 4ec579f..608e7d2 100644
@@ -81,7 +81,6 @@ MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710")
 	.atag_offset	= 0x100,
 	.map_io		= omap16xx_map_io,
 	.init_early	= omap1_init_early,
-	.reserve	= omap_reserve,
 	.init_irq	= omap1_init_irq,
 	.init_machine	= omap_generic_init,
 	.init_late	= omap1_init_late,

arch/arm/mach-omap1/board-h2.c +0 -1

index 4c2cb8e..fdc847d 100644
@@ -459,7 +459,6 @@ MACHINE_START(OMAP_H2, "TI-H2")
 	.atag_offset	= 0x100,
 	.map_io		= omap16xx_map_io,
 	.init_early     = omap1_init_early,
-	.reserve	= omap_reserve,
 	.init_irq	= omap1_init_irq,
 	.init_machine	= h2_init,
 	.init_late	= omap1_init_late,

arch/arm/mach-omap1/board-h3.c +0 -1

index 3e638b8..2768f99 100644
@@ -452,7 +452,6 @@ MACHINE_START(OMAP_H3, "TI OMAP1710 H3 board")
 	.atag_offset	= 0x100,
 	.map_io		= omap16xx_map_io,
 	.init_early     = omap1_init_early,
-	.reserve	= omap_reserve,
 	.init_irq	= omap1_init_irq,
 	.init_machine	= h3_init,
 	.init_late	= omap1_init_late,

arch/arm/mach-omap1/board-htcherald.c +0 -1

index 87ab208..bd0d6fd 100644
@@ -600,7 +600,6 @@ MACHINE_START(HERALD, "HTC Herald")
 	.atag_offset    = 0x100,
 	.map_io         = htcherald_map_io,
 	.init_early     = omap1_init_early,
-	.reserve	= omap_reserve,
 	.init_irq       = omap1_init_irq,
 	.init_machine   = htcherald_init,
 	.init_late	= omap1_init_late,

arch/arm/mach-omap1/board-innovator.c +0 -1

index db5f7d2..1b7a62e 100644
@@ -454,7 +454,6 @@ MACHINE_START(OMAP_INNOVATOR, "TI-Innovator")
 	.atag_offset	= 0x100,
 	.map_io		= innovator_map_io,
 	.init_early     = omap1_init_early,
-	.reserve	= omap_reserve,
 	.init_irq	= omap1_init_irq,
 	.init_machine	= innovator_init,
 	.init_late	= omap1_init_late,

arch/arm/mach-omap1/board-nokia770.c +0 -1

index 7d5c06d..6b24394 100644
@@ -251,7 +251,6 @@ MACHINE_START(NOKIA770, "Nokia 770")
 	.atag_offset	= 0x100,
 	.map_io		= omap16xx_map_io,
 	.init_early     = omap1_init_early,
-	.reserve	= omap_reserve,
 	.init_irq	= omap1_init_irq,
 	.init_machine	= omap_nokia770_init,
 	.init_late	= omap1_init_late,

arch/arm/mach-omap1/board-osk.c +0 -1

index 5973945..8fd78f7 100644
@@ -606,7 +606,6 @@ MACHINE_START(OMAP_OSK, "TI-OSK")
 	.atag_offset	= 0x100,
 	.map_io		= omap16xx_map_io,
 	.init_early	= omap1_init_early,
-	.reserve	= omap_reserve,
 	.init_irq	= omap1_init_irq,
 	.init_machine	= osk_init,
 	.init_late	= omap1_init_late,

arch/arm/mach-omap1/board-palmte.c +0 -1

index eac94c2..caa1023 100644
@@ -265,7 +265,6 @@ MACHINE_START(OMAP_PALMTE, "OMAP310 based Palm Tungsten E")
 	.atag_offset	= 0x100,
 	.map_io		= omap15xx_map_io,
 	.init_early     = omap1_init_early,
-	.reserve	= omap_reserve,
 	.init_irq	= omap1_init_irq,
 	.init_machine	= omap_palmte_init,
 	.init_late	= omap1_init_late,

arch/arm/mach-omap1/board-palmtt.c +0 -1

index 3c06c0b..38e75a7 100644
@@ -311,7 +311,6 @@ MACHINE_START(OMAP_PALMTT, "OMAP1510 based Palm Tungsten|T")
 	.atag_offset	= 0x100,
 	.map_io		= omap15xx_map_io,
 	.init_early     = omap1_init_early,
-	.reserve	= omap_reserve,
 	.init_irq	= omap1_init_irq,
 	.init_machine	= omap_palmtt_init,
 	.init_late	= omap1_init_late,

arch/arm/mach-omap1/board-palmz71.c +0 -1

index be16edd..41e8726 100644
@@ -327,7 +327,6 @@ MACHINE_START(OMAP_PALMZ71, "OMAP310 based Palm Zire71")
 	.atag_offset	= 0x100,
 	.map_io		= omap15xx_map_io,
 	.init_early     = omap1_init_early,
-	.reserve	= omap_reserve,
 	.init_irq	= omap1_init_irq,
 	.init_machine	= omap_palmz71_init,
 	.init_late	= omap1_init_late,

arch/arm/mach-omap1/board-perseus2.c +0 -1

index 198b054..5fc074a 100644
@@ -324,7 +324,6 @@ MACHINE_START(OMAP_PERSEUS2, "OMAP730 Perseus2")
 	.atag_offset	= 0x100,
 	.map_io		= omap_perseus2_map_io,
 	.init_early     = omap1_init_early,
-	.reserve	= omap_reserve,
 	.init_irq	= omap1_init_irq,
 	.init_machine	= omap_perseus2_init,
 	.init_late	= omap1_init_late,

arch/arm/mach-omap1/board-sx1.c +0 -1

index f4c5db9..b2bcf31 100644
@@ -404,7 +404,6 @@ MACHINE_START(SX1, "OMAP310 based Siemens SX1")
 	.atag_offset	= 0x100,
 	.map_io		= omap15xx_map_io,
 	.init_early     = omap1_init_early,
-	.reserve	= omap_reserve,
 	.init_irq	= omap1_init_irq,
 	.init_machine	= omap_sx1_init,
 	.init_late	= omap1_init_late,

arch/arm/mach-omap1/board-voiceblue.c +0 -1

index ad75e34..1a21101 100644
@@ -286,7 +286,6 @@ MACHINE_START(VOICEBLUE, "VoiceBlue OMAP5910")
 	.atag_offset	= 0x100,
 	.map_io		= omap15xx_map_io,
 	.init_early     = omap1_init_early,
-	.reserve	= omap_reserve,
 	.init_irq	= omap1_init_irq,
 	.init_machine	= voiceblue_init,
 	.init_late	= omap1_init_late,

Signature · 1 line

1.7.10.4

Lokesh Vutla

author

2012-10-01 18:47 UTC #6 lore raw

PATCH v2 6/7 ARM: OMAP2+: Move omap_reserve() locally to mach-omap2

In reply to Lokesh Vutla

omap_reserve() callback is defned only for mach-omap2. So, moving definition of omap_reserve() to mach-omap2. This helps is moving plat/omap_secure.h local to mach-omap2

Signed-off-by Lokesh Vutla <[email protected]>

---
 arch/arm/mach-omap2/common.c             |   20 ++++++++++++++++++++
 arch/arm/mach-omap2/common.h             |    1 +
 arch/arm/plat-omap/common.c              |   21 ---------------------
 arch/arm/plat-omap/include/plat/common.h |    1 -
 4 files changed, 21 insertions(+), 22 deletions(-)

arch/arm/mach-omap2/common.c +20 -0

index 17950c6..4ce0d63 100644
@@ -16,8 +16,11 @@
 #include <linux/init.h>
 #include <linux/clk.h>
 #include <linux/io.h>
+#include <linux/platform_data/dsp-omap.h>
 
 #include <plat/clock.h>
+#include <plat/omap-secure.h>
+#include <plat/vram.h>
 
 #include "soc.h"
 #include "iomap.h"

@@ -200,3 +203,20 @@ void __init omap5_map_io(void)
 	omap5_map_common_io();
 }
 #endif
+
+/*
+ * Stub function for OMAP2 so that common files
+ * continue to build when custom builds are used
+ */
+int __weak omap_secure_ram_reserve_memblock(void)
+{
+	return 0;
+}
+
+void __init omap_reserve(void)
+{
+	omap_vram_reserve_sdram_memblock();
+	omap_dsp_reserve_sdram_memblock();
+	omap_secure_ram_reserve_memblock();
+	omap_barrier_reserve_memblock();
+}

arch/arm/mach-omap2/common.h +1 -0

index 7045e4d..e84c589 100644
@@ -338,6 +338,7 @@ extern void omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0,
 				      struct omap_sdrc_params *sdrc_cs1);
 struct omap2_hsmmc_info;
 extern int omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers);
+extern void omap_reserve(void);
 
 #endif /* __ASSEMBLER__ */
 #endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */

arch/arm/plat-omap/common.c +0 ~~-21~~

index b388e87..aa23d49 100644
@@ -17,32 +17,11 @@
 #include <linux/dma-mapping.h>
 
 #include <plat/common.h>
-#include <plat/vram.h>
-#include <linux/platform_data/dsp-omap.h>
 #include <plat-omap/dma-omap.h>
 
-#include <plat/omap-secure.h>
-
-void __init omap_reserve(void)
-{
-	omap_vram_reserve_sdram_memblock();
-	omap_dsp_reserve_sdram_memblock();
-	omap_secure_ram_reserve_memblock();
-	omap_barrier_reserve_memblock();
-}
-
 void __init omap_init_consistent_dma_size(void)
 {
 #ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE
 	init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE << 20);
 #endif
 }
-
-/*
- * Stub function for OMAP2 so that common files
- * continue to build when custom builds are used
- */
-int __weak omap_secure_ram_reserve_memblock(void)
-{
-	return 0;
-}

arch/arm/plat-omap/include/plat/common.h +0 -1

index d1cb6f5..cb337c3 100644
@@ -34,7 +34,6 @@ extern int __init omap_init_clocksource_32k(void __iomem *vbase);
 
 extern void __init omap_check_revision(void);
 
-extern void omap_reserve(void);
 extern int omap_dss_reset(struct omap_hwmod *);
 
 void omap_sram_init(void);

Signature · 1 line

1.7.10.4

Lokesh Vutla

author

2012-10-01 18:47 UTC #7 lore raw

PATCH v2 7/7 ARM: OMAP: Move plat/omap-secure.h locally to mach-omap2

In reply to Lokesh Vutla

Moving plat/omap-secure.h locally to mach-omap2/
as part of single zImage work

Signed-off-by Lokesh Vutla <[email protected]>

---
 arch/arm/mach-omap2/common.c                  |    2 +-
 arch/arm/mach-omap2/omap-secure.c             |    1 -
 arch/arm/mach-omap2/omap-secure.h             |    7 +++++++
 arch/arm/mach-omap2/omap4-common.c            |    2 +-
 arch/arm/plat-omap/include/plat/omap-secure.h |   14 --------------
 5 files changed, 9 insertions(+), 17 deletions(-)
 delete mode 100644 arch/arm/plat-omap/include/plat/omap-secure.h

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

index 4ce0d63..b0f21b7 100644
@@ -19,7 +19,6 @@
 #include <linux/platform_data/dsp-omap.h>
 
 #include <plat/clock.h>
-#include <plat/omap-secure.h>
 #include <plat/vram.h>
 
 #include "soc.h"

@@ -27,6 +26,7 @@
 #include "common.h"
 #include "sdrc.h"
 #include "control.h"
+#include "omap-secure.h"
 
 /* Global address base setup code */

arch/arm/mach-omap2/omap-secure.c +0 -1

index a004cb9..98624fe 100644
@@ -18,7 +18,6 @@
 #include <asm/cacheflush.h>
 #include <asm/memblock.h>
 
-#include <plat/omap-secure.h>
 #include "omap-secure.h"
 
 static phys_addr_t omap_secure_memblock_base;

arch/arm/mach-omap2/omap-secure.h +7 -0

index c90a435..0e72917 100644
@@ -52,6 +52,13 @@ extern u32 omap_secure_dispatcher(u32 idx, u32 flag, u32 nargs,
 				u32 arg1, u32 arg2, u32 arg3, u32 arg4);
 extern u32 omap_smc2(u32 id, u32 falg, u32 pargs);
 extern phys_addr_t omap_secure_ram_mempool_base(void);
+extern int omap_secure_ram_reserve_memblock(void);
 
+#ifdef CONFIG_OMAP4_ERRATA_I688
+extern int omap_barrier_reserve_memblock(void);
+#else
+static inline void omap_barrier_reserve_memblock(void)
+{ }
+#endif
 #endif /* __ASSEMBLER__ */
 #endif /* OMAP_ARCH_OMAP_SECURE_H */

arch/arm/mach-omap2/omap4-common.c +1 -1

index e1f2897..ae57b63 100644
@@ -26,7 +26,6 @@
 #include <asm/memblock.h>
 
 #include <plat/sram.h>
-#include <plat/omap-secure.h>
 #include <plat/mmc.h>
 
 #include "omap-wakeupgen.h"

@@ -35,6 +34,7 @@
 #include "common.h"
 #include "hsmmc.h"
 #include "omap4-sar-layout.h"
+#include "omap-secure.h"
 
 #ifdef CONFIG_CACHE_L2X0
 static void __iomem *l2cache_base;

arch/arm/plat-omap/include/plat/omap-secure.h deleted +0 -0

deleted file mode 100644
index 0e4acd2..0000000

Signature · 1 line

1.7.10.4

Tony Lindgren

maintainer

2012-10-02 03:21 UTC #8 lore raw

v2 cover ARM: OMAP: Move plat/dma*.h,omap-secure.h headers as part of single zImage work

In reply to Lokesh Vutla

Quoted 16 lines · Lokesh Vutla

Patch 1:
Dropping the file plat/dma44xx.h as none of the omap44xx dma channel definitions are used.
Patch 2:
Moving OMAP1 DMA channel definitions to mach-omap1
Patch 3:
Moving OMAP2+ DMA channel definitions to mach-omap2
Patch 4:
Moving plat/dma.h to plat-omap/dma-omap.h
Patch 5:
Removing omap_reserve() callback from all omap1 board files.
Patch 6:
Defining omap_reserve() locally to mach-omap2.
Patch 7:
Move plat/omap-secure.h locally to mach-omap2

Quoted 8 lines

Lokesh Vutla (7):
ARM: OMAP: DMA: Removing plat/dma-44xx.h
ARM: OMAP1: DMA: Moving OMAP1 DMA channel definitions to mach-omap1
ARM: OMAP2+: DMA: Moving OMAP2 DMA channel definitions to mach-omap2
ARM: OMAP: DMA: Move plat/dma.h to plat-omap/dma-omap.h
ARM: OMAP1: Remove omap_reserve() callback for all omap1 boards
ARM: OMAP2+: Move omap_reserve() locally to mach-omap2
ARM: OMAP: Move plat/omap-secure.h locally to mach-omap2

Thanks, I'll be applying these probably at -rc1. If anybody has better ideas for the move of plat/dma.h to plat-omap/dma-omap.h, please yell out now.

Regards,

Tony