Trivial fixes for some typos, and a major fix for an unitialized

variable. 

Add a license to dts.

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://coreboot.org/repository/LinuxBIOSv3@385 f3766cd6-281f-0410-b1cd-43a5c92072e9
This commit is contained in:
Ronald G. Minnich 2007-06-27 20:52:49 +00:00
parent dd6343d244
commit 90f3486465
2 changed files with 39 additions and 16 deletions

View file

@ -254,7 +254,7 @@ static void lpc_init(struct southbridge_amd_cs5536_config *sb)
static void uarts_init(struct southbridge_amd_cs5536_config *sb) static void uarts_init(struct southbridge_amd_cs5536_config *sb)
{ {
msr_t msr; msr_t msr;
u16 addr; u16 addr = 0;
u32 gpio_addr; u32 gpio_addr;
struct device *dev; struct device *dev;
@ -411,9 +411,7 @@ static void uarts_init(struct southbridge_amd_cs5536_config *sb)
#define PADEN_SET (1 << 7) #define PADEN_SET (1 << 7)
/** /**
* Depending on settings in the config struct, enable COM1 or COM2 or both. * Depending on settings in the config struct, manage USB setup.
* If the enable is NOT set, the UARTS are explicitly disabled, which is required
* if (e.g.) there is a superio attached that does COM1 or COM2.
* @param southbridge config structure * @param southbridge config structure
*/ */
static void enable_USB_port4(struct southbridge_amd_cs5536_config *sb) static void enable_USB_port4(struct southbridge_amd_cs5536_config *sb)
@ -503,24 +501,29 @@ static void enable_USB_port4(struct southbridge_amd_cs5536_config *sb)
} }
} }
/* ***************************************************************************/ /**
/* **/ * This function is in an odd place. We need to see about moving to it geodelx.c
/* * ChipsetInit */ * But for now, let's get things working and put a #warning in. This function
/* Called from northbridge init (Pre-VSA). */ * initializes a lot of nasty bits needed for phase 2. Can this function run
/* **/ * before vsm is set up, or is it required for vsm? The order here is a little hard to
/* ***************************************************************************/ * figure out.
*/
void chipsetinit(void) void chipsetinit(void)
{ {
struct device *dev; struct device *dev;
msr_t msr; msr_t msr;
u32 msrnum; u32 msrnum;
struct southbridge_amd_cs5536_config *sb = struct southbridge_amd_cs5536_config *sb;
(struct southbridge_amd_cs5536_config *)dev->device_configuration;
struct msrinit *csi; struct msrinit *csi;
post_code(P80_CHIPSET_INIT); post_code(P80_CHIPSET_INIT);
dev = dev_find_device(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA, 0);
/* we hope NEVER to be in linuxbios when S3 resumes if (! dev) {
printk(BIOS_ERR, "%s: Could not find the south bridge!\n", __FUNCTION));
return;
}
sb = (struct southbridge_amd_cs5536_config *)dev->device_configuration;
#if 0
if (! IsS3Resume()) */ if (! IsS3Resume()) */
{ {
struct acpiinit *aci = acpi_init_table; struct acpiinit *aci = acpi_init_table;
@ -531,6 +534,7 @@ void chipsetinit(void)
pm_chipset_init(); pm_chipset_init();
} }
#endif
/* set hd IRQ */ /* set hd IRQ */
outl(GPIOL_2_SET, GPIO_IO_BASE + GPIOL_INPUT_ENABLE); outl(GPIOL_2_SET, GPIO_IO_BASE + GPIOL_INPUT_ENABLE);
@ -596,9 +600,9 @@ static void southbridge_init(struct device *dev)
uarts_init(sb); uarts_init(sb);
if (sb->enable_gpio_int_route) { if (sb->enable_gpio_int_route) {
vrWrite((VRC_MISCELLANEOUS << 8) + PCI_INT_AB, vr_write((VRC_MISCELLANEOUS << 8) + PCI_INT_AB,
(sb->enable_gpio_int_route & 0xFFFF)); (sb->enable_gpio_int_route & 0xFFFF));
vrWrite((VRC_MISCELLANEOUS << 8) + PCI_INT_CD, vr_write((VRC_MISCELLANEOUS << 8) + PCI_INT_CD,
(sb->enable_gpio_int_route >> 16)); (sb->enable_gpio_int_route >> 16));
} }

View file

@ -1,3 +1,22 @@
/*
* This file is part of the LinuxBIOS project.
* Copyright 2007 Ronald G. Minnich <rminnich@gmail.com>
*
* 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; either version 2 of the License, or
* (at your option) any later version.
*
* 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
*/
{ {
ide0_enable = "0"; ide0_enable = "0";
ide1_enable = "0"; ide1_enable = "0";