Skip to contentSkip to conversation

ARM: davinci: re-arrange definitions to have a common davinci header

PATCH Superseded Manjunath Hadli 4 participants 10 messages Dec 8, 2011 – Dec 13, 2011

Subsystems (4)
Arm (32-bit) Media (V4L/DVB) Arm sub-architectures TI DaVinci machine support

v4 of 8 Superseded Latest is v8 →

lore
Share & tools
lore

Manjunath Hadli

author
#0 lore raw

v4 cover ARM: davinci: re-arrange definitions to have a common davinci header

Re-arrange definitions and remove unnecessary code so that we can have a common header for all davinci platforms. This will enable us to share defines and enable common routines to be used without polluting hardware.h.
This patch set forms the base for a later set of patches for having
a common system module base address (DAVINCI_SYSTEM_MODULE_BASE).

Changes from previous version:
1. Addressed Shekhar's comments for non-inclusion of mach headers from core.
2. Move the mach header from include to mach

Manjunath Hadli (5):
davinci: vpif: remove obsolete header file inclusion
ARM: davinci: dm644x: remove the macros from the header to move to c
file
ARM: davinci: dm365: remove the macros from the header to move to c
file
ARM: davinci: dm646x: remove the macros from the header to move to c
file
ARM: davinci: create new common platform header for davinci

 arch/arm/mach-davinci/board-dm355-evm.c     |    2 +-
 arch/arm/mach-davinci/board-dm355-leopard.c |    2 +-
 arch/arm/mach-davinci/board-dm365-evm.c     |    2 +-
 arch/arm/mach-davinci/board-dm644x-evm.c    |    2 +-
 arch/arm/mach-davinci/board-dm646x-evm.c    |    2 +-
 arch/arm/mach-davinci/board-neuros-osd2.c   |    2 +-
 arch/arm/mach-davinci/board-sffsdr.c        |    2 +-
 arch/arm/mach-davinci/davinci.h             |   88 +++++++++++++++++++++++++++
 arch/arm/mach-davinci/dm355.c               |    2 +-
 arch/arm/mach-davinci/dm365.c               |   18 +++++-
 arch/arm/mach-davinci/dm644x.c              |    9 +++-
 arch/arm/mach-davinci/dm646x.c              |    9 +++-
 arch/arm/mach-davinci/include/mach/dm355.h  |   32 ----------
 arch/arm/mach-davinci/include/mach/dm365.h  |   52 ----------------
 arch/arm/mach-davinci/include/mach/dm644x.h |   47 --------------
 arch/arm/mach-davinci/include/mach/dm646x.h |   41 ------------
 drivers/media/video/davinci/vpif.h          |    2 +-
 drivers/media/video/davinci/vpif_display.c  |    2 -
 18 files changed, 130 insertions(+), 186 deletions(-)
 create mode 100644 arch/arm/mach-davinci/davinci.h
 delete mode 100644 arch/arm/mach-davinci/include/mach/dm355.h
 delete mode 100644 arch/arm/mach-davinci/include/mach/dm365.h
 delete mode 100644 arch/arm/mach-davinci/include/mach/dm644x.h
 delete mode 100644 arch/arm/mach-davinci/include/mach/dm646x.h
author
#1 lore raw

PATCH v4 1/5 davinci: vpif: remove obsolete header file inclusion

remove inclusion of header files from vpif.h and vpif_dispaly.c and add appropriate header file for building.

Signed-off-by Manjunath Hadli <[email protected]>
---
 drivers/media/video/davinci/vpif.h         |    2 +-
 drivers/media/video/davinci/vpif_display.c |    2 --
 2 files changed, 1 insertions(+), 3 deletions(-)
drivers/media/video/davinci/vpif.h +1 -1
index 25036cb..c96268a 100644
@@ -19,7 +19,7 @@
 #include <linux/io.h>
 #include <linux/videodev2.h>
 #include <mach/hardware.h>
-#include <mach/dm646x.h>
+#include <linux/i2c.h>
 #include <media/davinci/vpif_types.h>
 
 /* Maximum channel allowed */
drivers/media/video/davinci/vpif_display.c +0 -2
index 286f029..7fa34b4 100644
@@ -39,8 +39,6 @@
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-chip-ident.h>
 
-#include <mach/dm646x.h>
-
 #include "vpif_display.h"
 #include "vpif.h"
Signature · 1 line
1.6.2.4
author
#2 lore raw

PATCH v4 2/5 ARM: davinci: dm644x: remove the macros from the header to move to c file

In reply to Manjunath Hadli

move the register base addresses and offsets used only by dm644x platform file from platform header dm644x.h to dm644x.c as they are used only in the c file.

Signed-off-by Manjunath Hadli <[email protected]>
---
 arch/arm/mach-davinci/dm644x.c              |    7 +++++++
 arch/arm/mach-davinci/include/mach/dm644x.h |    7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)
arch/arm/mach-davinci/dm644x.c +7 -0
index 3470983..27d1371 100644
@@ -35,6 +35,13 @@
  */
 #define DM644X_REF_FREQ		27000000
 
+#define DM644X_EMAC_BASE		0x01c80000
+#define DM644X_EMAC_MDIO_BASE		(DM644X_EMAC_BASE + 0x4000)
+#define DM644X_EMAC_CNTRL_OFFSET	0x0000
+#define DM644X_EMAC_CNTRL_MOD_OFFSET	0x1000
+#define DM644X_EMAC_CNTRL_RAM_OFFSET	0x2000
+#define DM644X_EMAC_CNTRL_RAM_SIZE	0x2000
+
 static struct pll_data pll1_data = {
 	.num       = 1,
 	.phys_base = DAVINCI_PLL1_BASE,
arch/arm/mach-davinci/include/mach/dm644x.h +0 -7
index 5a1b26d..724377f 100644
@@ -27,13 +27,6 @@
 #include <mach/asp.h>
 #include <media/davinci/vpfe_capture.h>
 
-#define DM644X_EMAC_BASE		(0x01C80000)
-#define DM644X_EMAC_MDIO_BASE		(DM644X_EMAC_BASE + 0x4000)
-#define DM644X_EMAC_CNTRL_OFFSET	(0x0000)
-#define DM644X_EMAC_CNTRL_MOD_OFFSET	(0x1000)
-#define DM644X_EMAC_CNTRL_RAM_OFFSET	(0x2000)
-#define DM644X_EMAC_CNTRL_RAM_SIZE	(0x2000)
-
 #define DM644X_ASYNC_EMIF_CONTROL_BASE	0x01E00000
 #define DM644X_ASYNC_EMIF_DATA_CE0_BASE 0x02000000
 #define DM644X_ASYNC_EMIF_DATA_CE1_BASE 0x04000000
Signature · 1 line
1.6.2.4
author
#3 lore raw

PATCH v4 3/5 ARM: davinci: dm365: remove the macros from the header to move to c file

In reply to Manjunath Hadli

move the register base addresses and offsets used only by dm365 platform file from platform header dm365.h to dm365.c as they are used only in the c file.

Signed-off-by Manjunath Hadli <[email protected]>
---
 arch/arm/mach-davinci/dm365.c              |   16 ++++++++++++++++
 arch/arm/mach-davinci/include/mach/dm365.h |   16 ----------------
 2 files changed, 16 insertions(+), 16 deletions(-)
arch/arm/mach-davinci/dm365.c +16 -0
index 679e168..77edee8 100644
@@ -40,6 +40,22 @@
 
 #define DM365_REF_FREQ		24000000	/* 24 MHz on the DM365 EVM */
 
+/* Base of key scan register bank */
+#define DM365_KEYSCAN_BASE		0x01c69400
+
+#define DM365_RTC_BASE			0x01c69000
+
+#define DAVINCI_DM365_VC_BASE		0x01d0c000
+#define DAVINCI_DMA_VC_TX		2
+#define DAVINCI_DMA_VC_RX		3
+
+#define DM365_EMAC_BASE			0x01d07000
+#define DM365_EMAC_MDIO_BASE		(DM365_EMAC_BASE + 0x4000)
+#define DM365_EMAC_CNTRL_OFFSET		0x0000
+#define DM365_EMAC_CNTRL_MOD_OFFSET	0x3000
+#define DM365_EMAC_CNTRL_RAM_OFFSET	0x1000
+#define DM365_EMAC_CNTRL_RAM_SIZE	0x2000
+
 static struct pll_data pll1_data = {
 	.num		= 1,
 	.phys_base	= DAVINCI_PLL1_BASE,
arch/arm/mach-davinci/include/mach/dm365.h +0 -16
index 2563bf4..51924de 100644
@@ -20,22 +20,6 @@
 #include <mach/keyscan.h>
 #include <media/davinci/vpfe_capture.h>
 
-#define DM365_EMAC_BASE			(0x01D07000)
-#define DM365_EMAC_MDIO_BASE		(DM365_EMAC_BASE + 0x4000)
-#define DM365_EMAC_CNTRL_OFFSET		(0x0000)
-#define DM365_EMAC_CNTRL_MOD_OFFSET	(0x3000)
-#define DM365_EMAC_CNTRL_RAM_OFFSET	(0x1000)
-#define DM365_EMAC_CNTRL_RAM_SIZE	(0x2000)
-
-/* Base of key scan register bank */
-#define DM365_KEYSCAN_BASE		(0x01C69400)
-
-#define DM365_RTC_BASE			(0x01C69000)
-
-#define DAVINCI_DM365_VC_BASE		(0x01D0C000)
-#define DAVINCI_DMA_VC_TX		2
-#define DAVINCI_DMA_VC_RX		3
-
 #define DM365_ASYNC_EMIF_CONTROL_BASE	0x01D10000
 #define DM365_ASYNC_EMIF_DATA_CE0_BASE	0x02000000
 #define DM365_ASYNC_EMIF_DATA_CE1_BASE	0x04000000
Signature · 1 line
1.6.2.4
author
#4 lore raw

PATCH v4 4/5 ARM: davinci: dm646x: remove the macros from the header to move to c file

In reply to Manjunath Hadli

move the register base addresses and offsets used only by dm646x platform file from platform header dm646x.h to dm646x.c as they are used only in the c file.

Signed-off-by Manjunath Hadli <[email protected]>
---
 arch/arm/mach-davinci/dm646x.c              |    7 +++++++
 arch/arm/mach-davinci/include/mach/dm646x.h |    7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)
arch/arm/mach-davinci/dm646x.c +7 -0
index 0b68ed5..0560e82 100644
@@ -46,6 +46,13 @@
 #define DM646X_REF_FREQ		27000000
 #define DM646X_AUX_FREQ		24000000
 
+#define DM646X_EMAC_BASE		0x01c80000
+#define DM646X_EMAC_MDIO_BASE		(DM646X_EMAC_BASE + 0x4000)
+#define DM646X_EMAC_CNTRL_OFFSET	0x0000
+#define DM646X_EMAC_CNTRL_MOD_OFFSET	0x1000
+#define DM646X_EMAC_CNTRL_RAM_OFFSET	0x2000
+#define DM646X_EMAC_CNTRL_RAM_SIZE	0x2000
+
 static struct pll_data pll1_data = {
 	.num       = 1,
 	.phys_base = DAVINCI_PLL1_BASE,
arch/arm/mach-davinci/include/mach/dm646x.h +0 -7
index a8ee6c9..eb95864 100644
@@ -18,13 +18,6 @@
 #include <linux/davinci_emac.h>
 #include <media/davinci/vpif_types.h>
 
-#define DM646X_EMAC_BASE		(0x01C80000)
-#define DM646X_EMAC_MDIO_BASE		(DM646X_EMAC_BASE + 0x4000)
-#define DM646X_EMAC_CNTRL_OFFSET	(0x0000)
-#define DM646X_EMAC_CNTRL_MOD_OFFSET	(0x1000)
-#define DM646X_EMAC_CNTRL_RAM_OFFSET	(0x2000)
-#define DM646X_EMAC_CNTRL_RAM_SIZE	(0x2000)
-
 #define DM646X_ASYNC_EMIF_CONTROL_BASE	0x20008000
 #define DM646X_ASYNC_EMIF_CS2_SPACE_BASE 0x42000000
Signature · 1 line
1.6.2.4
author
#5 lore raw

PATCH v4 5/5 ARM: davinci: create new common platform header for davinci

In reply to Manjunath Hadli

remove the code from individual platform header files for dm365, dm355, dm644x and dm646x and consolidate it into a single and common header file davinci.h.

Signed-off-by Manjunath Hadli <[email protected]>
---
 arch/arm/mach-davinci/board-dm355-evm.c     |    2 +-
 arch/arm/mach-davinci/board-dm355-leopard.c |    2 +-
 arch/arm/mach-davinci/board-dm365-evm.c     |    2 +-
 arch/arm/mach-davinci/board-dm644x-evm.c    |    2 +-
 arch/arm/mach-davinci/board-dm646x-evm.c    |    2 +-
 arch/arm/mach-davinci/board-neuros-osd2.c   |    2 +-
 arch/arm/mach-davinci/board-sffsdr.c        |    2 +-
 arch/arm/mach-davinci/davinci.h             |   88 +++++++++++++++++++++++++++
 arch/arm/mach-davinci/dm355.c               |    2 +-
 arch/arm/mach-davinci/dm365.c               |    2 +-
 arch/arm/mach-davinci/dm644x.c              |    2 +-
 arch/arm/mach-davinci/dm646x.c              |    2 +-
 arch/arm/mach-davinci/include/mach/dm355.h  |   32 ----------
 arch/arm/mach-davinci/include/mach/dm365.h  |   36 -----------
 arch/arm/mach-davinci/include/mach/dm644x.h |   40 ------------
 arch/arm/mach-davinci/include/mach/dm646x.h |   34 ----------
 16 files changed, 99 insertions(+), 153 deletions(-)
 create mode 100644 arch/arm/mach-davinci/davinci.h
 delete mode 100644 arch/arm/mach-davinci/include/mach/dm355.h
 delete mode 100644 arch/arm/mach-davinci/include/mach/dm365.h
 delete mode 100644 arch/arm/mach-davinci/include/mach/dm644x.h
 delete mode 100644 arch/arm/mach-davinci/include/mach/dm646x.h
arch/arm/mach-davinci/board-dm355-evm.c +1 -1
index 4e0e707..7ae0d15 100644
@@ -26,7 +26,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
-#include <mach/dm355.h>
+#include "davinci.h"
 #include <mach/i2c.h>
 #include <mach/serial.h>
 #include <mach/nand.h>
arch/arm/mach-davinci/board-dm355-leopard.c +1 -1
index ff2d241..56f88de 100644
@@ -23,7 +23,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
-#include <mach/dm355.h>
+#include "davinci.h"
 #include <mach/i2c.h>
 #include <mach/serial.h>
 #include <mach/nand.h>
arch/arm/mach-davinci/board-dm365-evm.c +1 -1
index 1918ae7..613ed00 100644
@@ -32,7 +32,7 @@
 #include <asm/mach/arch.h>
 
 #include <mach/mux.h>
-#include <mach/dm365.h>
+#include "davinci.h"
 #include <mach/common.h>
 #include <mach/i2c.h>
 #include <mach/serial.h>
arch/arm/mach-davinci/board-dm644x-evm.c +1 -1
index 0cf8abf..00e8599 100644
@@ -30,7 +30,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
-#include <mach/dm644x.h>
+#include "davinci.h"
 #include <mach/common.h>
 #include <mach/i2c.h>
 #include <mach/serial.h>
arch/arm/mach-davinci/board-dm646x-evm.c +1 -1
index e574d7f..c0f9ea2 100644
@@ -36,7 +36,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
-#include <mach/dm646x.h>
+#include "davinci.h"
 #include <mach/common.h>
 #include <mach/serial.h>
 #include <mach/i2c.h>
arch/arm/mach-davinci/board-neuros-osd2.c +1 -1
index e5f231a..edc6ff7 100644
@@ -30,7 +30,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
-#include <mach/dm644x.h>
+#include "davinci.h"
 #include <mach/common.h>
 #include <mach/i2c.h>
 #include <mach/serial.h>
arch/arm/mach-davinci/board-sffsdr.c +1 -1
index 5dd4da9..122c7aa 100644
@@ -35,7 +35,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
 
-#include <mach/dm644x.h>
+#include "davinci.h"
 #include <mach/common.h>
 #include <mach/i2c.h>
 #include <mach/serial.h>
arch/arm/mach-davinci/davinci.h new file +88 -0

88 lines not on this page · raw message

arch/arm/mach-davinci/dm355.c +1 -1
index fe520d4..36744ff 100644
@@ -18,7 +18,7 @@
 
 #include <asm/mach/map.h>
 
-#include <mach/dm355.h>
+#include "davinci.h"
 #include <mach/cputype.h>
 #include <mach/edma.h>
 #include <mach/psc.h>
arch/arm/mach-davinci/dm365.c +1 -1
index 77edee8..3171cd1 100644
@@ -21,7 +21,7 @@
 
 #include <asm/mach/map.h>
 
-#include <mach/dm365.h>
+#include "davinci.h"
 #include <mach/cputype.h>
 #include <mach/edma.h>
 #include <mach/psc.h>
arch/arm/mach-davinci/dm644x.c +1 -1
index 27d1371..b84b220 100644
@@ -15,7 +15,7 @@
 
 #include <asm/mach/map.h>
 
-#include <mach/dm644x.h>
+#include "davinci.h"
 #include <mach/cputype.h>
 #include <mach/edma.h>
 #include <mach/irqs.h>
arch/arm/mach-davinci/dm646x.c +1 -1
index 0560e82..a6a9cde 100644
@@ -16,7 +16,7 @@
 
 #include <asm/mach/map.h>
 
-#include <mach/dm646x.h>
+#include "davinci.h"
 #include <mach/cputype.h>
 #include <mach/edma.h>
 #include <mach/irqs.h>
arch/arm/mach-davinci/include/mach/dm355.h deleted +0 -32
deleted file mode 100644
index 36dff4a..0000000
@@ -1,32 +0,0 @@
-/*
- * Chip specific defines for DM355 SoC
- *
- * Author: Kevin Hilman, Deep Root Systems, LLC
- *
- * 2007 (c) Deep Root Systems, LLC. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-#ifndef __ASM_ARCH_DM355_H
-#define __ASM_ARCH_DM355_H
-
-#include <mach/hardware.h>
-#include <mach/asp.h>
-#include <media/davinci/vpfe_capture.h>
-
-#define DM355_ASYNC_EMIF_CONTROL_BASE	0x01E10000
-#define DM355_ASYNC_EMIF_DATA_CE0_BASE	0x02000000
-
-#define ASP1_TX_EVT_EN	1
-#define ASP1_RX_EVT_EN	2
-
-struct spi_board_info;
-
-void __init dm355_init(void);
-void dm355_init_spi0(unsigned chipselect_mask,
-		struct spi_board_info *info, unsigned len);
-void __init dm355_init_asp1(u32 evt_enable, struct snd_platform_data *pdata);
-void dm355_set_vpfe_config(struct vpfe_config *cfg);
-
-#endif /* __ASM_ARCH_DM355_H */
arch/arm/mach-davinci/include/mach/dm365.h deleted +0 -36
deleted file mode 100644
index 51924de..0000000
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2009 Texas Instruments Incorporated
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation version 2.
- *
- * This program is distributed "as is" WITHOUT ANY WARRANTY of any
- * kind, whether express or implied; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-#ifndef __ASM_ARCH_DM365_H
-#define __ASM_ARCH_DM665_H
-
-#include <linux/platform_device.h>
-#include <linux/davinci_emac.h>
-#include <mach/hardware.h>
-#include <mach/asp.h>
-#include <mach/keyscan.h>
-#include <media/davinci/vpfe_capture.h>
-
-#define DM365_ASYNC_EMIF_CONTROL_BASE	0x01D10000
-#define DM365_ASYNC_EMIF_DATA_CE0_BASE	0x02000000
-#define DM365_ASYNC_EMIF_DATA_CE1_BASE	0x04000000
-
-void __init dm365_init(void);
-void __init dm365_init_asp(struct snd_platform_data *pdata);
-void __init dm365_init_vc(struct snd_platform_data *pdata);
-void __init dm365_init_ks(struct davinci_ks_platform_data *pdata);
-void __init dm365_init_rtc(void);
-void dm365_init_spi0(unsigned chipselect_mask,
-			struct spi_board_info *info, unsigned len);
-
-void dm365_set_vpfe_config(struct vpfe_config *cfg);
-#endif /* __ASM_ARCH_DM365_H */
arch/arm/mach-davinci/include/mach/dm644x.h deleted +0 -40
deleted file mode 100644
index 724377f..0000000
@@ -1,40 +0,0 @@
-/*
- * This file contains the processor specific definitions
- * of the TI DM644x.
- *
- * Copyright (C) 2008 Texas Instruments.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-#ifndef __ASM_ARCH_DM644X_H
-#define __ASM_ARCH_DM644X_H
-
-#include <linux/davinci_emac.h>
-#include <mach/hardware.h>
-#include <mach/asp.h>
-#include <media/davinci/vpfe_capture.h>
-
-#define DM644X_ASYNC_EMIF_CONTROL_BASE	0x01E00000
-#define DM644X_ASYNC_EMIF_DATA_CE0_BASE 0x02000000
-#define DM644X_ASYNC_EMIF_DATA_CE1_BASE 0x04000000
-#define DM644X_ASYNC_EMIF_DATA_CE2_BASE 0x06000000
-#define DM644X_ASYNC_EMIF_DATA_CE3_BASE 0x08000000
-
-void __init dm644x_init(void);
-void __init dm644x_init_asp(struct snd_platform_data *pdata);
-void dm644x_set_vpfe_config(struct vpfe_config *cfg);
-
-#endif /* __ASM_ARCH_DM644X_H */
arch/arm/mach-davinci/include/mach/dm646x.h deleted +0 -34
deleted file mode 100644
index eb95864..0000000
@@ -1,34 +0,0 @@
-/*
- * Chip specific defines for DM646x SoC
- *
- * Author: Kevin Hilman, Deep Root Systems, LLC
- *
- * 2007 (c) Deep Root Systems, LLC. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-#ifndef __ASM_ARCH_DM646X_H
-#define __ASM_ARCH_DM646X_H
-
-#include <mach/hardware.h>
-#include <mach/asp.h>
-#include <linux/i2c.h>
-#include <linux/videodev2.h>
-#include <linux/davinci_emac.h>
-#include <media/davinci/vpif_types.h>
-
-#define DM646X_ASYNC_EMIF_CONTROL_BASE	0x20008000
-#define DM646X_ASYNC_EMIF_CS2_SPACE_BASE 0x42000000
-
-void __init dm646x_init(void);
-void __init dm646x_init_mcasp0(struct snd_platform_data *pdata);
-void __init dm646x_init_mcasp1(struct snd_platform_data *pdata);
-int __init dm646x_init_edma(struct edma_rsv_info *rsv);
-
-void dm646x_video_init(void);
-
-void dm646x_setup_vpif(struct vpif_display_config *,
-		       struct vpif_capture_config *);
-
-#endif /* __ASM_ARCH_DM646X_H */
Signature · 1 line
1.6.2.4
#6 lore raw

PATCH v4 5/5 ARM: davinci: create new common platform header for davinci

Hello.

Quoted 5 lines · Manjunath Hadli

remove the code from individual platform header files for dm365, dm355, dm644x and dm646x and consolidate it into a single and common header file davinci.h.

Signed-off-by Manjunath Hadli<[email protected]>

[...]

Quoted 6 lines
arch/arm/mach-davinci/davinci.h new file +0 -0
new file mode 100644
index 0000000..1fafbd7
@@ -0,0 +1,88 @@

[...]

arch/arm/mach-davinci/davinci.h line 81

Quoted 5 lines
arch/arm/mach-davinci/davinci.h new file +5 -0
+/* DM646x function declarations */
+void __init dm646x_init(void);
+void __init dm646x_init_mcasp0(struct snd_platform_data *pdata);
+void __init dm646x_init_mcasp1(struct snd_platform_data *pdata);
+void __init dm646x_board_setup_refclk(struct clk *clk);

I don't see from where are you moving this prototype -- it wasn't in the
original #include file... In fact, I'm not even seeing this function in the current Linus tree...

Quoted 7 lines
arch/arm/mach-davinci/davinci.h new file +7 -0
+int __init dm646x_init_edma(struct edma_rsv_info *rsv);
+
+void dm646x_video_init(void);
+
+void dm646x_setup_vpif(struct vpif_display_config *,
+		       struct vpif_capture_config *);
+#endif /*__DAVINCI_H */

[...]

Quoted 30 lines
arch/arm/mach-davinci/include/mach/dm646x.h deleted +0 -24
deleted file mode 100644
index eb95864..0000000
@@ -1,34 +0,0 @@
-/*
- * Chip specific defines for DM646x SoC
- *
- * Author: Kevin Hilman, Deep Root Systems, LLC
- *
- * 2007 (c) Deep Root Systems, LLC. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-#ifndef __ASM_ARCH_DM646X_H
-#define __ASM_ARCH_DM646X_H
-
-#include<mach/hardware.h>
-#include<mach/asp.h>
-#include<linux/i2c.h>
-#include<linux/videodev2.h>
-#include<linux/davinci_emac.h>
-#include<media/davinci/vpif_types.h>
-
-#define DM646X_ASYNC_EMIF_CONTROL_BASE	0x20008000
-#define DM646X_ASYNC_EMIF_CS2_SPACE_BASE 0x42000000
-
-void __init dm646x_init(void);

arch/arm/mach-davinci/include/mach/dm646x.h line 34

Quoted 10 lines
arch/arm/mach-davinci/include/mach/dm646x.h deleted +0 -10
-void __init dm646x_init_mcasp0(struct snd_platform_data *pdata);
-void __init dm646x_init_mcasp1(struct snd_platform_data *pdata);
-int __init dm646x_init_edma(struct edma_rsv_info *rsv);
-
-void dm646x_video_init(void);
-
-void dm646x_setup_vpif(struct vpif_display_config *,
-		       struct vpif_capture_config *);
-
-#endif /* __ASM_ARCH_DM646X_H */

WBR, Sergei

#7 lore raw

v4 cover ARM: davinci: re-arrange definitions to have a common davinci header

In reply to Manjunath Hadli

Hi Manju,

Quoted 6 lines · Manjunath

Re-arrange definitions and remove unnecessary code so that we can have a common header for all davinci platforms. This will enable us to share defines and enable common routines to be used without polluting hardware.h.
This patch set forms the base for a later set of patches for having
a common system module base address (DAVINCI_SYSTEM_MODULE_BASE).

Its easy to dismiss this series as causing "needless churn" by moving around definitions from header to C files and consolidating definitions from multiple header files to one.

You need to do a better job of "selling" this series. The best way to do that would be to include future patches which benefit from this series into this series itself. This way, its clear to judge the relative benefit of the "churn". You gave some examples, but showing code helps.

Also, one of the biggest gains from this series is reducing the pollution in include/mach as asked by Russell in his "pet peaves" mail. That should find reference in the cover letter and in the commit text of patch 5/5.

Thanks,
Sekhar

Quoted 45 lines

Changes from previous version:
1. Addressed Shekhar's comments for non-inclusion of mach headers from core.
2. Move the mach header from include to mach

Manjunath Hadli (5):
davinci: vpif: remove obsolete header file inclusion
ARM: davinci: dm644x: remove the macros from the header to move to c
file
ARM: davinci: dm365: remove the macros from the header to move to c
file
ARM: davinci: dm646x: remove the macros from the header to move to c
file
ARM: davinci: create new common platform header for davinci

 arch/arm/mach-davinci/board-dm355-evm.c     |    2 +-
 arch/arm/mach-davinci/board-dm355-leopard.c |    2 +-
 arch/arm/mach-davinci/board-dm365-evm.c     |    2 +-
 arch/arm/mach-davinci/board-dm644x-evm.c    |    2 +-
 arch/arm/mach-davinci/board-dm646x-evm.c    |    2 +-
 arch/arm/mach-davinci/board-neuros-osd2.c   |    2 +-
 arch/arm/mach-davinci/board-sffsdr.c        |    2 +-
 arch/arm/mach-davinci/davinci.h             |   88 +++++++++++++++++++++++++++
 arch/arm/mach-davinci/dm355.c               |    2 +-
 arch/arm/mach-davinci/dm365.c               |   18 +++++-
 arch/arm/mach-davinci/dm644x.c              |    9 +++-
 arch/arm/mach-davinci/dm646x.c              |    9 +++-
 arch/arm/mach-davinci/include/mach/dm355.h  |   32 ----------
 arch/arm/mach-davinci/include/mach/dm365.h  |   52 ----------------
 arch/arm/mach-davinci/include/mach/dm644x.h |   47 --------------
 arch/arm/mach-davinci/include/mach/dm646x.h |   41 ------------
 drivers/media/video/davinci/vpif.h          |    2 +-
 drivers/media/video/davinci/vpif_display.c  |    2 -
 18 files changed, 130 insertions(+), 186 deletions(-)
 create mode 100644 arch/arm/mach-davinci/davinci.h
 delete mode 100644 arch/arm/mach-davinci/include/mach/dm355.h
 delete mode 100644 arch/arm/mach-davinci/include/mach/dm365.h
 delete mode 100644 arch/arm/mach-davinci/include/mach/dm644x.h
 delete mode 100644 arch/arm/mach-davinci/include/mach/dm646x.h

_______________________________________________
Davinci-linux-open-source mailing list
Davinci-linux-open-source at linux.davincidsp.com
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source

#8 lore raw

v4 cover ARM: davinci: re-arrange definitions to have a common davinci header

Quoted 20 lines · Sekhar

Hi Manju,

Quoted 6 lines · Manjunath

Re-arrange definitions and remove unnecessary code so that we can have a common header for all davinci platforms. This will enable us to share defines and enable common routines to be used without polluting hardware.h.
This patch set forms the base for a later set of patches for having
a common system module base address (DAVINCI_SYSTEM_MODULE_BASE).

Its easy to dismiss this series as causing "needless churn" by moving around definitions from header to C files and consolidating definitions from multiple header files to one.

You need to do a better job of "selling" this series. The best way to do that would be to include future patches which benefit from this series into this series itself. This way, its clear to judge the relative benefit of the "churn". You gave some examples, but showing code helps.

Quoted 4 lines

Also, one of the biggest gains from this series is reducing the pollution in include/mach as asked by Russell in his "pet peaves" mail. That should find reference in the cover letter and in the commit text of patch 5/5.

Indeed, and I hope it takes into account (at some point) the restart changes.

author
#9 lore raw

v4 cover ARM: davinci: re-arrange definitions to have a common davinci header

In reply to Nori, Sekhar

Sekhar,

Quoted 10 lines · Sekhar

Hi Manju,

Quoted 6 lines · Manjunath

Re-arrange definitions and remove unnecessary code so that we can have a common header for all davinci platforms. This will enable us to share defines and enable common routines to be used without polluting hardware.h.
This patch set forms the base for a later set of patches for having a
common system module base address (DAVINCI_SYSTEM_MODULE_BASE).

Quoted 3 lines

Its easy to dismiss this series as causing "needless churn" by moving around definitions from header to C files and consolidating definitions from multiple header files to one.

You need to do a better job of "selling" this series. The best way to do that would be to include future patches which benefit from this series into this series itself. This way, its clear to judge the relative benefit of the "churn". You gave some examples, but showing code helps.

Ok. Will do. I will send the 11 patch set completely so it is better appreciated.

Quoted 3 lines

Also, one of the biggest gains from this series is reducing the pollution in include/mach as asked by Russell in his "pet peaves" mail. That should find reference in the cover letter and in the commit text of patch 5/5.

Ok.

Quoted 3 lines

Thanks,
Sekhar

Thx,
-Manju

Quoted 48 lines
Quoted 46 lines

Changes from previous version:
1. Addressed Shekhar's comments for non-inclusion of mach headers from core.
2. Move the mach header from include to mach

Manjunath Hadli (5):
davinci: vpif: remove obsolete header file inclusion
ARM: davinci: dm644x: remove the macros from the header to move to c
file
ARM: davinci: dm365: remove the macros from the header to move to c
file
ARM: davinci: dm646x: remove the macros from the header to move to c
file
ARM: davinci: create new common platform header for davinci

 arch/arm/mach-davinci/board-dm355-evm.c     |    2 +-
 arch/arm/mach-davinci/board-dm355-leopard.c |    2 +-
 arch/arm/mach-davinci/board-dm365-evm.c     |    2 +-
 arch/arm/mach-davinci/board-dm644x-evm.c    |    2 +-
 arch/arm/mach-davinci/board-dm646x-evm.c    |    2 +-
 arch/arm/mach-davinci/board-neuros-osd2.c   |    2 +-
 arch/arm/mach-davinci/board-sffsdr.c        |    2 +-
 arch/arm/mach-davinci/davinci.h             |   88 +++++++++++++++++++++++++++
 arch/arm/mach-davinci/dm355.c               |    2 +-
 arch/arm/mach-davinci/dm365.c               |   18 +++++-
 arch/arm/mach-davinci/dm644x.c              |    9 +++-
 arch/arm/mach-davinci/dm646x.c              |    9 +++-
 arch/arm/mach-davinci/include/mach/dm355.h  |   32 ----------
 arch/arm/mach-davinci/include/mach/dm365.h  |   52 ----------------
 arch/arm/mach-davinci/include/mach/dm644x.h |   47 --------------
 arch/arm/mach-davinci/include/mach/dm646x.h |   41 ------------
 drivers/media/video/davinci/vpif.h          |    2 +-
 drivers/media/video/davinci/vpif_display.c  |    2 -
 18 files changed, 130 insertions(+), 186 deletions(-)  create mode 
100644 arch/arm/mach-davinci/davinci.h  delete mode 100644 
arch/arm/mach-davinci/include/mach/dm355.h
 delete mode 100644 arch/arm/mach-davinci/include/mach/dm365.h
 delete mode 100644 arch/arm/mach-davinci/include/mach/dm644x.h
 delete mode 100644 arch/arm/mach-davinci/include/mach/dm646x.h

_______________________________________________
Davinci-linux-open-source mailing list
Davinci-linux-open-source at linux.davincidsp.com
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source