aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-davinci/dm355.c8
-rw-r--r--arch/arm/mach-davinci/dm644x.c3
-rw-r--r--arch/arm/mach-davinci/dm646x.c3
-rw-r--r--arch/arm/mach-davinci/include/mach/mux.h10
-rw-r--r--arch/arm/mach-davinci/time.c2
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,
433 433
434/*----------------------------------------------------------------------*/ 434/*----------------------------------------------------------------------*/
435 435
436#define PINMUX0 0x00
437#define PINMUX1 0x04
438#define PINMUX2 0x08
439#define PINMUX3 0x0c
440#define PINMUX4 0x10
441#define INTMUX 0x18
442#define EVTMUX 0x1c
443
436/* 444/*
437 * Device specific mux setup 445 * Device specific mux setup
438 * 446 *
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 = {
351 .resource = dm644x_emac_resources, 351 .resource = dm644x_emac_resources,
352}; 352};
353 353
354#define PINMUX0 0x00
355#define PINMUX1 0x04
356
354/* 357/*
355 * Device specific mux setup 358 * Device specific mux setup
356 * 359 *
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 = {
333 .resource = dm646x_emac_resources, 333 .resource = dm646x_emac_resources,
334}; 334};
335 335
336#define PINMUX0 0x00
337#define PINMUX1 0x04
338
336/* 339/*
337 * Device specific mux setup 340 * Device specific mux setup
338 * 341 *
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 @@
19#ifndef __INC_MACH_MUX_H 19#ifndef __INC_MACH_MUX_H
20#define __INC_MACH_MUX_H 20#define __INC_MACH_MUX_H
21 21
22/* System module registers */
23#define PINMUX0 0x00
24#define PINMUX1 0x04
25/* dm355 only */
26#define PINMUX2 0x08
27#define PINMUX3 0x0c
28#define PINMUX4 0x10
29#define INTMUX 0x18
30#define EVTMUX 0x1c
31
32struct mux_config { 22struct mux_config {
33 const char *name; 23 const char *name;
34 const char *mux_reg_name; 24 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[] = {
123static int timer32_config(struct timer_s *t) 123static int timer32_config(struct timer_s *t)
124{ 124{
125 u32 tcr; 125 u32 tcr;
126 struct davinci_soc_info *soc_info = davinci_get_soc_info(); 126 struct davinci_soc_info *soc_info = &davinci_soc_info;
127 127
128 if (USING_COMPARE(t)) { 128 if (USING_COMPARE(t)) {
129 struct davinci_timer_instance *dtip = 129 struct davinci_timer_instance *dtip =