From: Mark A. Greer <[email protected]> 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 <[email protected]> --- 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 | 12 ------------ 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index aa4ad04..3698d55 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 15efea5..033150a 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 b595a3a..40f88e7 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 962eccf..018701f 100644 --- a/arch/arm/mach-davinci/include/mach/mux.h +++ b/arch/arm/mach-davinci/include/mach/mux.h @@ -19,18 +19,6 @@ #ifndef __INC_MACH_MUX_H #define __INC_MACH_MUX_H -#include <mach/dm644x.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 { char *name; const char *mux_reg_name; -- 1.6.0.3 _______________________________________________ Davinci-linux-open-source mailing list [email protected] http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
