mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-29 16:10:58 +00:00
ppc44x: config GPIOs for USB on canyonlands board
The GPIO 16 and 19 reconfiguration should be done once USB is initialized. So moved the reconfiguration to the USB init function. Signed-off-by: Rupjyoti Sarmah <rsarmah@apm.com> Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
parent
eb011d27aa
commit
709d9481e9
1 changed files with 13 additions and 10 deletions
|
@ -195,16 +195,6 @@ int board_early_init_f(void)
|
|||
mtdcr(AHB_TOP, 0x8000004B);
|
||||
mtdcr(AHB_BOT, 0x8000004B);
|
||||
|
||||
if (pvr_460ex()) {
|
||||
/*
|
||||
* Configure USB-STP pins as alternate and not GPIO
|
||||
* It seems to be neccessary to configure the STP pins as GPIO
|
||||
* input at powerup (perhaps while USB reset is asserted). So
|
||||
* we configure those pins to their "real" function now.
|
||||
*/
|
||||
gpio_config(16, GPIO_OUT, GPIO_ALT1, GPIO_OUT_1);
|
||||
gpio_config(19, GPIO_OUT, GPIO_ALT1, GPIO_OUT_1);
|
||||
}
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
|
@ -222,6 +212,15 @@ int usb_board_init(void)
|
|||
val &= ~(BCSR_USBCTRL_OTG_RST | BCSR_USBCTRL_HOST_RST);
|
||||
out_8(&bcsr_data->usb_ctrl, val);
|
||||
|
||||
/*
|
||||
* Configure USB-STP pins as alternate and not GPIO
|
||||
* It seems to be neccessary to configure the STP pins as GPIO
|
||||
* input at powerup (perhaps while USB reset is asserted). So
|
||||
* we configure those pins to their "real" function now.
|
||||
*/
|
||||
gpio_config(16, GPIO_OUT, GPIO_ALT1, GPIO_OUT_1);
|
||||
gpio_config(19, GPIO_OUT, GPIO_ALT1, GPIO_OUT_1);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -236,6 +235,10 @@ int usb_board_stop(void)
|
|||
val |= (BCSR_USBCTRL_OTG_RST | BCSR_USBCTRL_HOST_RST);
|
||||
out_8(&bcsr_data->usb_ctrl, val);
|
||||
|
||||
/* Reconfigure USB-STP pins as input */
|
||||
gpio_config(16, GPIO_IN , GPIO_SEL, GPIO_OUT_0);
|
||||
gpio_config(19, GPIO_IN , GPIO_SEL, GPIO_OUT_0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue