Ron has been doing really good work over in v3. The problem is that the work got checked into v2. This should get us back to where we were. (trivial)

Signed-off-by: Marc Jones <marc.jones@amd.com>
Acked-by: Marc Jones <marc.jones@amd.com>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3636 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

1 files changed, 0 insertions, 205 deletions

diff --git a/src/southbridge/amd/sb600/usb.c b/src/southbridge/amd/sb600/usb.c
deleted file mode 100644
index d8ef2c2b07..0000000000
--- a/src/southbridge/amd/sb600/usb.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#include <console/console.h>
-#include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
-#include <usbdebug_direct.h>
-#include <arch/io.h>
-#include "sb600.h"
-
-static struct pci_operations lops_pci = {
-	.set_subsystem = pci_dev_set_subsystem,
-};
-
-static void usb_init(struct device *dev)
-{
-	u8 byte;
-	u16 word;
-	u32 dword;
-
-	/* Enable OHCI0-4 and EHCI Controllers */
-	struct device * sm_dev;
-	sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
-	byte = pci_read_config8(sm_dev, 0x68);
-	byte |= 0x3F;
-	pci_write_config8(sm_dev, 0x68, byte);
-
-	/* RPR 5.2 Enables the USB PME Event,Enable USB resume support */
-	byte = pm_ioread(0x61);
-	byte |= 1 << 6;
-	pm_iowrite(0x61, byte);
-	byte = pm_ioread(0x65);
-	byte |= 1 << 2;
-	pm_iowrite(0x65, byte);
-
-	/* RPR 5.3 Support USB device wakeup from the S4/S5 state */
-	byte = pm_ioread(0x65);
-	byte &= ~(1 << 0);
-	pm_iowrite(0x65, byte);
-
-	/* RPR 5.6 Enable the USB controller to get reset by any software that generate a PCIRst# condition */
-	byte = pm_ioread(0x65);
-	byte |= (1 << 4);
-	pm_iowrite(0x65, byte);
-
-	/* RPR 5.11 Disable OHCI MSI Capability */
-	word = pci_read_config16(dev, 0x40);
-	word |= (0x1F << 8);
-	pci_write_config16(dev, 0x40, word);
-
-	/* RPR 5.8 Disable the OHCI Dynamic Power Saving feature  */
-	dword = pci_read_config32(dev, 0x50);
-	dword &= ~(1 << 16);
-	pci_write_config32(dev, 0x50, dword);
-
-	/* RPR 5.12 Enable prevention of OHCI accessing the invalid system memory address range */
-	word = pci_read_config16(dev, 0x50);
-	word |= 1 << 15;
-	pci_write_config16(dev, 0x50, word);
-
-	/* RPR 5.15 Disable SMI handshake in between USB and ACPI for USB legacy support. */
-	/* The BIOS should always set this bit to prevent the malfunction on USB legacy keyboard/mouse support */
-	word = pci_read_config16(dev, 0x50);
-	word |= 1 << 12;
-	pci_write_config16(dev, 0x50, word);
-}
-
-static void usb_init2(struct device *dev)
-{
-	u8 byte;
-	u16 word;
-	u32 dword;
-	u8 *usb2_bar0;
-	/* dword = pci_read_config32(dev, 0xf8); */
-	/* dword |= 40; */
-	/* pci_write_config32(dev, 0xf8, dword); */
-
-	usb2_bar0 = (u8 *) (pci_read_config32(dev, 0x10) & ~0xFF);
-	printk_info("usb2_bar0=%x\n", usb2_bar0);
-
-	/* RPR5.4 Enables the USB PHY auto calibration resister to match 45ohm resistence */
-	dword = 0x00020F00;
-	writel(dword, usb2_bar0 + 0xC0);
-
-	/* RPR5.5 Sets In/OUT FIFO threshold for best performance */
-	dword = 0x00200040;
-	writel(dword, usb2_bar0 + 0xA4);
-
-	/* RPR5.9 Disable the EHCI Dynamic Power Saving feature */
-	word = readl(usb2_bar0 + 0xBC);
-	word &= ~(1 << 12);
-	writew(word, usb2_bar0 + 0xBC);
-
-	/* RPR5.10 Disable EHCI MSI support */
-	byte = pci_read_config8(dev, 0x50);
-	byte |= (1 << 6);
-	pci_write_config8(dev, 0x50, byte);
-
-	/* RPR5.13 Disable C3 time enhancement feature */
-	dword = pci_read_config32(dev, 0x50);
-	dword &= ~(1 << 28);
-	pci_write_config32(dev, 0x50, dword);
-
-	/* RPR5.14 Disable USB PHY PLL Reset signal to come from ACPI */
-	byte = pci_read_config8(dev, 0x54);
-	byte &= ~(1 << 0);
-	pci_write_config8(dev, 0x54, byte);
-}
-
-static void usb_set_resources(struct device *dev)
-{
-#ifdef CONFIG_USBDEBUG_DIRECT
-	struct resource *res;
-	u32 base;
-	u32 old_debug;
-
-	old_debug = get_ehci_debug();
-	set_ehci_debug(0);
-#endif
-	pci_dev_set_resources(dev);
-
-#ifdef CONFIG_USBDEBUG_DIRECT
-	res = find_resource(dev, 0x10);
-	set_ehci_debug(old_debug);
-	if (!res)
-		return;
-	base = res->base;
-	set_ehci_base(base);
-	report_resource_stored(dev, res, "");
-#endif
-
-}
-
-/* note that below there are a lot of usb drivers. But we don't support linker sets
- * What we need to do is has a phase 2 function that puts the many usb devices into the device tree. 
- * That's one of the purposes of phase 2. We will write this later. 
- *
- */
-#warning need USB phase 2 function to populate device tree
-struct device_operations sb600_usb = {
-	.id = {.type = DEVICE_ID_PCI,
-		{.pci = {.vendor = PCI_VENDOR_ID_ATI,
-			      .device = PCI_DEVICE_ID_ATI_SB600_USB_0}}},
-	.constructor		 = default_device_constructor,
-	.phase3_scan		 = scan_static_bus,
-	.phase4_read_resources	 = pci_dev_read_resources,
-	.phase4_set_resources	 = usb_set_resources,
-	.phase5_enable_resources = pci_dev_enable_resources,
-	.phase6_init		 = usb_init,
-	.ops_pci          = &lops_pci
-};
-
-#if 0
-static struct pci_driver usb_1_driver __pci_driver = {
-	.ops = &usb_ops,
-	.vendor = PCI_VENDOR_ID_ATI,
-	.device = PCI_DEVICE_ID_ATI_SB600_USB_1,
-};
-static struct pci_driver usb_2_driver __pci_driver = {
-	.ops = &usb_ops,
-	.vendor = PCI_VENDOR_ID_ATI,
-	.device = PCI_DEVICE_ID_ATI_SB600_USB_2,
-};
-static struct pci_driver usb_3_driver __pci_driver = {
-	.ops = &usb_ops,
-	.vendor = PCI_VENDOR_ID_ATI,
-	.device = PCI_DEVICE_ID_ATI_SB600_USB_3,
-};
-static struct pci_driver usb_4_driver __pci_driver = {
-	.ops = &usb_ops,
-	.vendor = PCI_VENDOR_ID_ATI,
-	.device = PCI_DEVICE_ID_ATI_SB600_USB_4,
-};
-#endif
-
-struct device_operations sb600_usb2 = {
-	.id = {.type = DEVICE_ID_PCI,
-		{.pci = {.vendor = PCI_VENDOR_ID_ATI,
-			      .device = PCI_DEVICE_ID_ATI_SB600_USB2}}},
-	.constructor		 = default_device_constructor,
-	.phase3_scan		 = scan_static_bus,
-	.phase4_read_resources	 = pci_dev_read_resources,
-	.phase4_set_resources	 = usb_set_resources,
-	.phase5_enable_resources = pci_dev_enable_resources,
-	.phase6_init		 = usb_init,
-	.ops_pci          = &lops_pci
-};