@ -76,7 +76,7 @@ static void mmc_pinmux_setup(int sdc)
case 0 :
case 0 :
/* D1-PF0, D0-PF1, CLK-PF2, CMD-PF3, D3-PF4, D4-PF5 */
/* D1-PF0, D0-PF1, CLK-PF2, CMD-PF3, D3-PF4, D4-PF5 */
for ( pin = SUNXI_GPF ( 0 ) ; pin < = SUNXI_GPF ( 5 ) ; pin + + ) {
for ( pin = SUNXI_GPF ( 0 ) ; pin < = SUNXI_GPF ( 5 ) ; pin + + ) {
sunxi_gpio_set_cfgpin ( pin , SUNXI_GPF0 _SDC0 ) ;
sunxi_gpio_set_cfgpin ( pin , SUNXI_GPF_SDC0 ) ;
sunxi_gpio_set_pull ( pin , SUNXI_GPIO_PULL_UP ) ;
sunxi_gpio_set_pull ( pin , SUNXI_GPIO_PULL_UP ) ;
sunxi_gpio_set_drv ( pin , 2 ) ;
sunxi_gpio_set_drv ( pin , 2 ) ;
}
}
@ -85,7 +85,7 @@ static void mmc_pinmux_setup(int sdc)
case 1 :
case 1 :
/* CMD-PG3, CLK-PG4, D0~D3-PG5-8 */
/* CMD-PG3, CLK-PG4, D0~D3-PG5-8 */
for ( pin = SUNXI_GPG ( 3 ) ; pin < = SUNXI_GPG ( 8 ) ; pin + + ) {
for ( pin = SUNXI_GPG ( 3 ) ; pin < = SUNXI_GPG ( 8 ) ; pin + + ) {
sunxi_gpio_set_cfgpin ( pin , SUN5I_GPG3 _SDC1 ) ;
sunxi_gpio_set_cfgpin ( pin , SUN5I_GPG_SDC1 ) ;
sunxi_gpio_set_pull ( pin , SUNXI_GPIO_PULL_UP ) ;
sunxi_gpio_set_pull ( pin , SUNXI_GPIO_PULL_UP ) ;
sunxi_gpio_set_drv ( pin , 2 ) ;
sunxi_gpio_set_drv ( pin , 2 ) ;
}
}
@ -94,7 +94,7 @@ static void mmc_pinmux_setup(int sdc)
case 2 :
case 2 :
/* CMD-PC6, CLK-PC7, D0-PC8, D1-PC9, D2-PC10, D3-PC11 */
/* CMD-PC6, CLK-PC7, D0-PC8, D1-PC9, D2-PC10, D3-PC11 */
for ( pin = SUNXI_GPC ( 6 ) ; pin < = SUNXI_GPC ( 11 ) ; pin + + ) {
for ( pin = SUNXI_GPC ( 6 ) ; pin < = SUNXI_GPC ( 11 ) ; pin + + ) {
sunxi_gpio_set_cfgpin ( pin , SUNXI_GPC6 _SDC2 ) ;
sunxi_gpio_set_cfgpin ( pin , SUNXI_GPC_SDC2 ) ;
sunxi_gpio_set_pull ( pin , SUNXI_GPIO_PULL_UP ) ;
sunxi_gpio_set_pull ( pin , SUNXI_GPIO_PULL_UP ) ;
sunxi_gpio_set_drv ( pin , 2 ) ;
sunxi_gpio_set_drv ( pin , 2 ) ;
}
}
@ -103,7 +103,7 @@ static void mmc_pinmux_setup(int sdc)
case 3 :
case 3 :
/* CMD-PI4, CLK-PI5, D0~D3-PI6~9 : 2 */
/* CMD-PI4, CLK-PI5, D0~D3-PI6~9 : 2 */
for ( pin = SUNXI_GPI ( 4 ) ; pin < = SUNXI_GPI ( 9 ) ; pin + + ) {
for ( pin = SUNXI_GPI ( 4 ) ; pin < = SUNXI_GPI ( 9 ) ; pin + + ) {
sunxi_gpio_set_cfgpin ( pin , SUN4I_GPI4 _SDC3 ) ;
sunxi_gpio_set_cfgpin ( pin , SUN4I_GPI_SDC3 ) ;
sunxi_gpio_set_pull ( pin , SUNXI_GPIO_PULL_UP ) ;
sunxi_gpio_set_pull ( pin , SUNXI_GPIO_PULL_UP ) ;
sunxi_gpio_set_drv ( pin , 2 ) ;
sunxi_gpio_set_drv ( pin , 2 ) ;
}
}
@ -155,8 +155,8 @@ int board_mmc_init(bd_t *bis)
void i2c_init_board ( void )
void i2c_init_board ( void )
{
{
sunxi_gpio_set_cfgpin ( SUNXI_GPB ( 0 ) , SUNXI_GPB0 _TWI0 ) ;
sunxi_gpio_set_cfgpin ( SUNXI_GPB ( 0 ) , SUNXI_GPB_TWI0 ) ;
sunxi_gpio_set_cfgpin ( SUNXI_GPB ( 1 ) , SUNXI_GPB0 _TWI0 ) ;
sunxi_gpio_set_cfgpin ( SUNXI_GPB ( 1 ) , SUNXI_GPB_TWI0 ) ;
clock_twi_onoff ( 0 , 1 ) ;
clock_twi_onoff ( 0 , 1 ) ;
# if defined CONFIG_VIDEO_LCD_PANEL_I2C && !(defined CONFIG_SPL_BUILD)
# if defined CONFIG_VIDEO_LCD_PANEL_I2C && !(defined CONFIG_SPL_BUILD)
soft_i2c_gpio_sda = sunxi_name_to_gpio ( CONFIG_VIDEO_LCD_PANEL_I2C_SDA ) ;
soft_i2c_gpio_sda = sunxi_name_to_gpio ( CONFIG_VIDEO_LCD_PANEL_I2C_SDA ) ;