There was a programming error which made most USB port4 setup wrong. This patch uses...

[coreboot.git] / src / southbridge / amd / cs5536 / cs5536.c

diff --git a/src/southbridge/amd/cs5536/cs5536.c b/src/southbridge/amd/cs5536/cs5536.c
index ef5064a8a8a8ed29bfa7fec0847d55ca465b3ac1..51e9c6f788756d904150b57072d452b20a379511 100644 (file)
--- a/src/southbridge/amd/cs5536/cs5536.c
+++ b/src/southbridge/amd/cs5536/cs5536.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the LinuxBIOS project.
+ * This file is part of the coreboot project.
  *
  * Copyright (C) 2007 Advanced Micro Devices, Inc.
  *
@@ -356,19 +356,19 @@ static void uarts_init(struct southbridge_amd_cs5536_config *sb)
                msr.lo |= sb->com2_irq << 28;
                wrmsr(MDD_IRQM_YHIGH, msr);
 
-               /* GPIO3 - UART2_RX */
-               /* Set: Output Enable  (0x4) */
-               outl(GPIOL_3_SET, gpio_addr + GPIOL_OUTPUT_ENABLE);
+               /* GPIO4 - UART2_RX */
+               /* Set: Output Enable (0x4) */
+               outl(GPIOL_4_SET, gpio_addr + GPIOL_OUTPUT_ENABLE);
                /* Set: OUTAUX1 Select (0x10) */
-               outl(GPIOL_3_SET, gpio_addr + GPIOL_OUT_AUX1_SELECT);
+               outl(GPIOL_4_SET, gpio_addr + GPIOL_OUT_AUX1_SELECT);
 
-               /* GPIO4 - UART2_TX */
-               /* Set: Input Enable   (0x20) */
-               outl(GPIOL_4_SET, gpio_addr + GPIOL_INPUT_ENABLE);
-               /* Set: INAUX1 Select  (0x34) */
-               outl(GPIOL_4_SET, gpio_addr + GPIOL_IN_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 + 3 Pull Up         (0x18) */
+               /* Set: GPIO 3 and 4 Pull Up (0x18) */
                outl(GPIOL_3_SET | GPIOL_4_SET,
                     gpio_addr + GPIOL_PULLUP_ENABLE);
 
@@ -409,7 +409,7 @@ static void uarts_init(struct southbridge_amd_cs5536_config *sb)
 
 static void enable_USB_port4(struct southbridge_amd_cs5536_config *sb)
 {
-       uint32_t *bar;
+       uint8_t *bar;
        msr_t msr;
        device_t dev;
 
@@ -425,32 +425,33 @@ static void enable_USB_port4(struct southbridge_amd_cs5536_config *sb)
                /* write to clear diag register */
                wrmsr(USB2_SB_GLD_MSR_DIAG, rdmsr(USB2_SB_GLD_MSR_DIAG));
 
-               bar = (uint32_t *) pci_read_config32(dev, PCI_BASE_ADDRESS_0);
+               bar = (uint8_t *) pci_read_config32(dev, PCI_BASE_ADDRESS_0);
 
                /* Make HCCPARAMS writeable */
-               *(bar + IPREG04) |= USB_HCCPW_SET;
+               writel(readl(bar + IPREG04) | USB_HCCPW_SET, bar + IPREG04);
 
                /* ; EECP=50h, IST=01h, ASPC=1 */
-               *(bar + HCCPARAMS) = 0x00005012;
+               writel(0x00005012, bar + HCCPARAMS);
        }
 
        dev = dev_find_device(PCI_VENDOR_ID_AMD, 
                        PCI_DEVICE_ID_AMD_CS5536_OTG, 0);
        if (dev) {
-               bar = (uint32_t *) pci_read_config32(dev, PCI_BASE_ADDRESS_0);
+               bar = (uint8_t *) pci_read_config32(dev, PCI_BASE_ADDRESS_0);
 
-               *(bar + UOCMUX) &= PUEN_SET;
+               writel(readl(bar + UOCMUX) & PUEN_SET, bar + UOCMUX);
 
                /* Host or Device? */
                if (sb->enable_USBP4_device) {
-                       *(bar + UOCMUX) |= PMUX_DEVICE;
+                       writel(readl(bar + UOCMUX) | PMUX_DEVICE, bar + UOCMUX);
                } else {
-                       *(bar + UOCMUX) |= PMUX_HOST;
+                       writel(readl(bar + UOCMUX) | PMUX_HOST, bar + UOCMUX);
                }
 
                /* Overcurrent configuration */
                if (sb->enable_USBP4_overcurrent) {
-                       *(bar + UOCCAP) |= sb->enable_USBP4_overcurrent;
+                       writel(readl(bar + UOCCAP)
+                              | sb->enable_USBP4_overcurrent, bar + UOCCAP);
                }
        }
 
@@ -464,19 +465,20 @@ static void enable_USB_port4(struct southbridge_amd_cs5536_config *sb)
                dev = dev_find_device(PCI_VENDOR_ID_AMD, 
                                PCI_DEVICE_ID_AMD_CS5536_UDC, 0);
                if (dev) {
-                       bar = (uint32_t *) pci_read_config32(dev, 
+                       bar = (uint8_t *) pci_read_config32(dev, 
                                        PCI_BASE_ADDRESS_0);
-                       *(bar + UDCDEVCTL) |= UDC_SD_SET;
+                       writel(readl(bar + UDCDEVCTL) | UDC_SD_SET,
+                              bar + UDCDEVCTL);
 
                }
 
                dev = dev_find_device(PCI_VENDOR_ID_AMD,
                                PCI_DEVICE_ID_AMD_CS5536_OTG, 0);
                if (dev) {
-                       bar = (uint32_t *) pci_read_config32(dev,
+                       bar = (uint8_t *) pci_read_config32(dev,
                                        PCI_BASE_ADDRESS_0);
-                       *(bar + UOCCTL) |= PADEN_SET;
-                       *(bar + UOCCAP) |= APU_SET;
+                       writel(readl(bar + UOCCTL) | PADEN_SET, bar + UOCCTL);
+                       writel(readl(bar + UOCCAP) | APU_SET, bar + UOCCAP);
                }
        }
 
@@ -511,7 +513,7 @@ void chipsetinit(void)
 
        post_code(P80_CHIPSET_INIT);
 
-       /* we hope NEVER to be in linuxbios when S3 resumes
+       /* we hope NEVER to be in coreboot when S3 resumes
           if (! IsS3Resume()) */
        {
                struct acpiinit *aci = acpi_init_table;
@@ -627,7 +629,7 @@ static struct device_operations southbridge_ops = {
        .scan_bus = scan_static_bus,
 };
 
-static struct pci_driver cs5536_pci_driver __pci_driver = {
+static const struct pci_driver cs5536_pci_driver __pci_driver = {
        .ops = &southbridge_ops,
        .vendor = PCI_VENDOR_ID_AMD,
        .device = PCI_DEVICE_ID_AMD_CS5536_ISA