aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/include
diff options
context:
space:
mode:
authorCyril Chemparathy <cyril@ti.com>2010-03-25 17:43:48 -0400
committerKevin Hilman <khilman@deeprootsystems.com>2010-05-06 18:02:04 -0400
commit3821d10a538ac9d750987badd404c8f860ffa774 (patch)
treea6905f55068282d00d47d631b65ccc76d599d352 /arch/arm/mach-davinci/include
parent52958be3ad6e2b72a5943718f339ed4e11685739 (diff)
Davinci: promote da8xx_pinmux_setup()
Rename da8xx_pinmux_setup() to davinci_cfg_reg_list() and promote it for use in other SOCs that may need the ability to configure multiple pins in one shot. Signed-off-by: Cyril Chemparathy <cyril@ti.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-davinci/include')
-rw-r--r--arch/arm/mach-davinci/include/mach/da8xx.h6
-rw-r--r--arch/arm/mach-davinci/include/mach/mux.h5
2 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h
index 03acfd39042b..33471c9cbca3 100644
--- a/arch/arm/mach-davinci/include/mach/da8xx.h
+++ b/arch/arm/mach-davinci/include/mach/da8xx.h
@@ -146,10 +146,4 @@ extern const short da850_mmcsd0_pins[];
146extern const short da850_nand_pins[]; 146extern const short da850_nand_pins[];
147extern const short da850_nor_pins[]; 147extern const short da850_nor_pins[];
148 148
149#ifdef CONFIG_DAVINCI_MUX
150int da8xx_pinmux_setup(const short pins[]);
151#else
152static inline int da8xx_pinmux_setup(const short pins[]) { return 0; }
153#endif
154
155#endif /* __ASM_ARCH_DAVINCI_DA8XX_H */ 149#endif /* __ASM_ARCH_DAVINCI_DA8XX_H */
diff --git a/arch/arm/mach-davinci/include/mach/mux.h b/arch/arm/mach-davinci/include/mach/mux.h
index 2a68c1d8a24b..48888db00fad 100644
--- a/arch/arm/mach-davinci/include/mach/mux.h
+++ b/arch/arm/mach-davinci/include/mach/mux.h
@@ -907,9 +907,14 @@ enum davinci_da850_index {
907#ifdef CONFIG_DAVINCI_MUX 907#ifdef CONFIG_DAVINCI_MUX
908/* setup pin muxing */ 908/* setup pin muxing */
909extern int davinci_cfg_reg(unsigned long reg_cfg); 909extern int davinci_cfg_reg(unsigned long reg_cfg);
910extern int davinci_cfg_reg_list(const short pins[]);
910#else 911#else
911/* boot loader does it all (no warnings from CONFIG_DAVINCI_MUX_WARNINGS) */ 912/* boot loader does it all (no warnings from CONFIG_DAVINCI_MUX_WARNINGS) */
912static inline int davinci_cfg_reg(unsigned long reg_cfg) { return 0; } 913static inline int davinci_cfg_reg(unsigned long reg_cfg) { return 0; }
914static inline int davinci_cfg_reg_list(const short pins[])
915{
916 return 0;
917}
913#endif 918#endif
914 919
915#endif /* __INC_MACH_MUX_H */ 920#endif /* __INC_MACH_MUX_H */