Changeset 5074

Timestamp:

Feb 3, 2010 2:49:24 PM (3 years ago)

Author:

oxygene

Message:

The UART2 on the AMD cs5536 is incorrectly configured in two places.
GPIO lines 4 and 3 are swapped and also incorrectly put in IR mode receive (compound fault).

Signed-off-by: Stefan Reinauer <stepan@…>
Acked-by: Edwin Beasant <edwin_beasant@…>

Location:

trunk/src/southbridge/amd/cs5536

Files:

• cs5536.c (modified) (2 diffs)
• cs5536_early_setup.c (modified) (1 diff)

trunk/src/southbridge/amd/cs5536/cs5536.c

@@ -299 +299 @@
                 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);
@@ -357 +357 @@
                 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) */

trunk/src/southbridge/amd/cs5536/cs5536_early_setup.c

@@ -173 +173 @@
         /* Set: OUTAUX1 Select (0x10) */
         outl(GPIOL_8_SET, GPIO_IO_BASE + GPIOL_OUT_AUX1_SELECT);
+
         /* GPIO9 - UART1_RX */
         /* Set: Input Enable   (0x20) */