mb/gigabyte: Get rid of device_t
Use of device_t has been abandoned in ramstage. Change-Id: I37ba054022241c93c03e6c804e46f4e8a1c1143e Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr> Reviewed-on: https://review.coreboot.org/26084 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Patrick Rudolph <siro@das-labor.org>
This commit is contained in:
committed by
Martin Roth
parent
715a502c17
commit
9981177cb8
@ -33,7 +33,7 @@
|
|||||||
#include <device/pci.h>
|
#include <device/pci.h>
|
||||||
#include <cbfs.h>
|
#include <cbfs.h>
|
||||||
|
|
||||||
static void mainboard_init(device_t dev)
|
static void mainboard_init(struct device *dev)
|
||||||
{
|
{
|
||||||
RCBA32(0x38c8) = 0x00002005;
|
RCBA32(0x38c8) = 0x00002005;
|
||||||
RCBA32(0x38c4) = 0x00802005;
|
RCBA32(0x38c4) = 0x00802005;
|
||||||
@ -72,7 +72,7 @@ static void mainboard_init(device_t dev)
|
|||||||
// mainboard_enable is executed as first thing after
|
// mainboard_enable is executed as first thing after
|
||||||
// enumerate_buses().
|
// enumerate_buses().
|
||||||
|
|
||||||
static void mainboard_enable(device_t dev)
|
static void mainboard_enable(struct device *dev)
|
||||||
{
|
{
|
||||||
dev->ops->init = mainboard_init;
|
dev->ops->init = mainboard_init;
|
||||||
|
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
#include <device/pci.h>
|
#include <device/pci.h>
|
||||||
#include <cbfs.h>
|
#include <cbfs.h>
|
||||||
|
|
||||||
static void mainboard_init(device_t dev)
|
static void mainboard_init(struct device *dev)
|
||||||
{
|
{
|
||||||
RCBA32(0x38c8) = 0x00002005;
|
RCBA32(0x38c8) = 0x00002005;
|
||||||
RCBA32(0x38c4) = 0x00802005;
|
RCBA32(0x38c4) = 0x00802005;
|
||||||
@ -72,7 +72,7 @@ static void mainboard_init(device_t dev)
|
|||||||
// mainboard_enable is executed as first thing after
|
// mainboard_enable is executed as first thing after
|
||||||
// enumerate_buses().
|
// enumerate_buses().
|
||||||
|
|
||||||
static void mainboard_enable(device_t dev)
|
static void mainboard_enable(struct device *dev)
|
||||||
{
|
{
|
||||||
dev->ops->init = mainboard_init;
|
dev->ops->init = mainboard_init;
|
||||||
|
|
||||||
|
@ -63,7 +63,7 @@ void get_bus_conf(void)
|
|||||||
unsigned apicid_base;
|
unsigned apicid_base;
|
||||||
unsigned sbdn;
|
unsigned sbdn;
|
||||||
|
|
||||||
device_t dev;
|
struct device *dev;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (get_bus_conf_done == 1)
|
if (get_bus_conf_done == 1)
|
||||||
|
@ -109,7 +109,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
|
|||||||
printk(BIOS_INFO, "done.\n");
|
printk(BIOS_INFO, "done.\n");
|
||||||
|
|
||||||
{
|
{
|
||||||
device_t dev;
|
struct device *dev;
|
||||||
dev = dev_find_slot(0, PCI_DEVFN(2, 0));
|
dev = dev_find_slot(0, PCI_DEVFN(2, 0));
|
||||||
if (dev) {
|
if (dev) {
|
||||||
/* initialize PCI interupts - these assignments depend
|
/* initialize PCI interupts - these assignments depend
|
||||||
|
@ -47,7 +47,7 @@ static void *smp_write_config_table(void *v)
|
|||||||
|
|
||||||
/*I/O APICs: APIC ID Version State Address*/
|
/*I/O APICs: APIC ID Version State Address*/
|
||||||
{
|
{
|
||||||
device_t dev;
|
struct device *dev;
|
||||||
struct resource *res;
|
struct resource *res;
|
||||||
uint32_t dword;
|
uint32_t dword;
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ unsigned long acpi_fill_madt(unsigned long current)
|
|||||||
|
|
||||||
unsigned sbdn;
|
unsigned sbdn;
|
||||||
struct resource *res;
|
struct resource *res;
|
||||||
device_t dev;
|
struct device *dev;
|
||||||
|
|
||||||
get_bus_conf();
|
get_bus_conf();
|
||||||
sbdn = sysconf.sbdn;
|
sbdn = sysconf.sbdn;
|
||||||
|
@ -61,7 +61,7 @@ void get_bus_conf(void)
|
|||||||
unsigned apicid_base;
|
unsigned apicid_base;
|
||||||
unsigned sbdn;
|
unsigned sbdn;
|
||||||
|
|
||||||
device_t dev;
|
struct device *dev;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (get_bus_conf_done == 1)
|
if (get_bus_conf_done == 1)
|
||||||
|
@ -46,7 +46,7 @@ static void *smp_write_config_table(void *v)
|
|||||||
|
|
||||||
/*I/O APICs: APIC ID Version State Address*/
|
/*I/O APICs: APIC ID Version State Address*/
|
||||||
{
|
{
|
||||||
device_t dev;
|
struct device *dev;
|
||||||
struct resource *res;
|
struct resource *res;
|
||||||
|
|
||||||
dev = dev_find_slot(bus_mcp55[0], PCI_DEVFN(sbdn+ 0x1,0));
|
dev = dev_find_slot(bus_mcp55[0], PCI_DEVFN(sbdn+ 0x1,0));
|
||||||
|
@ -57,7 +57,7 @@ static u32 get_bus_conf_done = 0;
|
|||||||
void get_bus_conf(void)
|
void get_bus_conf(void)
|
||||||
{
|
{
|
||||||
u32 apicid_base;
|
u32 apicid_base;
|
||||||
device_t dev;
|
struct device *dev;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (get_bus_conf_done == 1)
|
if (get_bus_conf_done == 1)
|
||||||
|
@ -31,7 +31,7 @@ void set_pcie_dereset()
|
|||||||
{
|
{
|
||||||
u8 byte;
|
u8 byte;
|
||||||
u16 word;
|
u16 word;
|
||||||
device_t sm_dev;
|
struct device *sm_dev;
|
||||||
/* set 0 to bit1 :disable GPM9 as SLP_S2 output */
|
/* set 0 to bit1 :disable GPM9 as SLP_S2 output */
|
||||||
/* set 0 to bit2 :disable GPM8 as AZ_RST output */
|
/* set 0 to bit2 :disable GPM8 as AZ_RST output */
|
||||||
byte = pm_ioread(0x8d);
|
byte = pm_ioread(0x8d);
|
||||||
@ -56,7 +56,7 @@ void set_pcie_reset()
|
|||||||
{
|
{
|
||||||
u8 byte;
|
u8 byte;
|
||||||
u16 word;
|
u16 word;
|
||||||
device_t sm_dev;
|
struct device *sm_dev;
|
||||||
|
|
||||||
/* set 0 to bit1 :disable GPM9 as SLP_S2 output */
|
/* set 0 to bit1 :disable GPM9 as SLP_S2 output */
|
||||||
/* set 0 to bit2 :disable GPM8 as AZ_RST output */
|
/* set 0 to bit2 :disable GPM8 as AZ_RST output */
|
||||||
@ -94,7 +94,7 @@ static void set_gpio40_gfx(void)
|
|||||||
u8 byte;
|
u8 byte;
|
||||||
// u16 word;
|
// u16 word;
|
||||||
u32 dword;
|
u32 dword;
|
||||||
device_t sm_dev;
|
struct device *sm_dev;
|
||||||
/* disable the GPIO40 as CLKREQ2# function */
|
/* disable the GPIO40 as CLKREQ2# function */
|
||||||
byte = pm_ioread(0xd3);
|
byte = pm_ioread(0xd3);
|
||||||
byte &= ~(1 << 7);
|
byte &= ~(1 << 7);
|
||||||
@ -130,7 +130,7 @@ static void set_gpio40_gfx(void)
|
|||||||
* enable the dedicated function in ma785gm board.
|
* enable the dedicated function in ma785gm board.
|
||||||
* This function called early than rs780_enable.
|
* This function called early than rs780_enable.
|
||||||
*************************************************/
|
*************************************************/
|
||||||
static void mainboard_enable(device_t dev)
|
static void mainboard_enable(struct device *dev)
|
||||||
{
|
{
|
||||||
printk(BIOS_INFO, "Mainboard MA785GM-US2H Enable. dev=0x%p\n", dev);
|
printk(BIOS_INFO, "Mainboard MA785GM-US2H Enable. dev=0x%p\n", dev);
|
||||||
|
|
||||||
|
@ -46,7 +46,7 @@ static void *smp_write_config_table(void *v)
|
|||||||
|
|
||||||
/* I/O APICs: APIC ID Version State Address */
|
/* I/O APICs: APIC ID Version State Address */
|
||||||
{
|
{
|
||||||
device_t dev;
|
struct device *dev;
|
||||||
u32 dword;
|
u32 dword;
|
||||||
u8 byte;
|
u8 byte;
|
||||||
|
|
||||||
|
@ -57,7 +57,7 @@ static u32 get_bus_conf_done = 0;
|
|||||||
void get_bus_conf(void)
|
void get_bus_conf(void)
|
||||||
{
|
{
|
||||||
u32 apicid_base;
|
u32 apicid_base;
|
||||||
device_t dev;
|
struct device *dev;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (get_bus_conf_done == 1)
|
if (get_bus_conf_done == 1)
|
||||||
|
@ -41,7 +41,7 @@ void set_pcie_dereset()
|
|||||||
{
|
{
|
||||||
u8 byte;
|
u8 byte;
|
||||||
u16 word;
|
u16 word;
|
||||||
device_t sm_dev;
|
struct device *sm_dev;
|
||||||
/* set 0 to bit1 :disable GPM9 as SLP_S2 output */
|
/* set 0 to bit1 :disable GPM9 as SLP_S2 output */
|
||||||
/* set 0 to bit2 :disable GPM8 as AZ_RST output */
|
/* set 0 to bit2 :disable GPM8 as AZ_RST output */
|
||||||
byte = pm_ioread(0x8d);
|
byte = pm_ioread(0x8d);
|
||||||
@ -66,7 +66,7 @@ void set_pcie_reset()
|
|||||||
{
|
{
|
||||||
u8 byte;
|
u8 byte;
|
||||||
u16 word;
|
u16 word;
|
||||||
device_t sm_dev;
|
struct device *sm_dev;
|
||||||
|
|
||||||
/* set 0 to bit1 :disable GPM9 as SLP_S2 output */
|
/* set 0 to bit1 :disable GPM9 as SLP_S2 output */
|
||||||
/* set 0 to bit2 :disable GPM8 as AZ_RST output */
|
/* set 0 to bit2 :disable GPM8 as AZ_RST output */
|
||||||
@ -94,7 +94,7 @@ void set_pcie_reset()
|
|||||||
int is_dev3_present(void)
|
int is_dev3_present(void)
|
||||||
{
|
{
|
||||||
u16 word;
|
u16 word;
|
||||||
device_t sm_dev;
|
struct device *sm_dev;
|
||||||
|
|
||||||
/* access the smbus extended register */
|
/* access the smbus extended register */
|
||||||
sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
|
sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
|
||||||
@ -124,7 +124,7 @@ static void set_gpio40_gfx(void)
|
|||||||
u8 byte;
|
u8 byte;
|
||||||
// u16 word;
|
// u16 word;
|
||||||
u32 dword;
|
u32 dword;
|
||||||
device_t sm_dev;
|
struct device *sm_dev;
|
||||||
/* disable the GPIO40 as CLKREQ2# function */
|
/* disable the GPIO40 as CLKREQ2# function */
|
||||||
byte = pm_ioread(0xd3);
|
byte = pm_ioread(0xd3);
|
||||||
byte &= ~(1 << 7);
|
byte &= ~(1 << 7);
|
||||||
@ -179,7 +179,7 @@ static void set_thermal_config(void)
|
|||||||
{
|
{
|
||||||
u8 byte;
|
u8 byte;
|
||||||
u16 word;
|
u16 word;
|
||||||
device_t sm_dev;
|
struct device *sm_dev;
|
||||||
|
|
||||||
/* set ADT 7461 */
|
/* set ADT 7461 */
|
||||||
ADT7461_write_byte(0x0B, 0x50); /* Local Temperature Hight limit */
|
ADT7461_write_byte(0x0B, 0x50); /* Local Temperature Hight limit */
|
||||||
@ -240,7 +240,7 @@ static void set_thermal_config(void)
|
|||||||
* enable the dedicated function in ma785gmt board.
|
* enable the dedicated function in ma785gmt board.
|
||||||
* This function called early than rs780_enable.
|
* This function called early than rs780_enable.
|
||||||
*************************************************/
|
*************************************************/
|
||||||
static void mainboard_enable(device_t dev)
|
static void mainboard_enable(struct device *dev)
|
||||||
{
|
{
|
||||||
printk(BIOS_INFO, "Mainboard MA785GMT-UD2H Enable. dev=0x%p\n", dev);
|
printk(BIOS_INFO, "Mainboard MA785GMT-UD2H Enable. dev=0x%p\n", dev);
|
||||||
|
|
||||||
|
@ -46,7 +46,7 @@ static void *smp_write_config_table(void *v)
|
|||||||
|
|
||||||
/* I/O APICs: APIC ID Version State Address */
|
/* I/O APICs: APIC ID Version State Address */
|
||||||
{
|
{
|
||||||
device_t dev;
|
struct device *dev;
|
||||||
u32 dword;
|
u32 dword;
|
||||||
u8 byte;
|
u8 byte;
|
||||||
|
|
||||||
|
@ -57,7 +57,7 @@ static u32 get_bus_conf_done = 0;
|
|||||||
void get_bus_conf(void)
|
void get_bus_conf(void)
|
||||||
{
|
{
|
||||||
u32 apicid_base;
|
u32 apicid_base;
|
||||||
device_t dev;
|
struct device *dev;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (get_bus_conf_done == 1)
|
if (get_bus_conf_done == 1)
|
||||||
|
@ -34,7 +34,7 @@ u8 is_dev3_present(void);
|
|||||||
void set_pcie_dereset()
|
void set_pcie_dereset()
|
||||||
{
|
{
|
||||||
u16 word;
|
u16 word;
|
||||||
device_t sm_dev;
|
struct device *sm_dev;
|
||||||
/* GPIO 6 reset PCIe slot, GPIO 4 reset GFX PCIe */
|
/* GPIO 6 reset PCIe slot, GPIO 4 reset GFX PCIe */
|
||||||
sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
|
sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
|
||||||
|
|
||||||
@ -47,7 +47,7 @@ void set_pcie_dereset()
|
|||||||
void set_pcie_reset()
|
void set_pcie_reset()
|
||||||
{
|
{
|
||||||
u16 word;
|
u16 word;
|
||||||
device_t sm_dev;
|
struct device *sm_dev;
|
||||||
/* GPIO 6 reset PCIe slot, GPIO 4 reset GFX PCIe */
|
/* GPIO 6 reset PCIe slot, GPIO 4 reset GFX PCIe */
|
||||||
sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
|
sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
|
||||||
|
|
||||||
@ -67,7 +67,7 @@ u8 is_dev3_present(void)
|
|||||||
* enable the dedicated function in board.
|
* enable the dedicated function in board.
|
||||||
* This function called early than rs780_enable.
|
* This function called early than rs780_enable.
|
||||||
*************************************************/
|
*************************************************/
|
||||||
static void mainboard_enable(device_t dev)
|
static void mainboard_enable(struct device *dev)
|
||||||
{
|
{
|
||||||
printk(BIOS_INFO, "Mainboard MA78GM-US2H Enable. dev=0x%p\n", dev);
|
printk(BIOS_INFO, "Mainboard MA78GM-US2H Enable. dev=0x%p\n", dev);
|
||||||
|
|
||||||
|
@ -46,7 +46,7 @@ static void *smp_write_config_table(void *v)
|
|||||||
|
|
||||||
/* I/O APICs: APIC ID Version State Address */
|
/* I/O APICs: APIC ID Version State Address */
|
||||||
{
|
{
|
||||||
device_t dev;
|
struct device *dev;
|
||||||
u32 dword;
|
u32 dword;
|
||||||
u8 byte;
|
u8 byte;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user