diff options
author | Cyril Chemparathy <cyril@ti.com> | 2010-03-25 17:43:48 -0400 |
---|---|---|
committer | Kevin Hilman <khilman@deeprootsystems.com> | 2010-05-06 18:02:04 -0400 |
commit | 3821d10a538ac9d750987badd404c8f860ffa774 (patch) | |
tree | a6905f55068282d00d47d631b65ccc76d599d352 /arch/arm/mach-davinci/board-da850-evm.c | |
parent | 52958be3ad6e2b72a5943718f339ed4e11685739 (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/board-da850-evm.c')
-rw-r--r-- | arch/arm/mach-davinci/board-da850-evm.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index ef691ae5e67a..6c137e0492ff 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c | |||
@@ -206,12 +206,12 @@ static __init void da850_evm_setup_nor_nand(void) | |||
206 | int ret = 0; | 206 | int ret = 0; |
207 | 207 | ||
208 | if (ui_card_detected & !HAS_MMC) { | 208 | if (ui_card_detected & !HAS_MMC) { |
209 | ret = da8xx_pinmux_setup(da850_nand_pins); | 209 | ret = davinci_cfg_reg_list(da850_nand_pins); |
210 | if (ret) | 210 | if (ret) |
211 | pr_warning("da850_evm_init: nand mux setup failed: " | 211 | pr_warning("da850_evm_init: nand mux setup failed: " |
212 | "%d\n", ret); | 212 | "%d\n", ret); |
213 | 213 | ||
214 | ret = da8xx_pinmux_setup(da850_nor_pins); | 214 | ret = davinci_cfg_reg_list(da850_nor_pins); |
215 | if (ret) | 215 | if (ret) |
216 | pr_warning("da850_evm_init: nor mux setup failed: %d\n", | 216 | pr_warning("da850_evm_init: nor mux setup failed: %d\n", |
217 | ret); | 217 | ret); |
@@ -568,12 +568,12 @@ static int __init da850_evm_config_emac(void) | |||
568 | 568 | ||
569 | if (rmii_en) { | 569 | if (rmii_en) { |
570 | val |= BIT(8); | 570 | val |= BIT(8); |
571 | ret = da8xx_pinmux_setup(da850_rmii_pins); | 571 | ret = davinci_cfg_reg_list(da850_rmii_pins); |
572 | pr_info("EMAC: RMII PHY configured, MII PHY will not be" | 572 | pr_info("EMAC: RMII PHY configured, MII PHY will not be" |
573 | " functional\n"); | 573 | " functional\n"); |
574 | } else { | 574 | } else { |
575 | val &= ~BIT(8); | 575 | val &= ~BIT(8); |
576 | ret = da8xx_pinmux_setup(da850_cpgmac_pins); | 576 | ret = davinci_cfg_reg_list(da850_cpgmac_pins); |
577 | pr_info("EMAC: MII PHY configured, RMII PHY will not be" | 577 | pr_info("EMAC: MII PHY configured, RMII PHY will not be" |
578 | " functional\n"); | 578 | " functional\n"); |
579 | } | 579 | } |
@@ -626,7 +626,7 @@ static __init void da850_evm_init(void) | |||
626 | pr_warning("da850_evm_init: edma registration failed: %d\n", | 626 | pr_warning("da850_evm_init: edma registration failed: %d\n", |
627 | ret); | 627 | ret); |
628 | 628 | ||
629 | ret = da8xx_pinmux_setup(da850_i2c0_pins); | 629 | ret = davinci_cfg_reg_list(da850_i2c0_pins); |
630 | if (ret) | 630 | if (ret) |
631 | pr_warning("da850_evm_init: i2c0 mux setup failed: %d\n", | 631 | pr_warning("da850_evm_init: i2c0 mux setup failed: %d\n", |
632 | ret); | 632 | ret); |
@@ -643,7 +643,7 @@ static __init void da850_evm_init(void) | |||
643 | ret); | 643 | ret); |
644 | 644 | ||
645 | if (HAS_MMC) { | 645 | if (HAS_MMC) { |
646 | ret = da8xx_pinmux_setup(da850_mmcsd0_pins); | 646 | ret = davinci_cfg_reg_list(da850_mmcsd0_pins); |
647 | if (ret) | 647 | if (ret) |
648 | pr_warning("da850_evm_init: mmcsd0 mux setup failed:" | 648 | pr_warning("da850_evm_init: mmcsd0 mux setup failed:" |
649 | " %d\n", ret); | 649 | " %d\n", ret); |
@@ -679,20 +679,20 @@ static __init void da850_evm_init(void) | |||
679 | __raw_writel(0, IO_ADDRESS(DA8XX_UART1_BASE) + 0x30); | 679 | __raw_writel(0, IO_ADDRESS(DA8XX_UART1_BASE) + 0x30); |
680 | __raw_writel(0, IO_ADDRESS(DA8XX_UART0_BASE) + 0x30); | 680 | __raw_writel(0, IO_ADDRESS(DA8XX_UART0_BASE) + 0x30); |
681 | 681 | ||
682 | ret = da8xx_pinmux_setup(da850_mcasp_pins); | 682 | ret = davinci_cfg_reg_list(da850_mcasp_pins); |
683 | if (ret) | 683 | if (ret) |
684 | pr_warning("da850_evm_init: mcasp mux setup failed: %d\n", | 684 | pr_warning("da850_evm_init: mcasp mux setup failed: %d\n", |
685 | ret); | 685 | ret); |
686 | 686 | ||
687 | da8xx_register_mcasp(0, &da850_evm_snd_data); | 687 | da8xx_register_mcasp(0, &da850_evm_snd_data); |
688 | 688 | ||
689 | ret = da8xx_pinmux_setup(da850_lcdcntl_pins); | 689 | ret = davinci_cfg_reg_list(da850_lcdcntl_pins); |
690 | if (ret) | 690 | if (ret) |
691 | pr_warning("da850_evm_init: lcdcntl mux setup failed: %d\n", | 691 | pr_warning("da850_evm_init: lcdcntl mux setup failed: %d\n", |
692 | ret); | 692 | ret); |
693 | 693 | ||
694 | /* Handle board specific muxing for LCD here */ | 694 | /* Handle board specific muxing for LCD here */ |
695 | ret = da8xx_pinmux_setup(da850_evm_lcdc_pins); | 695 | ret = davinci_cfg_reg_list(da850_evm_lcdc_pins); |
696 | if (ret) | 696 | if (ret) |
697 | pr_warning("da850_evm_init: evm specific lcd mux setup " | 697 | pr_warning("da850_evm_init: evm specific lcd mux setup " |
698 | "failed: %d\n", ret); | 698 | "failed: %d\n", ret); |