* [PATCH 2/4] davinci: dm365: move macros local to dm365.c to that file
@ 2011-05-20 14:08 Manjunath Hadli
2011-05-20 15:06 ` Sergei Shtylyov
0 siblings, 1 reply; 2+ messages in thread
From: Manjunath Hadli @ 2011-05-20 14:08 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 | 20 ++++++++++++++++++--
arch/arm/mach-davinci/include/mach/dm365.h | 12 ------------
2 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index 02d2cc3..7e2464e 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -39,8 +39,6 @@
#include "clock.h"
#include "mux.h"
-#define DM365_REF_FREQ 24000000 /* 24 MHz on the DM365 EVM */
-
static struct pll_data pll1_data = {
.num = 1,
.phys_base = DAVINCI_PLL1_BASE,
@@ -53,6 +51,8 @@ static struct pll_data pll2_data = {
.flags = PLL_HAS_POSTDIV | PLL_HAS_PREDIV,
};
+#define DM365_REF_FREQ 24000000 /* 24 MHz on the DM365 EVM */
+
static struct clk ref_clk = {
.name = "ref_clk",
.rate = DM365_REF_FREQ,
@@ -681,6 +681,10 @@ void __init dm365_init_spi0(unsigned chipselect_mask,
platform_device_register(&dm365_spi0_device);
}
+#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 emac_platform_data dm365_emac_pdata = {
.ctrl_reg_offset = DM365_EMAC_CNTRL_OFFSET,
.ctrl_mod_reg_offset = DM365_EMAC_CNTRL_MOD_OFFSET,
@@ -689,6 +693,8 @@ static struct emac_platform_data dm365_emac_pdata = {
.version = EMAC_VERSION_2,
};
+#define DM365_EMAC_BASE 0x01D07000
+
static struct resource dm365_emac_resources[] = {
{
.start = DM365_EMAC_BASE,
@@ -727,6 +733,8 @@ static struct platform_device dm365_emac_device = {
.resource = dm365_emac_resources,
};
+#define DM365_EMAC_MDIO_BASE (DM365_EMAC_BASE + 0x4000)
+
static struct resource dm365_mdio_resources[] = {
{
.start = DM365_EMAC_MDIO_BASE,
@@ -922,6 +930,10 @@ static struct platform_device dm365_asp_device = {
.resource = dm365_asp_resources,
};
+#define DAVINCI_DM365_VC_BASE 0x01D0C000
+#define DAVINCI_DMA_VC_TX 2
+#define DAVINCI_DMA_VC_RX 3
+
static struct resource dm365_vc_resources[] = {
{
.start = DAVINCI_DM365_VC_BASE,
@@ -947,6 +959,8 @@ static struct platform_device dm365_vc_device = {
.resource = dm365_vc_resources,
};
+#define DM365_RTC_BASE 0x01C69000
+
static struct resource dm365_rtc_resources[] = {
{
.start = DM365_RTC_BASE,
@@ -981,6 +995,8 @@ static struct map_desc dm365_io_desc[] = {
},
};
+#define DM365_KEYSCAN_BASE 0x01C69400
+
static struct resource dm365_ks_resources[] = {
{
/* registers */
diff --git a/arch/arm/mach-davinci/include/mach/dm365.h b/arch/arm/mach-davinci/include/mach/dm365.h
index 2563bf4..c3c69a6 100644
--- a/arch/arm/mach-davinci/include/mach/dm365.h
+++ b/arch/arm/mach-davinci/include/mach/dm365.h
@@ -20,18 +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
--
1.6.2.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH 2/4] davinci: dm365: move macros local to dm365.c to that file
2011-05-20 14:08 [PATCH 2/4] davinci: dm365: move macros local to dm365.c to that file Manjunath Hadli
@ 2011-05-20 15:06 ` Sergei Shtylyov
0 siblings, 0 replies; 2+ messages in thread
From: Sergei Shtylyov @ 2011-05-20 15:06 UTC (permalink / raw)
To: linux-arm-kernel
Hello.
Manjunath Hadli wrote:
> 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 | 20 ++++++++++++++++++--
> arch/arm/mach-davinci/include/mach/dm365.h | 12 ------------
> 2 files changed, 18 insertions(+), 14 deletions(-)
> diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
> index 02d2cc3..7e2464e 100644
> --- a/arch/arm/mach-davinci/dm365.c
> +++ b/arch/arm/mach-davinci/dm365.c
> @@ -39,8 +39,6 @@
> #include "clock.h"
> #include "mux.h"
>
> -#define DM365_REF_FREQ 24000000 /* 24 MHz on the DM365 EVM */
> -
> static struct pll_data pll1_data = {
> .num = 1,
> .phys_base = DAVINCI_PLL1_BASE,
> @@ -53,6 +51,8 @@ static struct pll_data pll2_data = {
> .flags = PLL_HAS_POSTDIV | PLL_HAS_PREDIV,
> };
>
> +#define DM365_REF_FREQ 24000000 /* 24 MHz on the DM365 EVM */
Why move it?
> static struct clk ref_clk = {
> .name = "ref_clk",
> .rate = DM365_REF_FREQ,
> @@ -681,6 +681,10 @@ void __init dm365_init_spi0(unsigned chipselect_mask,
> platform_device_register(&dm365_spi0_device);
> }
>
> +#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 emac_platform_data dm365_emac_pdata = {
> .ctrl_reg_offset = DM365_EMAC_CNTRL_OFFSET,
> .ctrl_mod_reg_offset = DM365_EMAC_CNTRL_MOD_OFFSET,
> @@ -689,6 +693,8 @@ static struct emac_platform_data dm365_emac_pdata = {
> .version = EMAC_VERSION_2,
> };
>
> +#define DM365_EMAC_BASE 0x01D07000
> +
> static struct resource dm365_emac_resources[] = {
> {
> .start = DM365_EMAC_BASE,
> @@ -727,6 +733,8 @@ static struct platform_device dm365_emac_device = {
> .resource = dm365_emac_resources,
> };
>
> +#define DM365_EMAC_MDIO_BASE (DM365_EMAC_BASE + 0x4000)
> +
Could we still have base address #define's grouped together at the start of
file?
> static struct resource dm365_mdio_resources[] = {
> {
> .start = DM365_EMAC_MDIO_BASE,
> @@ -922,6 +930,10 @@ static struct platform_device dm365_asp_device = {
> .resource = dm365_asp_resources,
> };
>
> +#define DAVINCI_DM365_VC_BASE 0x01D0C000
> +#define DAVINCI_DMA_VC_TX 2
> +#define DAVINCI_DMA_VC_RX 3
You've duplicated these...
> diff --git a/arch/arm/mach-davinci/include/mach/dm365.h b/arch/arm/mach-davinci/include/mach/dm365.h
> index 2563bf4..c3c69a6 100644
> --- a/arch/arm/mach-davinci/include/mach/dm365.h
> +++ b/arch/arm/mach-davinci/include/mach/dm365.h
> @@ -20,18 +20,6 @@
[...]
> #define DAVINCI_DM365_VC_BASE (0x01D0C000)
> #define DAVINCI_DMA_VC_TX 2
> #define DAVINCI_DMA_VC_RX 3
... as you've forgotten to remove these.
WBR, Sergei
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-05-20 15:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-20 14:08 [PATCH 2/4] davinci: dm365: move macros local to dm365.c to that file Manjunath Hadli
2011-05-20 15:06 ` Sergei Shtylyov
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).