fixup patch from ticket #152 for coreboot trunk (http://tracker.coreboot.org/trac/coreboot/ticket/152) Signed-off-by: Stefan Reinauer Index: src/southbridge/amd/cs5536/cs5536_early_setup.c =================================================================== --- src/southbridge/amd/cs5536/cs5536_early_setup.c (revision 4967) +++ src/southbridge/amd/cs5536/cs5536_early_setup.c (working copy) @@ -172,6 +172,7 @@ outl(GPIOL_8_SET, GPIO_IO_BASE + GPIOL_OUTPUT_ENABLE); /* Set: OUTAUX1 Select (0x10) */ outl(GPIOL_8_SET, GPIO_IO_BASE + GPIOL_OUT_AUX1_SELECT); + /* GPIO9 - UART1_RX */ /* Set: Input Enable (0x20) */ outl(GPIOL_9_SET, GPIO_IO_BASE + GPIOL_INPUT_ENABLE); Index: src/southbridge/amd/cs5536/cs5536.c =================================================================== --- src/southbridge/amd/cs5536/cs5536.c (revision 4967) +++ src/southbridge/amd/cs5536/cs5536.c (working copy) @@ -298,7 +298,7 @@ /* Set: OUTAUX1 Select (0x10) */ outl(GPIOL_8_SET, gpio_addr + GPIOL_OUT_AUX1_SELECT); - /* GPIO8 - UART1_RX */ + /* GPIO9 - UART1_RX */ /* Set: Input Enable (0x20) */ outl(GPIOL_9_SET, gpio_addr + GPIOL_INPUT_ENABLE); /* Set: INAUX1 Select (0x34) */ @@ -356,18 +356,18 @@ msr.lo |= sb->com2_irq << 28; wrmsr(MDD_IRQM_YHIGH, msr); - /* GPIO4 - UART2_RX */ + /* GPIO3 - UART2_RX */ + /* Set: Input Enable (0x20) */ + outl(GPIOL_3_SET, gpio_addr + GPIOL_INPUT_ENABLE); + /* Set: INAUX1 Select (0x34) */ + outl(GPIOL_3_SET, gpio_addr + GPIOL_IN_AUX1_SELECT); + + /* GPIO4 - UART2_TX */ /* Set: Output Enable (0x4) */ outl(GPIOL_4_SET, gpio_addr + GPIOL_OUTPUT_ENABLE); /* Set: OUTAUX1 Select (0x10) */ outl(GPIOL_4_SET, gpio_addr + GPIOL_OUT_AUX1_SELECT); - /* GPIO3 - UART2_TX */ - /* Set: Input Enable (0x20) */ - outl(GPIOL_3_SET, gpio_addr + GPIOL_INPUT_ENABLE); - /* Set: INAUX1 Select (0x34) */ - outl(GPIOL_3_SET, gpio_addr + GPIOL_IN_AUX1_SELECT); - /* Set: GPIO 3 and 4 Pull Up (0x18) */ outl(GPIOL_3_SET | GPIOL_4_SET, gpio_addr + GPIOL_PULLUP_ENABLE);