mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 21:21:37 +00:00
Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
This commit is contained in:
commit
985a71d15b
2 changed files with 12 additions and 1 deletions
|
@ -527,6 +527,9 @@ void spl_board_init(void)
|
|||
*/
|
||||
board_early_init_f();
|
||||
|
||||
/* enable the LSB transmitter */
|
||||
gpio_write_bit(CONFIG_SYS_GPIO_LSB_ENABLE, 1);
|
||||
|
||||
/*
|
||||
* Clear resets
|
||||
*/
|
||||
|
|
|
@ -565,6 +565,7 @@
|
|||
#define CONFIG_SYS_GPIO_PHY1_RST 12
|
||||
#define CONFIG_SYS_GPIO_FLASH_WP 14
|
||||
#define CONFIG_SYS_GPIO_PHY0_RST 22
|
||||
#define CONFIG_SYS_GPIO_PERM_VOLT_FEED 49
|
||||
#define CONFIG_SYS_GPIO_DSPIC_READY 51
|
||||
#define CONFIG_SYS_GPIO_CAN_ENABLE 53
|
||||
#define CONFIG_SYS_GPIO_LSB_ENABLE 54
|
||||
|
@ -577,6 +578,13 @@
|
|||
#define CONFIG_SYS_GPIO_SYSMON_STATUS 62
|
||||
#define CONFIG_SYS_GPIO_WATCHDOG 63
|
||||
|
||||
/* On LCD4, GPIO49 has to be configured to 0 instead of 1 */
|
||||
#ifdef CONFIG_LCD4_LWMON5
|
||||
#define GPIO49_VAL 0
|
||||
#else
|
||||
#define GPIO49_VAL 1
|
||||
#endif
|
||||
|
||||
/*
|
||||
* PPC440 GPIO Configuration
|
||||
*/
|
||||
|
@ -635,7 +643,7 @@
|
|||
{GPIO1_BASE, GPIO_IN , GPIO_ALT1, GPIO_OUT_0}, /* GPIO46 UIC_IRQ(7) DMA_REQ(0) */ \
|
||||
{GPIO1_BASE, GPIO_IN , GPIO_ALT1, GPIO_OUT_0}, /* GPIO47 UIC_IRQ(8) DMA_ACK(0) */ \
|
||||
{GPIO1_BASE, GPIO_IN , GPIO_ALT1, GPIO_OUT_0}, /* GPIO48 UIC_IRQ(9) DMA_EOT/TC(0) */ \
|
||||
{GPIO1_BASE, GPIO_OUT, GPIO_SEL , GPIO_OUT_1}, /* GPIO49 Unselect via TraceSelect Bit */ \
|
||||
{GPIO1_BASE, GPIO_OUT, GPIO_SEL , GPIO49_VAL}, /* GPIO49 Unselect via TraceSelect Bit */ \
|
||||
{GPIO1_BASE, GPIO_IN, GPIO_SEL , GPIO_OUT_0}, /* GPIO50 Unselect via TraceSelect Bit */ \
|
||||
{GPIO1_BASE, GPIO_IN , GPIO_SEL , GPIO_OUT_0}, /* GPIO51 Unselect via TraceSelect Bit */ \
|
||||
{GPIO1_BASE, GPIO_IN , GPIO_SEL , GPIO_OUT_0}, /* GPIO52 Unselect via TraceSelect Bit */ \
|
||||
|
|
Loading…
Add table
Reference in a new issue