diff options
Diffstat (limited to 'arch/arm/plat-aspeed/ast-scu.c')
| -rw-r--r-- | arch/arm/plat-aspeed/ast-scu.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/arch/arm/plat-aspeed/ast-scu.c b/arch/arm/plat-aspeed/ast-scu.c index 1f1dde27608f..76722f481c78 100644 --- a/arch/arm/plat-aspeed/ast-scu.c +++ b/arch/arm/plat-aspeed/ast-scu.c @@ -251,6 +251,15 @@ ast_scu_init_usb20(void) } +extern void +ast_scu_init_vhub(void) { + //start USB20 clock + ast_scu_write(ast_scu_read(AST_SCU_CLK_STOP) | SCU_USB20_CLK_EN, AST_SCU_CLK_STOP); + mdelay(10); + //disable USB20 reset + ast_scu_write(ast_scu_read(AST_SCU_RESET) & ~SCU_RESET_USB20, AST_SCU_RESET); +} + EXPORT_SYMBOL(ast_scu_init_usb20); extern void @@ -739,7 +748,7 @@ ast_scu_multi_func_uart(u8 uart) { switch(uart) { case 1: - ast_scu_write(ast_scu_read(AST_SCU_FUN_PIN_CTRL1) | + ast_scu_write(ast_scu_read(AST_SCU_FUN_PIN_CTRL2) | SCU_FUN_PIN_UART1_RXD | SCU_FUN_PIN_UART1_TXD | SCU_FUN_PIN_UART1_NRTS | @@ -748,10 +757,10 @@ ast_scu_multi_func_uart(u8 uart) SCU_FUN_PIN_UART1_NDSR | SCU_FUN_PIN_UART1_NDCD | SCU_FUN_PIN_UART1_NCTS, - AST_SCU_FUN_PIN_CTRL1); + AST_SCU_FUN_PIN_CTRL2); break; case 2: - ast_scu_write(ast_scu_read(AST_SCU_FUN_PIN_CTRL1) | + ast_scu_write(ast_scu_read(AST_SCU_FUN_PIN_CTRL2) | SCU_FUN_PIN_UART2_RXD | SCU_FUN_PIN_UART2_TXD | SCU_FUN_PIN_UART2_NRTS | @@ -760,7 +769,7 @@ ast_scu_multi_func_uart(u8 uart) SCU_FUN_PIN_UART2_NDSR | SCU_FUN_PIN_UART2_NDCD | SCU_FUN_PIN_UART2_NCTS, - AST_SCU_FUN_PIN_CTRL1); + AST_SCU_FUN_PIN_CTRL2); break; case 3: ast_scu_write(ast_scu_read(AST_SCU_FUN_PIN_CTRL1) | |