|
@@ -206,12 +206,12 @@ static __init void da850_evm_setup_nor_nand(void)
|
|
|
int ret = 0;
|
|
|
|
|
|
if (ui_card_detected & !HAS_MMC) {
|
|
|
- ret = da8xx_pinmux_setup(da850_nand_pins);
|
|
|
+ ret = davinci_cfg_reg_list(da850_nand_pins);
|
|
|
if (ret)
|
|
|
pr_warning("da850_evm_init: nand mux setup failed: "
|
|
|
"%d\n", ret);
|
|
|
|
|
|
- ret = da8xx_pinmux_setup(da850_nor_pins);
|
|
|
+ ret = davinci_cfg_reg_list(da850_nor_pins);
|
|
|
if (ret)
|
|
|
pr_warning("da850_evm_init: nor mux setup failed: %d\n",
|
|
|
ret);
|
|
@@ -568,12 +568,12 @@ static int __init da850_evm_config_emac(void)
|
|
|
|
|
|
if (rmii_en) {
|
|
|
val |= BIT(8);
|
|
|
- ret = da8xx_pinmux_setup(da850_rmii_pins);
|
|
|
+ ret = davinci_cfg_reg_list(da850_rmii_pins);
|
|
|
pr_info("EMAC: RMII PHY configured, MII PHY will not be"
|
|
|
" functional\n");
|
|
|
} else {
|
|
|
val &= ~BIT(8);
|
|
|
- ret = da8xx_pinmux_setup(da850_cpgmac_pins);
|
|
|
+ ret = davinci_cfg_reg_list(da850_cpgmac_pins);
|
|
|
pr_info("EMAC: MII PHY configured, RMII PHY will not be"
|
|
|
" functional\n");
|
|
|
}
|
|
@@ -626,7 +626,7 @@ static __init void da850_evm_init(void)
|
|
|
pr_warning("da850_evm_init: edma registration failed: %d\n",
|
|
|
ret);
|
|
|
|
|
|
- ret = da8xx_pinmux_setup(da850_i2c0_pins);
|
|
|
+ ret = davinci_cfg_reg_list(da850_i2c0_pins);
|
|
|
if (ret)
|
|
|
pr_warning("da850_evm_init: i2c0 mux setup failed: %d\n",
|
|
|
ret);
|
|
@@ -643,7 +643,7 @@ static __init void da850_evm_init(void)
|
|
|
ret);
|
|
|
|
|
|
if (HAS_MMC) {
|
|
|
- ret = da8xx_pinmux_setup(da850_mmcsd0_pins);
|
|
|
+ ret = davinci_cfg_reg_list(da850_mmcsd0_pins);
|
|
|
if (ret)
|
|
|
pr_warning("da850_evm_init: mmcsd0 mux setup failed:"
|
|
|
" %d\n", ret);
|
|
@@ -679,20 +679,20 @@ static __init void da850_evm_init(void)
|
|
|
__raw_writel(0, IO_ADDRESS(DA8XX_UART1_BASE) + 0x30);
|
|
|
__raw_writel(0, IO_ADDRESS(DA8XX_UART0_BASE) + 0x30);
|
|
|
|
|
|
- ret = da8xx_pinmux_setup(da850_mcasp_pins);
|
|
|
+ ret = davinci_cfg_reg_list(da850_mcasp_pins);
|
|
|
if (ret)
|
|
|
pr_warning("da850_evm_init: mcasp mux setup failed: %d\n",
|
|
|
ret);
|
|
|
|
|
|
da8xx_register_mcasp(0, &da850_evm_snd_data);
|
|
|
|
|
|
- ret = da8xx_pinmux_setup(da850_lcdcntl_pins);
|
|
|
+ ret = davinci_cfg_reg_list(da850_lcdcntl_pins);
|
|
|
if (ret)
|
|
|
pr_warning("da850_evm_init: lcdcntl mux setup failed: %d\n",
|
|
|
ret);
|
|
|
|
|
|
/* Handle board specific muxing for LCD here */
|
|
|
- ret = da8xx_pinmux_setup(da850_evm_lcdc_pins);
|
|
|
+ ret = davinci_cfg_reg_list(da850_evm_lcdc_pins);
|
|
|
if (ret)
|
|
|
pr_warning("da850_evm_init: evm specific lcd mux setup "
|
|
|
"failed: %d\n", ret);
|