From: Mark A. Greer <[email protected]> The pinmux register base and setup can be different for different SoCs so move the pinmux reg base, pinmux table (and its size) to the SoC infrastructure.
Doing this allows the removal of the <soc>_init() routines, davinci_mux_register(), and the calls to those routines. Signed-off-by: Mark A. Greer <[email protected]> --- arch/arm/mach-davinci/board-dm355-evm.c | 2 -- arch/arm/mach-davinci/board-dm644x-evm.c | 2 -- arch/arm/mach-davinci/board-dm646x-evm.c | 2 -- arch/arm/mach-davinci/board-sffsdr.c | 2 -- arch/arm/mach-davinci/dm355.c | 12 +++++++----- arch/arm/mach-davinci/dm644x.c | 12 +++++++----- arch/arm/mach-davinci/dm646x.c | 12 +++++++----- arch/arm/mach-davinci/include/mach/common.h | 5 +++++ arch/arm/mach-davinci/include/mach/dm355.h | 1 - arch/arm/mach-davinci/include/mach/dm644x.h | 1 - arch/arm/mach-davinci/include/mach/dm646x.h | 1 - arch/arm/mach-davinci/include/mach/mux.h | 6 ------ arch/arm/mach-davinci/mux.c | 23 ++++++----------------- 13 files changed, 32 insertions(+), 49 deletions(-) diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c index 05601c4..a2156fd 100644 --- a/arch/arm/mach-davinci/board-dm355-evm.c +++ b/arch/arm/mach-davinci/board-dm355-evm.c @@ -194,8 +194,6 @@ static void __init dm355_evm_map_io(void) soc_info = dm355_get_soc_info(); davinci_common_init(soc_info); - - dm355_init(); } static int dm355evm_mmc_get_cd(int module) diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c index 6b716b0..2b7c403 100644 --- a/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/arch/arm/mach-davinci/board-dm644x-evm.c @@ -604,8 +604,6 @@ davinci_evm_map_io(void) soc_info = dm644x_get_soc_info(); davinci_common_init(soc_info); - - dm644x_init(); } static int davinci_phy_fixup(struct phy_device *phydev) diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c index 5761857..3f52ba8 100644 --- a/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/arch/arm/mach-davinci/board-dm646x-evm.c @@ -128,8 +128,6 @@ static void __init davinci_map_io(void) soc_info = dm646x_get_soc_info(); davinci_common_init(soc_info); - - dm646x_init(); } static __init void evm_init(void) diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c index 33621c4..5a13ee4 100644 --- a/arch/arm/mach-davinci/board-sffsdr.c +++ b/arch/arm/mach-davinci/board-sffsdr.c @@ -160,8 +160,6 @@ static void __init davinci_sffsdr_map_io(void) soc_info = dm644x_get_soc_info(); davinci_common_init(soc_info); - - dm644x_init(); } static __init void davinci_sffsdr_init(void) diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index f6cc88c..129c8e5 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c @@ -435,6 +435,7 @@ void __init dm355_init_spi0(unsigned chipselect_mask, * soc description mux mode mode mux dbg * reg offset mask mode */ +#ifdef CONFIG_DAVINCI_MUX static const struct mux_config dm355_pins[] = { MUX_CFG(DM355, MMCSD0, 4, 2, 1, 0, false) @@ -467,6 +468,7 @@ EVT_CFG(DM355, EVT8_ASP1_TX, 0, 1, 0, false) EVT_CFG(DM355, EVT9_ASP1_RX, 1, 1, 0, false) EVT_CFG(DM355, EVT26_MMC0_RX, 2, 1, 0, false) }; +#endif /*----------------------------------------------------------------------*/ @@ -558,6 +560,11 @@ static struct davinci_soc_info davinci_soc_info_dm355 = { .cpu_clks = dm355_clks, .psc_bases = dm355_psc_bases, .psc_bases_num = ARRAY_SIZE(dm355_psc_bases), +#ifdef CONFIG_DAVINCI_MUX + .pinmux_base = IO_ADDRESS(DAVINCI_SYSTEM_MODULE_BASE), + .pinmux_pins = dm355_pins, + .pinmux_pins_num = ARRAY_SIZE(dm355_pins), +#endif }; struct davinci_soc_info *dm355_get_soc_info(void) @@ -565,11 +572,6 @@ struct davinci_soc_info *dm355_get_soc_info(void) return &davinci_soc_info_dm355; } -void __init dm355_init(void) -{ - davinci_mux_register(dm355_pins, ARRAY_SIZE(dm355_pins));; -} - static int __init dm355_init_devices(void) { if (!cpu_is_davinci_dm355()) diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index 8c5db81..98b8547 100644 --- a/arch/arm/mach-davinci/dm644x.c +++ b/arch/arm/mach-davinci/dm644x.c @@ -345,6 +345,7 @@ static struct platform_device dm644x_emac_device = { * soc description mux mode mode mux dbg * reg offset mask mode */ +#ifdef CONFIG_DAVINCI_MUX static const struct mux_config dm644x_pins[] = { MUX_CFG(DM644X, HDIREN, 0, 16, 1, 1, true) MUX_CFG(DM644X, ATAEN, 0, 17, 1, 1, true) @@ -387,6 +388,7 @@ MUX_CFG(DM644X, RGB666, 0, 22, 1, 1, true) MUX_CFG(DM644X, LOEEN, 0, 24, 1, 1, true) MUX_CFG(DM644X, LFLDEN, 0, 25, 1, 1, false) }; +#endif /*----------------------------------------------------------------------*/ @@ -498,6 +500,11 @@ static struct davinci_soc_info davinci_soc_info_dm644x = { .cpu_clks = dm644x_clks, .psc_bases = dm644x_psc_bases, .psc_bases_num = ARRAY_SIZE(dm644x_psc_bases), +#ifdef CONFIG_DAVINCI_MUX + .pinmux_base = IO_ADDRESS(DAVINCI_SYSTEM_MODULE_BASE), + .pinmux_pins = dm644x_pins, + .pinmux_pins_num = ARRAY_SIZE(dm644x_pins), +#endif }; struct davinci_soc_info *dm644x_get_soc_info(void) @@ -505,11 +512,6 @@ struct davinci_soc_info *dm644x_get_soc_info(void) return &davinci_soc_info_dm644x; } -void __init dm644x_init(void) -{ - davinci_mux_register(dm644x_pins, ARRAY_SIZE(dm644x_pins)); -} - static int __init dm644x_init_devices(void) { if (!cpu_is_davinci_dm644x()) diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index 0c7bde9..2a79063 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c @@ -326,6 +326,7 @@ static struct platform_device dm646x_emac_device = { * soc description mux mode mode mux dbg * reg offset mask mode */ +#ifdef CONFIG_DAVINCI_MUX static const struct mux_config dm646x_pins[] = { MUX_CFG(DM646X, ATAEN, 0, 0, 1, 1, true) @@ -355,6 +356,7 @@ MUX_CFG(DM646X, PTSOMUX_SERIAL, 0, 18, 3, 3, true) MUX_CFG(DM646X, PTSIMUX_SERIAL, 0, 16, 3, 3, true) }; +#endif /*----------------------------------------------------------------------*/ @@ -478,6 +480,11 @@ static struct davinci_soc_info davinci_soc_info_dm646x = { .cpu_clks = dm646x_clks, .psc_bases = dm646x_psc_bases, .psc_bases_num = ARRAY_SIZE(dm646x_psc_bases), +#ifdef CONFIG_DAVINCI_MUX + .pinmux_base = IO_ADDRESS(DAVINCI_SYSTEM_MODULE_BASE), + .pinmux_pins = dm646x_pins, + .pinmux_pins_num = ARRAY_SIZE(dm646x_pins), +#endif }; struct davinci_soc_info *dm646x_get_soc_info(void) @@ -485,11 +492,6 @@ struct davinci_soc_info *dm646x_get_soc_info(void) return &davinci_soc_info_dm646x; } -void __init dm646x_init(void) -{ - davinci_mux_register(dm646x_pins, ARRAY_SIZE(dm646x_pins)); -} - static int __init dm646x_init_devices(void) { if (!cpu_is_davinci_dm646x()) diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h index 7cb3e39..7d072e2 100644 --- a/arch/arm/mach-davinci/include/mach/common.h +++ b/arch/arm/mach-davinci/include/mach/common.h @@ -36,6 +36,11 @@ struct davinci_soc_info { struct davinci_clk *cpu_clks; void __iomem **psc_bases; unsigned long psc_bases_num; +#ifdef CONFIG_DAVINCI_MUX + void __iomem *pinmux_base; + const struct mux_config *pinmux_pins; + unsigned long pinmux_pins_num; +#endif }; extern struct davinci_soc_info *davinci_soc_info; diff --git a/arch/arm/mach-davinci/include/mach/dm355.h b/arch/arm/mach-davinci/include/mach/dm355.h index 65300c5..0e358b8 100644 --- a/arch/arm/mach-davinci/include/mach/dm355.h +++ b/arch/arm/mach-davinci/include/mach/dm355.h @@ -13,7 +13,6 @@ #include <mach/hardware.h> -void __init dm355_init(void); struct davinci_soc_info *dm355_get_soc_info(void); struct spi_board_info; diff --git a/arch/arm/mach-davinci/include/mach/dm644x.h b/arch/arm/mach-davinci/include/mach/dm644x.h index 3f7347e..f6f2f9c 100644 --- a/arch/arm/mach-davinci/include/mach/dm644x.h +++ b/arch/arm/mach-davinci/include/mach/dm644x.h @@ -33,7 +33,6 @@ #define DM644X_EMAC_MDIO_OFFSET (0x4000) #define DM644X_EMAC_CNTRL_RAM_SIZE (0x2000) -void __init dm644x_init(void); struct davinci_soc_info *dm644x_get_soc_info(void); void dm644x_init_emac(struct emac_platform_data *pdata); diff --git a/arch/arm/mach-davinci/include/mach/dm646x.h b/arch/arm/mach-davinci/include/mach/dm646x.h index 23316aa..ba6f2e4 100644 --- a/arch/arm/mach-davinci/include/mach/dm646x.h +++ b/arch/arm/mach-davinci/include/mach/dm646x.h @@ -22,7 +22,6 @@ #define DM646X_EMAC_MDIO_OFFSET (0x4000) #define DM646X_EMAC_CNTRL_RAM_SIZE (0x2000) -void __init dm646x_init(void); struct davinci_soc_info *dm646x_get_soc_info(void); void dm646x_init_emac(struct emac_platform_data *pdata); diff --git a/arch/arm/mach-davinci/include/mach/mux.h b/arch/arm/mach-davinci/include/mach/mux.h index 557bebf..962eccf 100644 --- a/arch/arm/mach-davinci/include/mach/mux.h +++ b/arch/arm/mach-davinci/include/mach/mux.h @@ -170,15 +170,9 @@ enum davinci_dm355_index { #ifdef CONFIG_DAVINCI_MUX /* setup pin muxing */ -extern void davinci_mux_init(void); -extern int davinci_mux_register(const struct mux_config *pins, - unsigned long size); extern int davinci_cfg_reg(unsigned long reg_cfg); #else /* boot loader does it all (no warnings from CONFIG_DAVINCI_MUX_WARNINGS) */ -static inline void davinci_mux_init(void) {} -static inline int davinci_mux_register(const struct mux_config *pins, - unsigned long size) { return 0; } static inline int davinci_cfg_reg(unsigned long reg_cfg) { return 0; } #endif diff --git a/arch/arm/mach-davinci/mux.c b/arch/arm/mach-davinci/mux.c index bbba0b2..2567edb 100644 --- a/arch/arm/mach-davinci/mux.c +++ b/arch/arm/mach-davinci/mux.c @@ -21,18 +21,7 @@ #include <mach/hardware.h> #include <mach/mux.h> - -static const struct mux_config *mux_table; -static unsigned long pin_table_sz; - -int __init davinci_mux_register(const struct mux_config *pins, - unsigned long size) -{ - mux_table = pins; - pin_table_sz = size; - - return 0; -} +#include <mach/common.h> /* * Sets the DAVINCI MUX register based on the table @@ -40,23 +29,23 @@ int __init davinci_mux_register(const struct mux_config *pins, int __init_or_module davinci_cfg_reg(const unsigned long index) { static DEFINE_SPINLOCK(mux_spin_lock); - void __iomem *base = IO_ADDRESS(DAVINCI_SYSTEM_MODULE_BASE); + void __iomem *base = davinci_soc_info->pinmux_base; unsigned long flags; const struct mux_config *cfg; unsigned int reg_orig = 0, reg = 0; unsigned int mask, warn = 0; - if (!mux_table) + if (!davinci_soc_info->pinmux_pins) BUG(); - if (index >= pin_table_sz) { + if (index >= davinci_soc_info->pinmux_pins_num) { printk(KERN_ERR "Invalid pin mux index: %lu (%lu)\n", - index, pin_table_sz); + index, davinci_soc_info->pinmux_pins_num); dump_stack(); return -ENODEV; } - cfg = &mux_table[index]; + cfg = &davinci_soc_info->pinmux_pins[index]; if (cfg->name == NULL) { printk(KERN_ERR "No entry for the specified index\n"); -- 1.6.0.3 _______________________________________________ Davinci-linux-open-source mailing list [email protected] http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
