From 5570078c0ec5ecc5df0bbd7d06f43549b7127ae7 Mon Sep 17 00:00:00 2001
From: "Mark A. Greer" <mgreer@mvista.com>
Date: Wed, 15 Apr 2009 12:42:06 -0700
Subject: [PATCH] davinci: Move PINMUX defines to SoC files
Different SoC have different numbers of pinmux registers and other
resources that overlap with each other. To clean up the code and
eliminate defines that overlap with each other, move the PINMUX
defines to the SoC specific files.
Signed-off-by: Mark A. Greer <mgreer@mvista.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
---
arch/arm/mach-davinci/dm355.c | 8 ++++++++
arch/arm/mach-davinci/dm644x.c | 3 +++
arch/arm/mach-davinci/dm646x.c | 3 +++
arch/arm/mach-davinci/include/mach/mux.h | 10 ----------
arch/arm/mach-davinci/time.c | 2 +-
5 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index 4c3257ef5ddc..78fc598b0bca 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -433,6 +433,14 @@ void __init dm355_init_spi0(unsigned chipselect_mask,
/*----------------------------------------------------------------------*/
+#define PINMUX0 0x00
+#define PINMUX1 0x04
+#define PINMUX2 0x08
+#define PINMUX3 0x0c
+#define PINMUX4 0x10
+#define INTMUX 0x18
+#define EVTMUX 0x1c
+
/*
* Device specific mux setup
*
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 3844fc34cbb5..4ab5f07ead05 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -351,6 +351,9 @@ static struct platform_device dm644x_emac_device = {
.resource = dm644x_emac_resources,
};
+#define PINMUX0 0x00
+#define PINMUX1 0x04
+
/*
* Device specific mux setup
*
diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index 5185ad55fc50..12189c737a3b 100644
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -333,6 +333,9 @@ static struct platform_device dm646x_emac_device = {
.resource = dm646x_emac_resources,
};
+#define PINMUX0 0x00
+#define PINMUX1 0x04
+
/*
* Device specific mux setup
*
diff --git a/arch/arm/mach-davinci/include/mach/mux.h b/arch/arm/mach-davinci/include/mach/mux.h
index 5d6efa80af6f..27378458542f 100644
--- a/arch/arm/mach-davinci/include/mach/mux.h
+++ b/arch/arm/mach-davinci/include/mach/mux.h
@@ -19,16 +19,6 @@
#ifndef __INC_MACH_MUX_H
#define __INC_MACH_MUX_H
-/* System module registers */
-#define PINMUX0 0x00
-#define PINMUX1 0x04
-/* dm355 only */
-#define PINMUX2 0x08
-#define PINMUX3 0x0c
-#define PINMUX4 0x10
-#define INTMUX 0x18
-#define EVTMUX 0x1c
-
struct mux_config {
const char *name;
const char *mux_reg_name;
diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c
index fc90d3ee0eba..0884ca57bfb0 100644
--- a/arch/arm/mach-davinci/time.c
+++ b/arch/arm/mach-davinci/time.c
@@ -123,7 +123,7 @@ static char *id_to_name[] = {
static int timer32_config(struct timer_s *t)
{
u32 tcr;
- struct davinci_soc_info *soc_info = davinci_get_soc_info();
+ struct davinci_soc_info *soc_info = &davinci_soc_info;
if (USING_COMPARE(t)) {
struct davinci_timer_instance *dtip =