* [PATCH v3 0/5] ARM: davinci: re-arrange definitions to have a common davinci header
@ 2011-11-17 10:18 Manjunath Hadli
2011-11-17 10:18 ` [PATCH v3 1/5] ARM: davinci: dm644x: remove the macros from the header to move to c file Manjunath Hadli
` (5 more replies)
0 siblings, 6 replies; 13+ messages in thread
From: Manjunath Hadli @ 2011-11-17 10:18 UTC (permalink / raw)
To: linux-arm-kernel
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(As per Sergei's comments):
1. Renamed davinci_common.h to davinci.h.
2. Added extra line whereever appropriate.
3. removed unnecessary header inclusion.
Manjunath Hadli (5):
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
ARM: davinci: delete individual platform header files and use a
common header
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/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/davinci.h | 88 ++++++++++++++++++++++++++
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 | 3 +-
drivers/media/video/davinci/vpif_display.c | 2 +-
18 files changed, 131 insertions(+), 186 deletions(-)
create mode 100644 arch/arm/mach-davinci/include/mach/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
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v3 1/5] ARM: davinci: dm644x: remove the macros from the header to move to c file
2011-11-17 10:18 [PATCH v3 0/5] ARM: davinci: re-arrange definitions to have a common davinci header Manjunath Hadli
@ 2011-11-17 10:18 ` Manjunath Hadli
2011-11-17 10:18 ` [PATCH v3 2/5] ARM: davinci: dm365: " Manjunath Hadli
` (4 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Manjunath Hadli @ 2011-11-17 10:18 UTC (permalink / raw)
To: linux-arm-kernel
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 <manjunath.hadli@ti.com>
---
arch/arm/mach-davinci/dm644x.c | 7 +++++++
arch/arm/mach-davinci/include/mach/dm644x.h | 7 -------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 3470983..27d1371 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -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,
diff --git a/arch/arm/mach-davinci/include/mach/dm644x.h b/arch/arm/mach-davinci/include/mach/dm644x.h
index 5a1b26d..724377f 100644
--- a/arch/arm/mach-davinci/include/mach/dm644x.h
+++ b/arch/arm/mach-davinci/include/mach/dm644x.h
@@ -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
--
1.6.2.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v3 2/5] ARM: davinci: dm365: remove the macros from the header to move to c file
2011-11-17 10:18 [PATCH v3 0/5] ARM: davinci: re-arrange definitions to have a common davinci header Manjunath Hadli
2011-11-17 10:18 ` [PATCH v3 1/5] ARM: davinci: dm644x: remove the macros from the header to move to c file Manjunath Hadli
@ 2011-11-17 10:18 ` Manjunath Hadli
2011-11-17 10:18 ` [PATCH v3 3/5] ARM: davinci: dm646x: " Manjunath Hadli
` (3 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Manjunath Hadli @ 2011-11-17 10:18 UTC (permalink / raw)
To: linux-arm-kernel
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 <manjunath.hadli@ti.com>
---
arch/arm/mach-davinci/dm365.c | 16 ++++++++++++++++
arch/arm/mach-davinci/include/mach/dm365.h | 16 ----------------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index 679e168..77edee8 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -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,
diff --git a/arch/arm/mach-davinci/include/mach/dm365.h b/arch/arm/mach-davinci/include/mach/dm365.h
index 2563bf4..51924de 100644
--- a/arch/arm/mach-davinci/include/mach/dm365.h
+++ b/arch/arm/mach-davinci/include/mach/dm365.h
@@ -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
--
1.6.2.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v3 3/5] ARM: davinci: dm646x: remove the macros from the header to move to c file
2011-11-17 10:18 [PATCH v3 0/5] ARM: davinci: re-arrange definitions to have a common davinci header Manjunath Hadli
2011-11-17 10:18 ` [PATCH v3 1/5] ARM: davinci: dm644x: remove the macros from the header to move to c file Manjunath Hadli
2011-11-17 10:18 ` [PATCH v3 2/5] ARM: davinci: dm365: " Manjunath Hadli
@ 2011-11-17 10:18 ` Manjunath Hadli
2011-11-17 10:18 ` [PATCH v3 4/5] ARM: davinci: create new common platform header for davinci Manjunath Hadli
` (2 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Manjunath Hadli @ 2011-11-17 10:18 UTC (permalink / raw)
To: linux-arm-kernel
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 <manjunath.hadli@ti.com>
---
arch/arm/mach-davinci/dm646x.c | 7 +++++++
arch/arm/mach-davinci/include/mach/dm646x.h | 7 -------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index 0b68ed5..0560e82 100644
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -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,
diff --git a/arch/arm/mach-davinci/include/mach/dm646x.h b/arch/arm/mach-davinci/include/mach/dm646x.h
index a8ee6c9..eb95864 100644
--- a/arch/arm/mach-davinci/include/mach/dm646x.h
+++ b/arch/arm/mach-davinci/include/mach/dm646x.h
@@ -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
--
1.6.2.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v3 4/5] ARM: davinci: create new common platform header for davinci
2011-11-17 10:18 [PATCH v3 0/5] ARM: davinci: re-arrange definitions to have a common davinci header Manjunath Hadli
` (2 preceding siblings ...)
2011-11-17 10:18 ` [PATCH v3 3/5] ARM: davinci: dm646x: " Manjunath Hadli
@ 2011-11-17 10:18 ` Manjunath Hadli
2011-11-17 10:35 ` Sergei Shtylyov
2011-11-17 10:48 ` Sergei Shtylyov
2011-11-17 10:18 ` [PATCH v3 5/5] ARM: davinci: delete individual platform header files and use a common header Manjunath Hadli
2011-11-30 11:37 ` [PATCH v3 0/5] ARM: davinci: re-arrange definitions to have a common davinci header Nori, Sekhar
5 siblings, 2 replies; 13+ messages in thread
From: Manjunath Hadli @ 2011-11-17 10:18 UTC (permalink / raw)
To: linux-arm-kernel
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_common.h.
Include the new header file in individual platform header
files as a pre-cursor for deleting these headers in follow
up patches.
Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
---
arch/arm/mach-davinci/include/mach/davinci.h | 88 ++++++++++++++++++++++++++
arch/arm/mach-davinci/include/mach/dm355.h | 18 +-----
arch/arm/mach-davinci/include/mach/dm365.h | 20 +------
arch/arm/mach-davinci/include/mach/dm644x.h | 15 +----
arch/arm/mach-davinci/include/mach/dm646x.h | 20 +------
5 files changed, 92 insertions(+), 69 deletions(-)
create mode 100644 arch/arm/mach-davinci/include/mach/davinci.h
diff --git a/arch/arm/mach-davinci/include/mach/davinci.h b/arch/arm/mach-davinci/include/mach/davinci.h
new file mode 100644
index 0000000..49bf2f3
--- /dev/null
+++ b/arch/arm/mach-davinci/include/mach/davinci.h
@@ -0,0 +1,88 @@
+/*
+ * This file contains the processor specific definitions
+ * of the TI DM644x, DM355, DM365, and DM646X.
+ *
+ * Copyright (C) 2011 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 __DAVINCI_H
+#define __DAVINCI_H
+
+#include <mach/asp.h>
+#include <linux/clk.h>
+#include <linux/i2c.h>
+#include <mach/keyscan.h>
+#include <linux/videodev2.h>
+#include <linux/davinci_emac.h>
+#include <linux/platform_device.h>
+#include <media/davinci/vpfe_capture.h>
+#include <media/davinci/vpif_types.h>
+
+/* DM355 base addresses */
+#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
+
+/* DM365 base addresses */
+#define DM365_ASYNC_EMIF_CONTROL_BASE 0x01d10000
+#define DM365_ASYNC_EMIF_DATA_CE0_BASE 0x02000000
+#define DM365_ASYNC_EMIF_DATA_CE1_BASE 0x04000000
+
+/* DM644x base addresses */
+#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
+
+/* DM646x base addresses */
+#define DM646X_ASYNC_EMIF_CONTROL_BASE 0x20008000
+#define DM646X_ASYNC_EMIF_CS2_SPACE_BASE 0x42000000
+
+/* DM355 function declarations */
+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);
+
+/* DM365 function declarations */
+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);
+
+/* DM644X function declarations */
+void __init dm644x_init(void);
+void __init dm644x_init_asp(struct snd_platform_data *pdata);
+void dm644x_set_vpfe_config(struct vpfe_config *cfg);
+
+/* 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);
+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 */
diff --git a/arch/arm/mach-davinci/include/mach/dm355.h b/arch/arm/mach-davinci/include/mach/dm355.h
index 36dff4a..14e7766 100644
--- a/arch/arm/mach-davinci/include/mach/dm355.h
+++ b/arch/arm/mach-davinci/include/mach/dm355.h
@@ -11,22 +11,6 @@
#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);
+#include <mach/davinci.h>
#endif /* __ASM_ARCH_DM355_H */
diff --git a/arch/arm/mach-davinci/include/mach/dm365.h b/arch/arm/mach-davinci/include/mach/dm365.h
index 51924de..3433d72 100644
--- a/arch/arm/mach-davinci/include/mach/dm365.h
+++ b/arch/arm/mach-davinci/include/mach/dm365.h
@@ -13,24 +13,6 @@
#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>
+#include <mach/davinci.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 */
diff --git a/arch/arm/mach-davinci/include/mach/dm644x.h b/arch/arm/mach-davinci/include/mach/dm644x.h
index 724377f..99e9525 100644
--- a/arch/arm/mach-davinci/include/mach/dm644x.h
+++ b/arch/arm/mach-davinci/include/mach/dm644x.h
@@ -22,19 +22,6 @@
#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);
+#include <mach/davinci.h>
#endif /* __ASM_ARCH_DM644X_H */
diff --git a/arch/arm/mach-davinci/include/mach/dm646x.h b/arch/arm/mach-davinci/include/mach/dm646x.h
index eb95864..8bdea80 100644
--- a/arch/arm/mach-davinci/include/mach/dm646x.h
+++ b/arch/arm/mach-davinci/include/mach/dm646x.h
@@ -11,24 +11,6 @@
#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 *);
+#include <mach/davinci.h>
#endif /* __ASM_ARCH_DM646X_H */
--
1.6.2.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v3 5/5] ARM: davinci: delete individual platform header files and use a common header
2011-11-17 10:18 [PATCH v3 0/5] ARM: davinci: re-arrange definitions to have a common davinci header Manjunath Hadli
` (3 preceding siblings ...)
2011-11-17 10:18 ` [PATCH v3 4/5] ARM: davinci: create new common platform header for davinci Manjunath Hadli
@ 2011-11-17 10:18 ` Manjunath Hadli
2011-11-17 10:38 ` Sergei Shtylyov
2011-11-30 11:37 ` [PATCH v3 0/5] ARM: davinci: re-arrange definitions to have a common davinci header Nori, Sekhar
5 siblings, 1 reply; 13+ messages in thread
From: Manjunath Hadli @ 2011-11-17 10:18 UTC (permalink / raw)
To: linux-arm-kernel
include davinci_common.h file in files using the platform
header file for dm355, dm365, dm644x and dm646x and delete the
individual platform header files.
Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
---
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/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 | 16 ----------------
arch/arm/mach-davinci/include/mach/dm365.h | 18 ------------------
arch/arm/mach-davinci/include/mach/dm644x.h | 27 ---------------------------
arch/arm/mach-davinci/include/mach/dm646x.h | 16 ----------------
drivers/media/video/davinci/vpif.h | 3 +--
drivers/media/video/davinci/vpif_display.c | 2 +-
17 files changed, 13 insertions(+), 91 deletions(-)
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
diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
index 4e0e707..7b98160 100644
--- a/arch/arm/mach-davinci/board-dm355-evm.c
+++ b/arch/arm/mach-davinci/board-dm355-evm.c
@@ -26,7 +26,7 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
-#include <mach/dm355.h>
+#include <mach/davinci.h>
#include <mach/i2c.h>
#include <mach/serial.h>
#include <mach/nand.h>
diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c
index ff2d241..b4f9558 100644
--- a/arch/arm/mach-davinci/board-dm355-leopard.c
+++ b/arch/arm/mach-davinci/board-dm355-leopard.c
@@ -23,7 +23,7 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
-#include <mach/dm355.h>
+#include <mach/davinci.h>
#include <mach/i2c.h>
#include <mach/serial.h>
#include <mach/nand.h>
diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
index 1918ae7..7aec2ab 100644
--- a/arch/arm/mach-davinci/board-dm365-evm.c
+++ b/arch/arm/mach-davinci/board-dm365-evm.c
@@ -32,7 +32,7 @@
#include <asm/mach/arch.h>
#include <mach/mux.h>
-#include <mach/dm365.h>
+#include <mach/davinci.h>
#include <mach/common.h>
#include <mach/i2c.h>
#include <mach/serial.h>
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index 0cf8abf..880aa0c 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -30,7 +30,7 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
-#include <mach/dm644x.h>
+#include <mach/davinci.h>
#include <mach/common.h>
#include <mach/i2c.h>
#include <mach/serial.h>
diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
index e574d7f..383acdf 100644
--- a/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/arch/arm/mach-davinci/board-dm646x-evm.c
@@ -36,7 +36,7 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
-#include <mach/dm646x.h>
+#include <mach/davinci.h>
#include <mach/common.h>
#include <mach/serial.h>
#include <mach/i2c.h>
diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c
index e5f231a..a4608cf 100644
--- a/arch/arm/mach-davinci/board-neuros-osd2.c
+++ b/arch/arm/mach-davinci/board-neuros-osd2.c
@@ -30,7 +30,7 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
-#include <mach/dm644x.h>
+#include <mach/davinci.h>
#include <mach/common.h>
#include <mach/i2c.h>
#include <mach/serial.h>
diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c
index 5dd4da9..b993ac6 100644
--- a/arch/arm/mach-davinci/board-sffsdr.c
+++ b/arch/arm/mach-davinci/board-sffsdr.c
@@ -35,7 +35,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/flash.h>
-#include <mach/dm644x.h>
+#include <mach/davinci.h>
#include <mach/common.h>
#include <mach/i2c.h>
#include <mach/serial.h>
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index fe520d4..2e29ed0 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -18,7 +18,7 @@
#include <asm/mach/map.h>
-#include <mach/dm355.h>
+#include <mach/davinci.h>
#include <mach/cputype.h>
#include <mach/edma.h>
#include <mach/psc.h>
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index 77edee8..6b8ce8c 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -21,7 +21,7 @@
#include <asm/mach/map.h>
-#include <mach/dm365.h>
+#include <mach/davinci.h>
#include <mach/cputype.h>
#include <mach/edma.h>
#include <mach/psc.h>
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 27d1371..401f916 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -15,7 +15,7 @@
#include <asm/mach/map.h>
-#include <mach/dm644x.h>
+#include <mach/davinci.h>
#include <mach/cputype.h>
#include <mach/edma.h>
#include <mach/irqs.h>
diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index 0560e82..850ad3c 100644
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -16,7 +16,7 @@
#include <asm/mach/map.h>
-#include <mach/dm646x.h>
+#include <mach/davinci.h>
#include <mach/cputype.h>
#include <mach/edma.h>
#include <mach/irqs.h>
diff --git a/arch/arm/mach-davinci/include/mach/dm355.h b/arch/arm/mach-davinci/include/mach/dm355.h
deleted file mode 100644
index 14e7766..0000000
--- a/arch/arm/mach-davinci/include/mach/dm355.h
+++ /dev/null
@@ -1,16 +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/davinci.h>
-
-#endif /* __ASM_ARCH_DM355_H */
diff --git a/arch/arm/mach-davinci/include/mach/dm365.h b/arch/arm/mach-davinci/include/mach/dm365.h
deleted file mode 100644
index 3433d72..0000000
--- a/arch/arm/mach-davinci/include/mach/dm365.h
+++ /dev/null
@@ -1,18 +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 <mach/davinci.h>
-
-#endif /* __ASM_ARCH_DM365_H */
diff --git a/arch/arm/mach-davinci/include/mach/dm644x.h b/arch/arm/mach-davinci/include/mach/dm644x.h
deleted file mode 100644
index 99e9525..0000000
--- a/arch/arm/mach-davinci/include/mach/dm644x.h
+++ /dev/null
@@ -1,27 +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 <mach/davinci.h>
-
-#endif /* __ASM_ARCH_DM644X_H */
diff --git a/arch/arm/mach-davinci/include/mach/dm646x.h b/arch/arm/mach-davinci/include/mach/dm646x.h
deleted file mode 100644
index 8bdea80..0000000
--- a/arch/arm/mach-davinci/include/mach/dm646x.h
+++ /dev/null
@@ -1,16 +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/davinci.h>
-
-#endif /* __ASM_ARCH_DM646X_H */
diff --git a/drivers/media/video/davinci/vpif.h b/drivers/media/video/davinci/vpif.h
index 25036cb..1e0fef9 100644
--- a/drivers/media/video/davinci/vpif.h
+++ b/drivers/media/video/davinci/vpif.h
@@ -18,8 +18,7 @@
#include <linux/io.h>
#include <linux/videodev2.h>
-#include <mach/hardware.h>
-#include <mach/dm646x.h>
+#include <mach/davinci.h>
#include <media/davinci/vpif_types.h>
/* Maximum channel allowed */
diff --git a/drivers/media/video/davinci/vpif_display.c b/drivers/media/video/davinci/vpif_display.c
index 286f029..4766d41 100644
--- a/drivers/media/video/davinci/vpif_display.c
+++ b/drivers/media/video/davinci/vpif_display.c
@@ -39,7 +39,7 @@
#include <media/v4l2-ioctl.h>
#include <media/v4l2-chip-ident.h>
-#include <mach/dm646x.h>
+#include <mach/davinci.h>
#include "vpif_display.h"
#include "vpif.h"
--
1.6.2.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v3 4/5] ARM: davinci: create new common platform header for davinci
2011-11-17 10:18 ` [PATCH v3 4/5] ARM: davinci: create new common platform header for davinci Manjunath Hadli
@ 2011-11-17 10:35 ` Sergei Shtylyov
2011-11-17 10:48 ` Sergei Shtylyov
1 sibling, 0 replies; 13+ messages in thread
From: Sergei Shtylyov @ 2011-11-17 10:35 UTC (permalink / raw)
To: linux-arm-kernel
Hello.
On 17-11-2011 14:18, Manjunath Hadli wrote:
> 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_common.h.
> Include the new header file in individual platform header
> files as a pre-cursor for deleting these headers in follow
> up patches.
> Signed-off-by: Manjunath Hadli<manjunath.hadli@ti.com>
Sorry, didn't notice something in the first review...
> diff --git a/arch/arm/mach-davinci/include/mach/davinci.h b/arch/arm/mach-davinci/include/mach/davinci.h
> new file mode 100644
> index 0000000..49bf2f3
> --- /dev/null
> +++ b/arch/arm/mach-davinci/include/mach/davinci.h
> @@ -0,0 +1,88 @@
> +/*
> + * This file contains the processor specific definitions
> + * of the TI DM644x, DM355, DM365, and DM646X.
DM646x for consistency.
> +/* DM644X function declarations */
DM644x for consistency.
> +/* DM646X function declarations */
DM646x for consistency.
WBR, Sergei
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v3 5/5] ARM: davinci: delete individual platform header files and use a common header
2011-11-17 10:18 ` [PATCH v3 5/5] ARM: davinci: delete individual platform header files and use a common header Manjunath Hadli
@ 2011-11-17 10:38 ` Sergei Shtylyov
0 siblings, 0 replies; 13+ messages in thread
From: Sergei Shtylyov @ 2011-11-17 10:38 UTC (permalink / raw)
To: linux-arm-kernel
Hello.
On 17-11-2011 14:18, Manjunath Hadli wrote:
> include davinci_common.h file in files using the platform
Just davinci.h now.
> header file for dm355, dm365, dm644x and dm646x and delete the
> individual platform header files.
> Signed-off-by: Manjunath Hadli<manjunath.hadli@ti.com>
> diff --git a/drivers/media/video/davinci/vpif.h b/drivers/media/video/davinci/vpif.h
> index 25036cb..1e0fef9 100644
> --- a/drivers/media/video/davinci/vpif.h
> +++ b/drivers/media/video/davinci/vpif.h
> @@ -18,8 +18,7 @@
>
> #include<linux/io.h>
> #include<linux/videodev2.h>
> -#include<mach/hardware.h>
You need to either describe this change, or do it in a sperate patch.
WBR, Sergei
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v3 4/5] ARM: davinci: create new common platform header for davinci
2011-11-17 10:18 ` [PATCH v3 4/5] ARM: davinci: create new common platform header for davinci Manjunath Hadli
2011-11-17 10:35 ` Sergei Shtylyov
@ 2011-11-17 10:48 ` Sergei Shtylyov
2011-11-17 10:59 ` Hadli, Manjunath
1 sibling, 1 reply; 13+ messages in thread
From: Sergei Shtylyov @ 2011-11-17 10:48 UTC (permalink / raw)
To: linux-arm-kernel
Hello.
On 17-11-2011 14:18, Manjunath Hadli wrote:
> 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_common.h.
> Include the new header file in individual platform header
> files as a pre-cursor for deleting these headers in follow
> up patches.
> Signed-off-by: Manjunath Hadli<manjunath.hadli@ti.com>
[...]
> diff --git a/arch/arm/mach-davinci/include/mach/davinci.h b/arch/arm/mach-davinci/include/mach/davinci.h
> new file mode 100644
> index 0000000..49bf2f3
> --- /dev/null
> +++ b/arch/arm/mach-davinci/include/mach/davinci.h
> @@ -0,0 +1,88 @@
[...]
> +/* DM355 base addresses */
> +#define DM355_ASYNC_EMIF_CONTROL_BASE 0x01e10000
> +#define DM355_ASYNC_EMIF_DATA_CE0_BASE 0x02000000
> +/* DM365 base addresses */
> +#define DM365_ASYNC_EMIF_CONTROL_BASE 0x01d10000
> +#define DM365_ASYNC_EMIF_DATA_CE0_BASE 0x02000000
> +#define DM365_ASYNC_EMIF_DATA_CE1_BASE 0x04000000
Note that DM355/365 EMIF CE0/1 bases are similar -- perhaps it's worth to
have the single definition for them now, like DM3X5_ASYNC_EMIF_DATA_CE<n>_BASE.
WBR, Sergei
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v3 4/5] ARM: davinci: create new common platform header for davinci
2011-11-17 10:48 ` Sergei Shtylyov
@ 2011-11-17 10:59 ` Hadli, Manjunath
0 siblings, 0 replies; 13+ messages in thread
From: Hadli, Manjunath @ 2011-11-17 10:59 UTC (permalink / raw)
To: linux-arm-kernel
Sergei,
Thank you for the comments.
On Thu, Nov 17, 2011 at 16:18:17, Sergei Shtylyov wrote:
> Hello.
>
> On 17-11-2011 14:18, Manjunath Hadli wrote:
>
> > 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_common.h.
> > Include the new header file in individual platform header files as a
> > pre-cursor for deleting these headers in follow up patches.
>
> > Signed-off-by: Manjunath Hadli<manjunath.hadli@ti.com>
> [...]
>
> > diff --git a/arch/arm/mach-davinci/include/mach/davinci.h
> > b/arch/arm/mach-davinci/include/mach/davinci.h
> > new file mode 100644
> > index 0000000..49bf2f3
> > --- /dev/null
> > +++ b/arch/arm/mach-davinci/include/mach/davinci.h
> > @@ -0,0 +1,88 @@
> [...]
> > +/* DM355 base addresses */
> > +#define DM355_ASYNC_EMIF_CONTROL_BASE 0x01e10000
> > +#define DM355_ASYNC_EMIF_DATA_CE0_BASE 0x02000000
>
> > +/* DM365 base addresses */
> > +#define DM365_ASYNC_EMIF_CONTROL_BASE 0x01d10000
> > +#define DM365_ASYNC_EMIF_DATA_CE0_BASE 0x02000000
> > +#define DM365_ASYNC_EMIF_DATA_CE1_BASE 0x04000000
>
> Note that DM355/365 EMIF CE0/1 bases are similar -- perhaps it's worth to have the single definition for them now, like DM3X5_ASYNC_EMIF_DATA_CE<n>_BASE.
There is only DM355 and DM365. DM3X5 has not been used anywhere till now.
Too much generalization in naming might lead to confusion?
I guess we will keep it as-is for the sake of clarity. What do you say?
>
> WBR, Sergei
>
Thank s and Regards,
-Manju
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v3 0/5] ARM: davinci: re-arrange definitions to have a common davinci header
2011-11-17 10:18 [PATCH v3 0/5] ARM: davinci: re-arrange definitions to have a common davinci header Manjunath Hadli
` (4 preceding siblings ...)
2011-11-17 10:18 ` [PATCH v3 5/5] ARM: davinci: delete individual platform header files and use a common header Manjunath Hadli
@ 2011-11-30 11:37 ` Nori, Sekhar
2011-12-02 6:29 ` Hadli, Manjunath
5 siblings, 1 reply; 13+ messages in thread
From: Nori, Sekhar @ 2011-11-30 11:37 UTC (permalink / raw)
To: linux-arm-kernel
Hi Manju,
On Thu, Nov 17, 2011 at 15:48:53, Hadli, Manjunath wrote:
> Re-arrange definitions and remove unnecessary code so that we canx
These are two different things and should be done in separate
patches. Sergei has already pointed out couple of instances.
> have a common header for all davinci platforms. This will enable
You mean all DMx platforms? DA8x and TNETVx will still have
their own header files after this patch set.
> 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(As per Sergei's comments):
> 1. Renamed davinci_common.h to davinci.h.
> 2. Added extra line whereever appropriate.
> 3. removed unnecessary header inclusion.
>
> Manjunath Hadli (5):
> 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
These headlines should describe the changes better. You are moving
_private_ defines to C file (to reduce header file pollution). That
should be clear from the headline.
> ARM: davinci: create new common platform header for davinci
> ARM: davinci: delete individual platform header files and use a
> common header
>
> 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/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/davinci.h | 88 ++++++++++++++++++++++++++
This file should be placed in arch/arm/mach-davinci itself
since the definitions are private to arch/arm/mach-davinci.
Russell has been complaining about placing unnecessary files
in include/mach.
Thanks,
Sekhar
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v3 0/5] ARM: davinci: re-arrange definitions to have a common davinci header
2011-11-30 11:37 ` [PATCH v3 0/5] ARM: davinci: re-arrange definitions to have a common davinci header Nori, Sekhar
@ 2011-12-02 6:29 ` Hadli, Manjunath
2011-12-02 12:42 ` Nori, Sekhar
0 siblings, 1 reply; 13+ messages in thread
From: Hadli, Manjunath @ 2011-12-02 6:29 UTC (permalink / raw)
To: linux-arm-kernel
Sekhar,
On Wed, Nov 30, 2011 at 17:07:21, Nori, Sekhar wrote:
> Hi Manju,
>
> On Thu, Nov 17, 2011 at 15:48:53, Hadli, Manjunath wrote:
> > Re-arrange definitions and remove unnecessary code so that we canx
>
> These are two different things and should be done in separate patches. Sergei has already pointed out couple of instances.
Ok, This is only subject for the cover letter and not individual patches.
The individual patches have separate modularized implementations. I will
change the cover letter subject to "remove private definitions from headers and move to C files". Is that OK?
>
> > have a common header for all davinci platforms. This will enable
>
> You mean all DMx platforms? DA8x and TNETVx will still have their own header files after this patch set.
Yes, DMx platforms. I will also change the common "davinci.h" to dmx.h ?
>
> > 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(As per Sergei's comments):
> > 1. Renamed davinci_common.h to davinci.h.
> > 2. Added extra line whereever appropriate.
> > 3. removed unnecessary header inclusion.
> >
> > Manjunath Hadli (5):
> > 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
>
> These headlines should describe the changes better. You are moving _private_ defines to C file (to reduce header file pollution). That should be clear from the headline.
>
> > ARM: davinci: create new common platform header for davinci
> > ARM: davinci: delete individual platform header files and use a
> > common header
> >
> > 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/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/davinci.h | 88 ++++++++++++++++++++++++++
>
> This file should be placed in arch/arm/mach-davinci itself since the definitions are private to arch/arm/mach-davinci.
> Russell has been complaining about placing unnecessary files in include/mach.
I will just check if the file is needed from the main driver files.
If not, I will move it to mach-davinci.
>
> Thanks,
> Sekhar
>
>
Thanks and Regards,
-Manju
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v3 0/5] ARM: davinci: re-arrange definitions to have a common davinci header
2011-12-02 6:29 ` Hadli, Manjunath
@ 2011-12-02 12:42 ` Nori, Sekhar
0 siblings, 0 replies; 13+ messages in thread
From: Nori, Sekhar @ 2011-12-02 12:42 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Dec 02, 2011 at 11:59:49, Hadli, Manjunath wrote:
> Sekhar,
>
> On Wed, Nov 30, 2011 at 17:07:21, Nori, Sekhar wrote:
> > Hi Manju,
> >
> > On Thu, Nov 17, 2011 at 15:48:53, Hadli, Manjunath wrote:
> > > Re-arrange definitions and remove unnecessary code so that we canx
> >
> > These are two different things and should be done in separate patches. Sergei has already pointed out couple of instances.
> Ok, This is only subject for the cover letter and not individual patches.
> The individual patches have separate modularized implementations. I will
I am referring to the kind of issues Sergei pointed to here:
http://linux.omap.com/pipermail/davinci-linux-open-source/2011-November/023524.html
> change the cover letter subject to "remove private definitions from headers and move to C files". Is that OK?
>
Current headline is fine by me. It doesn't become part of commit history
anyway.
>
> >
> > > have a common header for all davinci platforms. This will enable
> >
> > You mean all DMx platforms? DA8x and TNETVx will still have their own header files after this patch set.
>
> Yes, DMx platforms. I will also change the common "davinci.h" to dmx.h ?
No, davinci.h is fine.
>
> >
> > > 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(As per Sergei's comments):
> > > 1. Renamed davinci_common.h to davinci.h.
> > > 2. Added extra line whereever appropriate.
> > > 3. removed unnecessary header inclusion.
> > >
> > > Manjunath Hadli (5):
> > > 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
> >
> > These headlines should describe the changes better. You are moving _private_ defines to C file (to reduce header file pollution). That should be clear from the headline.
> >
> > > ARM: davinci: create new common platform header for davinci
> > > ARM: davinci: delete individual platform header files and use a
> > > common header
> > >
> > > 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/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/davinci.h | 88 ++++++++++++++++++++++++++
> >
> > This file should be placed in arch/arm/mach-davinci itself since the definitions are private to arch/arm/mach-davinci.
> > Russell has been complaining about placing unnecessary files in include/mach.
>
> I will just check if the file is needed from the main driver files.
> If not, I will move it to mach-davinci.
Driver files should not need to see machine private stuff.
If that's the case, drivers will probably need some clean-up too.
Thanks,
Sekhar
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2011-12-02 12:42 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-17 10:18 [PATCH v3 0/5] ARM: davinci: re-arrange definitions to have a common davinci header Manjunath Hadli
2011-11-17 10:18 ` [PATCH v3 1/5] ARM: davinci: dm644x: remove the macros from the header to move to c file Manjunath Hadli
2011-11-17 10:18 ` [PATCH v3 2/5] ARM: davinci: dm365: " Manjunath Hadli
2011-11-17 10:18 ` [PATCH v3 3/5] ARM: davinci: dm646x: " Manjunath Hadli
2011-11-17 10:18 ` [PATCH v3 4/5] ARM: davinci: create new common platform header for davinci Manjunath Hadli
2011-11-17 10:35 ` Sergei Shtylyov
2011-11-17 10:48 ` Sergei Shtylyov
2011-11-17 10:59 ` Hadli, Manjunath
2011-11-17 10:18 ` [PATCH v3 5/5] ARM: davinci: delete individual platform header files and use a common header Manjunath Hadli
2011-11-17 10:38 ` Sergei Shtylyov
2011-11-30 11:37 ` [PATCH v3 0/5] ARM: davinci: re-arrange definitions to have a common davinci header Nori, Sekhar
2011-12-02 6:29 ` Hadli, Manjunath
2011-12-02 12:42 ` Nori, Sekhar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).