[coreboot-gerrit] Change in coreboot[master]: mb/google: Get rid of device_t
Elyes HAOUAS (Code Review)
gerrit at coreboot.org
Fri May 4 20:24:17 CEST 2018
Elyes HAOUAS has uploaded this change for review. ( https://review.coreboot.org/26086
Change subject: mb/google: Get rid of device_t
......................................................................
mb/google: Get rid of device_t
Use of device_t has been abandoned in ramstage.
Change-Id: I8e549e4222ae2ed6b9c46f81c5b5253e8b227ee8
Signed-off-by: Elyes HAOUAS <ehaouas at noos.fr>
---
M src/mainboard/google/auron/mainboard.c
M src/mainboard/google/auron/variant.h
M src/mainboard/google/auron/variants/auron_paine/variant.c
M src/mainboard/google/auron/variants/auron_yuna/variant.c
M src/mainboard/google/auron/variants/gandof/variant.c
M src/mainboard/google/auron/variants/lulu/variant.c
M src/mainboard/google/auron/variants/samus/variant.c
M src/mainboard/google/beltino/chromeos.c
M src/mainboard/google/beltino/mainboard.c
M src/mainboard/google/butterfly/chromeos.c
M src/mainboard/google/butterfly/mainboard.c
M src/mainboard/google/chell/mainboard.c
M src/mainboard/google/cheza/mainboard.c
M src/mainboard/google/cyan/mainboard.c
M src/mainboard/google/daisy/mainboard.c
M src/mainboard/google/eve/mainboard.c
M src/mainboard/google/fizz/mainboard.c
M src/mainboard/google/foster/mainboard.c
M src/mainboard/google/gale/mainboard.c
M src/mainboard/google/glados/mainboard.c
M src/mainboard/google/gru/mainboard.c
M src/mainboard/google/jecht/chromeos.c
M src/mainboard/google/jecht/mainboard.c
M src/mainboard/google/kahlee/mainboard.c
M src/mainboard/google/kahlee/mptable.c
M src/mainboard/google/lars/mainboard.c
M src/mainboard/google/link/mainboard.c
M src/mainboard/google/nyan/mainboard.c
M src/mainboard/google/nyan_big/mainboard.c
M src/mainboard/google/nyan_blaze/mainboard.c
M src/mainboard/google/oak/mainboard.c
M src/mainboard/google/octopus/mainboard.c
M src/mainboard/google/parrot/chromeos.c
M src/mainboard/google/parrot/mainboard.c
M src/mainboard/google/peach_pit/mainboard.c
M src/mainboard/google/poppy/mainboard.c
M src/mainboard/google/poppy/variants/nami/mainboard.c
M src/mainboard/google/poppy/variants/nami/pl2.c
M src/mainboard/google/purin/mainboard.c
M src/mainboard/google/rambi/mainboard.c
M src/mainboard/google/reef/mainboard.c
M src/mainboard/google/rotor/mainboard.c
M src/mainboard/google/slippy/mainboard.c
M src/mainboard/google/smaug/mainboard.c
M src/mainboard/google/storm/mainboard.c
M src/mainboard/google/stout/chromeos.c
M src/mainboard/google/stout/mainboard.c
M src/mainboard/google/urara/mainboard.c
M src/mainboard/google/veyron/mainboard.c
M src/mainboard/google/veyron_mickey/mainboard.c
M src/mainboard/google/veyron_rialto/mainboard.c
M src/mainboard/google/zoombini/mainboard.c
52 files changed, 107 insertions(+), 107 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/86/26086/1
diff --git a/src/mainboard/google/auron/mainboard.c b/src/mainboard/google/auron/mainboard.c
index ca0c083..9eece73 100644
--- a/src/mainboard/google/auron/mainboard.c
+++ b/src/mainboard/google/auron/mainboard.c
@@ -20,12 +20,12 @@
#include "variant.h"
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
mainboard_ec_init();
}
-static int mainboard_smbios_data(device_t dev, int *handle,
+static int mainboard_smbios_data(struct device *dev, int *handle,
unsigned long *current)
{
return variant_smbios_data(dev, handle, current);
@@ -34,7 +34,7 @@
// mainboard_enable is executed as first thing after
// enumerate_buses().
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = mainboard_init;
dev->ops->get_smbios_data = mainboard_smbios_data;
diff --git a/src/mainboard/google/auron/variant.h b/src/mainboard/google/auron/variant.h
index 41c157f..eeae2fe 100644
--- a/src/mainboard/google/auron/variant.h
+++ b/src/mainboard/google/auron/variant.h
@@ -18,7 +18,7 @@
#include <device/device.h>
#include <soc/romstage.h>
-int variant_smbios_data(device_t dev, int *handle, unsigned long *current);
+int variant_smbios_data(struct device *dev, int *handle, unsigned long *current);
void variant_romstage_entry(struct romstage_params *rp);
#endif
diff --git a/src/mainboard/google/auron/variants/auron_paine/variant.c b/src/mainboard/google/auron/variants/auron_paine/variant.c
index f1af14d..438a1f4 100644
--- a/src/mainboard/google/auron/variants/auron_paine/variant.c
+++ b/src/mainboard/google/auron/variants/auron_paine/variant.c
@@ -16,7 +16,7 @@
#include <variant/onboard.h>
#include <mainboard/google/auron/variant.h>
-int variant_smbios_data(device_t dev, int *handle,
+int variant_smbios_data(struct device *dev, int *handle,
unsigned long *current)
{
int len = 0;
diff --git a/src/mainboard/google/auron/variants/auron_yuna/variant.c b/src/mainboard/google/auron/variants/auron_yuna/variant.c
index f1af14d..438a1f4 100644
--- a/src/mainboard/google/auron/variants/auron_yuna/variant.c
+++ b/src/mainboard/google/auron/variants/auron_yuna/variant.c
@@ -16,7 +16,7 @@
#include <variant/onboard.h>
#include <mainboard/google/auron/variant.h>
-int variant_smbios_data(device_t dev, int *handle,
+int variant_smbios_data(struct device *dev, int *handle,
unsigned long *current)
{
int len = 0;
diff --git a/src/mainboard/google/auron/variants/gandof/variant.c b/src/mainboard/google/auron/variants/gandof/variant.c
index ad88f0d..be1a689 100644
--- a/src/mainboard/google/auron/variants/gandof/variant.c
+++ b/src/mainboard/google/auron/variants/gandof/variant.c
@@ -18,7 +18,7 @@
#include <variant/onboard.h>
#include <mainboard/google/auron/variant.h>
-int variant_smbios_data(device_t dev, int *handle,
+int variant_smbios_data(struct device *dev, int *handle,
unsigned long *current)
{
int len = 0;
diff --git a/src/mainboard/google/auron/variants/lulu/variant.c b/src/mainboard/google/auron/variants/lulu/variant.c
index 9d77c27..e63e6a1 100644
--- a/src/mainboard/google/auron/variants/lulu/variant.c
+++ b/src/mainboard/google/auron/variants/lulu/variant.c
@@ -18,7 +18,7 @@
#include <variant/onboard.h>
#include <mainboard/google/auron/variant.h>
-int variant_smbios_data(device_t dev, int *handle,
+int variant_smbios_data(struct device *dev, int *handle,
unsigned long *current)
{
int len = 0;
diff --git a/src/mainboard/google/auron/variants/samus/variant.c b/src/mainboard/google/auron/variants/samus/variant.c
index 0c50e1f..2e7d6f7 100644
--- a/src/mainboard/google/auron/variants/samus/variant.c
+++ b/src/mainboard/google/auron/variants/samus/variant.c
@@ -26,7 +26,7 @@
return samus_board_version();
}
-int variant_smbios_data(device_t dev, int *handle,
+int variant_smbios_data(struct device *dev, int *handle,
unsigned long *current)
{
/* N/A for SAMUS */
diff --git a/src/mainboard/google/beltino/chromeos.c b/src/mainboard/google/beltino/chromeos.c
index 7412c62..7b01ebb 100644
--- a/src/mainboard/google/beltino/chromeos.c
+++ b/src/mainboard/google/beltino/chromeos.c
@@ -48,7 +48,7 @@
int get_write_protect_state(void)
{
- device_t dev;
+ struct device *dev;
#ifdef __PRE_RAM__
dev = PCI_DEV(0, 0x1f, 2);
#else
@@ -59,7 +59,7 @@
int get_recovery_mode_switch(void)
{
- device_t dev;
+ struct device *dev;
#ifdef __PRE_RAM__
dev = PCI_DEV(0, 0x1f, 2);
#else
diff --git a/src/mainboard/google/beltino/mainboard.c b/src/mainboard/google/beltino/mainboard.c
index 00c1da0..eb1d31c 100644
--- a/src/mainboard/google/beltino/mainboard.c
+++ b/src/mainboard/google/beltino/mainboard.c
@@ -40,7 +40,7 @@
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
lan_init();
}
@@ -48,7 +48,7 @@
// mainboard_enable is executed as first thing after
// enumerate_buses().
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = mainboard_init;
dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
diff --git a/src/mainboard/google/butterfly/chromeos.c b/src/mainboard/google/butterfly/chromeos.c
index 42f6189..a1603d4 100644
--- a/src/mainboard/google/butterfly/chromeos.c
+++ b/src/mainboard/google/butterfly/chromeos.c
@@ -37,7 +37,7 @@
void fill_lb_gpios(struct lb_gpios *gpios)
{
- device_t dev = dev_find_slot(0, PCI_DEVFN(0x1f,0));
+ struct device *dev = dev_find_slot(0, PCI_DEVFN(0x1f,0));
u16 gpio_base = pci_read_config16(dev, GPIOBASE) & 0xfffe;
int lidswitch = 0;
diff --git a/src/mainboard/google/butterfly/mainboard.c b/src/mainboard/google/butterfly/mainboard.c
index a100981..e7235ed 100644
--- a/src/mainboard/google/butterfly/mainboard.c
+++ b/src/mainboard/google/butterfly/mainboard.c
@@ -181,7 +181,7 @@
ec_mem_write(EC_KBID_REG, kbd_type);
}
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
u32 search_address = 0x0;
size_t search_length = -1;
@@ -254,7 +254,7 @@
}
}
-static int butterfly_onboard_smbios_data(device_t dev, int *handle,
+static int butterfly_onboard_smbios_data(struct device *dev, int *handle,
unsigned long *current)
{
int len = 0;
@@ -274,7 +274,7 @@
// mainboard_enable is executed as first thing after
// enumerate_buses().
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = mainboard_init;
dev->ops->get_smbios_data = butterfly_onboard_smbios_data;
diff --git a/src/mainboard/google/chell/mainboard.c b/src/mainboard/google/chell/mainboard.c
index bfa79b4..e2cf9ad 100644
--- a/src/mainboard/google/chell/mainboard.c
+++ b/src/mainboard/google/chell/mainboard.c
@@ -23,13 +23,13 @@
#include <vendorcode/google/chromeos/chromeos.h>
#include "ec.h"
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
mainboard_ec_init();
}
static unsigned long mainboard_write_acpi_tables(
- device_t device, unsigned long current, acpi_rsdp_t *rsdp)
+ struct device *device, unsigned long current, acpi_rsdp_t *rsdp)
{
uintptr_t start_addr;
uintptr_t end_addr;
@@ -66,7 +66,7 @@
* mainboard_enable is executed as first thing after
* enumerate_buses().
*/
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = mainboard_init;
dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
diff --git a/src/mainboard/google/cheza/mainboard.c b/src/mainboard/google/cheza/mainboard.c
index c249a32..568d486 100644
--- a/src/mainboard/google/cheza/mainboard.c
+++ b/src/mainboard/google/cheza/mainboard.c
@@ -17,12 +17,12 @@
#include <bootblock_common.h>
#include <timestamp.h>
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
}
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = &mainboard_init;
}
diff --git a/src/mainboard/google/cyan/mainboard.c b/src/mainboard/google/cyan/mainboard.c
index e5ad945..4cce5a5 100644
--- a/src/mainboard/google/cyan/mainboard.c
+++ b/src/mainboard/google/cyan/mainboard.c
@@ -19,7 +19,7 @@
#include <vendorcode/google/chromeos/chromeos.h>
#include "ec.h"
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
mainboard_ec_init();
}
@@ -28,7 +28,7 @@
* mainboard_enable is executed as first thing after
* enumerate_buses().
*/
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = mainboard_init;
dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
diff --git a/src/mainboard/google/daisy/mainboard.c b/src/mainboard/google/daisy/mainboard.c
index 336a9e5..b6c5518 100644
--- a/src/mainboard/google/daisy/mainboard.c
+++ b/src/mainboard/google/daisy/mainboard.c
@@ -252,7 +252,7 @@
}
/* this happens after cpu_init where exynos resources are set */
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
int dp_tries;
struct s5p_dp_device dp_device = {
@@ -316,7 +316,7 @@
// gpio_info();
}
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = &mainboard_init;
diff --git a/src/mainboard/google/eve/mainboard.c b/src/mainboard/google/eve/mainboard.c
index d30eff2..b9ad358 100644
--- a/src/mainboard/google/eve/mainboard.c
+++ b/src/mainboard/google/eve/mainboard.c
@@ -24,13 +24,13 @@
static const char *oem_id_maxim = "GOOGLE";
static const char *oem_table_id_maxim = "EVEMAX";
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
mainboard_ec_init();
}
static unsigned long mainboard_write_acpi_tables(
- device_t device, unsigned long current, acpi_rsdp_t *rsdp)
+ struct device *device, unsigned long current, acpi_rsdp_t *rsdp)
{
uintptr_t start_addr;
uintptr_t end_addr;
@@ -63,7 +63,7 @@
return end_addr;
}
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = mainboard_init;
dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
diff --git a/src/mainboard/google/fizz/mainboard.c b/src/mainboard/google/fizz/mainboard.c
index e6a0296..eb48e40 100644
--- a/src/mainboard/google/fizz/mainboard.c
+++ b/src/mainboard/google/fizz/mainboard.c
@@ -227,13 +227,13 @@
return sku_str;
}
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
mainboard_ec_init();
}
static unsigned long mainboard_write_acpi_tables(
- device_t device, unsigned long current, acpi_rsdp_t *rsdp)
+ struct device *device, unsigned long current, acpi_rsdp_t *rsdp)
{
const char *oem_id = "GOOGLE";
const char *oem_table_id = "FIZZ";
@@ -291,9 +291,9 @@
printk(BIOS_ERR, "Failed to set BJ limit\n");
}
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
- device_t root = SA_DEV_ROOT;
+ struct device *root = SA_DEV_ROOT;
config_t *conf = root->chip_info;
mainboard_set_power_limits(conf);
diff --git a/src/mainboard/google/foster/mainboard.c b/src/mainboard/google/foster/mainboard.c
index 65e41cc..3c2d831 100644
--- a/src/mainboard/google/foster/mainboard.c
+++ b/src/mainboard/google/foster/mainboard.c
@@ -106,7 +106,7 @@
clock_enable_audio();
}
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
soc_configure_pads(padcfgs, ARRAY_SIZE(padcfgs));
soc_configure_funits(funitcfgs, ARRAY_SIZE(funitcfgs));
@@ -115,7 +115,7 @@
setup_audio();
}
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = &mainboard_init;
}
diff --git a/src/mainboard/google/gale/mainboard.c b/src/mainboard/google/gale/mainboard.c
index de384f9..3a69fa2 100644
--- a/src/mainboard/google/gale/mainboard.c
+++ b/src/mainboard/google/gale/mainboard.c
@@ -37,7 +37,7 @@
setup_usb_host1();
}
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
/* disable mmu and d-cache before setting up secure world.*/
dcache_mmu_disable();
@@ -60,7 +60,7 @@
//audio_clock_config(6144000);
}
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = &mainboard_init;
}
diff --git a/src/mainboard/google/glados/mainboard.c b/src/mainboard/google/glados/mainboard.c
index 855d69d..be23f4e 100644
--- a/src/mainboard/google/glados/mainboard.c
+++ b/src/mainboard/google/glados/mainboard.c
@@ -23,13 +23,13 @@
#include <vendorcode/google/chromeos/chromeos.h>
#include "ec.h"
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
mainboard_ec_init();
}
static unsigned long mainboard_write_acpi_tables(
- device_t device, unsigned long current, acpi_rsdp_t *rsdp)
+ struct device *device, unsigned long current, acpi_rsdp_t *rsdp)
{
uintptr_t start_addr;
uintptr_t end_addr;
@@ -70,7 +70,7 @@
* mainboard_enable is executed as first thing after
* enumerate_buses().
*/
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = mainboard_init;
dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
diff --git a/src/mainboard/google/gru/mainboard.c b/src/mainboard/google/gru/mainboard.c
index c9f3c48..41307c7 100644
--- a/src/mainboard/google/gru/mainboard.c
+++ b/src/mainboard/google/gru/mainboard.c
@@ -333,7 +333,7 @@
usb_power_cycle(port);
}
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
configure_sdmmc();
configure_emmc();
@@ -689,7 +689,7 @@
}
}
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = &mainboard_init;
}
diff --git a/src/mainboard/google/jecht/chromeos.c b/src/mainboard/google/jecht/chromeos.c
index f99fd6d..1bc8bd0 100644
--- a/src/mainboard/google/jecht/chromeos.c
+++ b/src/mainboard/google/jecht/chromeos.c
@@ -51,7 +51,7 @@
int get_write_protect_state(void)
{
- device_t dev;
+ struct device *dev;
#ifdef __PRE_RAM__
dev = PCI_DEV(0, 0x1f, 2);
#else
@@ -62,7 +62,7 @@
int get_recovery_mode_switch(void)
{
- device_t dev;
+ struct device *dev;
#ifdef __PRE_RAM__
dev = PCI_DEV(0, 0x1f, 2);
#else
diff --git a/src/mainboard/google/jecht/mainboard.c b/src/mainboard/google/jecht/mainboard.c
index 7e57505..0a827c6 100644
--- a/src/mainboard/google/jecht/mainboard.c
+++ b/src/mainboard/google/jecht/mainboard.c
@@ -25,7 +25,7 @@
outb(0xcb, 0xb2);
}
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
lan_init();
}
@@ -33,7 +33,7 @@
// mainboard_enable is executed as first thing after
// enumerate_buses().
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = mainboard_init;
dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
diff --git a/src/mainboard/google/kahlee/mainboard.c b/src/mainboard/google/kahlee/mainboard.c
index f1df881..a01ae0a 100644
--- a/src/mainboard/google/kahlee/mainboard.c
+++ b/src/mainboard/google/kahlee/mainboard.c
@@ -184,7 +184,7 @@
/*************************************************
* Dedicated mainboard function
*************************************************/
-static void kahlee_enable(device_t dev)
+static void kahlee_enable(struct device *dev)
{
printk(BIOS_INFO, "Mainboard "
CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
diff --git a/src/mainboard/google/kahlee/mptable.c b/src/mainboard/google/kahlee/mptable.c
index e29b3e3..860bb5a 100644
--- a/src/mainboard/google/kahlee/mptable.c
+++ b/src/mainboard/google/kahlee/mptable.c
@@ -115,7 +115,7 @@
/* on board NIC & Slot PCIE. */
/* PCI slots */
- device_t dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));
+ struct device *dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));
if (dev && dev->enabled) {
u8 bus_pci = dev->link_list->secondary;
/* PCI_SLOT 0. */
diff --git a/src/mainboard/google/lars/mainboard.c b/src/mainboard/google/lars/mainboard.c
index e044405..43895fb 100644
--- a/src/mainboard/google/lars/mainboard.c
+++ b/src/mainboard/google/lars/mainboard.c
@@ -23,13 +23,13 @@
#include <vendorcode/google/chromeos/chromeos.h>
#include "ec.h"
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
mainboard_ec_init();
}
static unsigned long mainboard_write_acpi_tables(
- device_t device, unsigned long current, acpi_rsdp_t *rsdp)
+ struct device *device, unsigned long current, acpi_rsdp_t *rsdp)
{
uintptr_t start_addr;
uintptr_t end_addr;
@@ -66,7 +66,7 @@
* mainboard_enable is executed as first thing after
* enumerate_buses().
*/
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = mainboard_init;
dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
diff --git a/src/mainboard/google/link/mainboard.c b/src/mainboard/google/link/mainboard.c
index 24062e9..ce61912 100644
--- a/src/mainboard/google/link/mainboard.c
+++ b/src/mainboard/google/link/mainboard.c
@@ -141,7 +141,7 @@
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
/* Initialize the Embedded Controller */
link_ec_init();
@@ -158,7 +158,7 @@
}
}
-static int link_onboard_smbios_data(device_t dev, int *handle,
+static int link_onboard_smbios_data(struct device *dev, int *handle,
unsigned long *current)
{
int len = 0;
@@ -196,7 +196,7 @@
// mainboard_enable is executed as first thing after
// enumerate_buses().
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = mainboard_init;
dev->ops->get_smbios_data = link_onboard_smbios_data;
diff --git a/src/mainboard/google/nyan/mainboard.c b/src/mainboard/google/nyan/mainboard.c
index 92bb3e3..b447a4a 100644
--- a/src/mainboard/google/nyan/mainboard.c
+++ b/src/mainboard/google/nyan/mainboard.c
@@ -194,7 +194,7 @@
tegra_spi_init(CONFIG_EC_GOOGLE_CHROMEEC_SPI_BUS);
}
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
set_clock_sources();
@@ -244,7 +244,7 @@
setup_ec_spi();
}
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = &mainboard_init;
}
diff --git a/src/mainboard/google/nyan_big/mainboard.c b/src/mainboard/google/nyan_big/mainboard.c
index 0c0fe5e..5457be6 100644
--- a/src/mainboard/google/nyan_big/mainboard.c
+++ b/src/mainboard/google/nyan_big/mainboard.c
@@ -194,7 +194,7 @@
tegra_spi_init(CONFIG_EC_GOOGLE_CHROMEEC_SPI_BUS);
}
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
set_clock_sources();
@@ -242,7 +242,7 @@
setup_ec_spi();
}
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = &mainboard_init;
}
diff --git a/src/mainboard/google/nyan_blaze/mainboard.c b/src/mainboard/google/nyan_blaze/mainboard.c
index c3b936c..6b448cb 100644
--- a/src/mainboard/google/nyan_blaze/mainboard.c
+++ b/src/mainboard/google/nyan_blaze/mainboard.c
@@ -194,7 +194,7 @@
tegra_spi_init(CONFIG_EC_GOOGLE_CHROMEEC_SPI_BUS);
}
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
set_clock_sources();
@@ -242,7 +242,7 @@
setup_ec_spi();
}
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = &mainboard_init;
}
diff --git a/src/mainboard/google/oak/mainboard.c b/src/mainboard/google/oak/mainboard.c
index 327e799..82e6fc0 100644
--- a/src/mainboard/google/oak/mainboard.c
+++ b/src/mainboard/google/oak/mainboard.c
@@ -311,7 +311,7 @@
set_vbe_mode_info_valid(&edid, (uintptr_t)0);
}
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
/* TP_SHIFT_EN: Enables the level shifter for I2C bus 4 (TPAD), which
* also contains the PS8640 eDP brige and the USB hub.
@@ -346,7 +346,7 @@
configure_touchscreen();
}
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = &mainboard_init;
}
diff --git a/src/mainboard/google/octopus/mainboard.c b/src/mainboard/google/octopus/mainboard.c
index 3709823..fc533af 100644
--- a/src/mainboard/google/octopus/mainboard.c
+++ b/src/mainboard/google/octopus/mainboard.c
@@ -42,7 +42,7 @@
}
static unsigned long mainboard_write_acpi_tables(
- device_t device, unsigned long current, acpi_rsdp_t *rsdp)
+ struct device *device, unsigned long current, acpi_rsdp_t *rsdp)
{
uintptr_t start_addr;
uintptr_t end_addr;
@@ -65,7 +65,7 @@
return end_addr;
}
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
diff --git a/src/mainboard/google/parrot/chromeos.c b/src/mainboard/google/parrot/chromeos.c
index d2448eb..3bf1e0b 100644
--- a/src/mainboard/google/parrot/chromeos.c
+++ b/src/mainboard/google/parrot/chromeos.c
@@ -34,7 +34,7 @@
void fill_lb_gpios(struct lb_gpios *gpios)
{
- device_t dev = dev_find_slot(0, PCI_DEVFN(0x1f,0));
+ struct device *dev = dev_find_slot(0, PCI_DEVFN(0x1f,0));
u16 gpio_base = pci_read_config32(dev, GPIOBASE) & 0xfffe;
u16 gen_pmcon_1 = pci_read_config32(dev, GEN_PMCON_1);
diff --git a/src/mainboard/google/parrot/mainboard.c b/src/mainboard/google/parrot/mainboard.c
index 4d357f8..9940c14 100644
--- a/src/mainboard/google/parrot/mainboard.c
+++ b/src/mainboard/google/parrot/mainboard.c
@@ -41,13 +41,13 @@
}
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
/* Initialize the Embedded Controller */
parrot_ec_init();
}
-static int parrot_onboard_smbios_data(device_t dev, int *handle,
+static int parrot_onboard_smbios_data(struct device *dev, int *handle,
unsigned long *current)
{
int len = 0;
@@ -78,7 +78,7 @@
// mainboard_enable is executed as first thing after
// enumerate_buses().
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = mainboard_init;
dev->ops->get_smbios_data = parrot_onboard_smbios_data;
diff --git a/src/mainboard/google/peach_pit/mainboard.c b/src/mainboard/google/peach_pit/mainboard.c
index 14d3e2f..d94b8c6 100644
--- a/src/mainboard/google/peach_pit/mainboard.c
+++ b/src/mainboard/google/peach_pit/mainboard.c
@@ -399,7 +399,7 @@
}
/* this happens after cpu_init where exynos resources are set */
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
/* we'll stick with the crummy u-boot struct for now.*/
/* doing this as an auto since the struct has to be writeable */
@@ -456,7 +456,7 @@
setup_usb();
}
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = &mainboard_init;
diff --git a/src/mainboard/google/poppy/mainboard.c b/src/mainboard/google/poppy/mainboard.c
index 743a920..b3e91e8 100644
--- a/src/mainboard/google/poppy/mainboard.c
+++ b/src/mainboard/google/poppy/mainboard.c
@@ -21,12 +21,12 @@
#include <soc/nhlt.h>
#include <vendorcode/google/chromeos/chromeos.h>
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
mainboard_ec_init();
}
-static unsigned long mainboard_write_acpi_tables(device_t device,
+static unsigned long mainboard_write_acpi_tables(struct device *device,
unsigned long current, acpi_rsdp_t *rsdp)
{
uintptr_t start_addr;
@@ -55,7 +55,7 @@
return end_addr;
}
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = mainboard_init;
dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
diff --git a/src/mainboard/google/poppy/variants/nami/mainboard.c b/src/mainboard/google/poppy/variants/nami/mainboard.c
index 11d4060..544cdd5 100644
--- a/src/mainboard/google/poppy/variants/nami/mainboard.c
+++ b/src/mainboard/google/poppy/variants/nami/mainboard.c
@@ -42,7 +42,7 @@
{
/* Override dev tree settings per board */
uint32_t sku_id = variant_board_sku();
- device_t root = SA_DEV_ROOT;
+ struct device *root = SA_DEV_ROOT;
config_t *cfg = root->chip_info;
switch (sku_id) {
case SKU_1_VAYNE:
diff --git a/src/mainboard/google/poppy/variants/nami/pl2.c b/src/mainboard/google/poppy/variants/nami/pl2.c
index 6744f2c..9746d74 100644
--- a/src/mainboard/google/poppy/variants/nami/pl2.c
+++ b/src/mainboard/google/poppy/variants/nami/pl2.c
@@ -32,7 +32,7 @@
return PL2_DEFAULT;
}
-static void nami_enable(device_t dev)
+static void nami_enable(struct device *dev)
{
struct device *root = SA_DEV_ROOT;
config_t *conf = root->chip_info;
diff --git a/src/mainboard/google/purin/mainboard.c b/src/mainboard/google/purin/mainboard.c
index c238442..bc7b545 100644
--- a/src/mainboard/google/purin/mainboard.c
+++ b/src/mainboard/google/purin/mainboard.c
@@ -17,11 +17,11 @@
#include <boot/coreboot_tables.h>
#include <symbols.h>
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
}
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = &mainboard_init;
}
diff --git a/src/mainboard/google/rambi/mainboard.c b/src/mainboard/google/rambi/mainboard.c
index b8dd805..32ef960 100644
--- a/src/mainboard/google/rambi/mainboard.c
+++ b/src/mainboard/google/rambi/mainboard.c
@@ -126,7 +126,7 @@
}
#endif
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
mainboard_ec_init();
#if IS_ENABLED(CONFIG_BOARD_GOOGLE_NINJA) || IS_ENABLED(CONFIG_BOARD_GOOGLE_SUMO)
@@ -134,7 +134,7 @@
#endif
}
-static int mainboard_smbios_data(device_t dev, int *handle,
+static int mainboard_smbios_data(struct device *dev, int *handle,
unsigned long *current)
{
int len = 0;
@@ -164,7 +164,7 @@
// mainboard_enable is executed as first thing after
// enumerate_buses().
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = mainboard_init;
dev->ops->get_smbios_data = mainboard_smbios_data;
diff --git a/src/mainboard/google/reef/mainboard.c b/src/mainboard/google/reef/mainboard.c
index 6831d57..6db9ac6 100644
--- a/src/mainboard/google/reef/mainboard.c
+++ b/src/mainboard/google/reef/mainboard.c
@@ -108,7 +108,7 @@
}
static unsigned long mainboard_write_acpi_tables(
- device_t device, unsigned long current, acpi_rsdp_t *rsdp)
+ struct device *device, unsigned long current, acpi_rsdp_t *rsdp)
{
uintptr_t start_addr;
uintptr_t end_addr;
@@ -136,7 +136,7 @@
return end_addr;
}
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
diff --git a/src/mainboard/google/rotor/mainboard.c b/src/mainboard/google/rotor/mainboard.c
index 92d29e8..63867bb 100644
--- a/src/mainboard/google/rotor/mainboard.c
+++ b/src/mainboard/google/rotor/mainboard.c
@@ -15,12 +15,12 @@
#include <device/device.h>
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
/* TODO: implement mainboard_init */
}
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = &mainboard_init;
}
diff --git a/src/mainboard/google/slippy/mainboard.c b/src/mainboard/google/slippy/mainboard.c
index 10252d8..cfe0917 100644
--- a/src/mainboard/google/slippy/mainboard.c
+++ b/src/mainboard/google/slippy/mainboard.c
@@ -41,12 +41,12 @@
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
mainboard_ec_init();
}
-static int mainboard_smbios_data(device_t dev, int *handle,
+static int mainboard_smbios_data(struct device *dev, int *handle,
unsigned long *current)
{
int len = 0;
@@ -84,7 +84,7 @@
// mainboard_enable is executed as first thing after
// enumerate_buses().
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = mainboard_init;
dev->ops->get_smbios_data = mainboard_smbios_data;
diff --git a/src/mainboard/google/smaug/mainboard.c b/src/mainboard/google/smaug/mainboard.c
index c783ca4..8628426 100644
--- a/src/mainboard/google/smaug/mainboard.c
+++ b/src/mainboard/google/smaug/mainboard.c
@@ -183,7 +183,7 @@
power_gate_partition(partitions[i]);
}
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
soc_configure_pads(padcfgs, ARRAY_SIZE(padcfgs));
soc_configure_funits(funits, ARRAY_SIZE(funits));
@@ -200,12 +200,12 @@
powergate_unused_partitions();
}
-void display_startup(device_t dev)
+void display_startup(struct device *dev)
{
dsi_display_startup(dev);
}
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = &mainboard_init;
}
diff --git a/src/mainboard/google/storm/mainboard.c b/src/mainboard/google/storm/mainboard.c
index df01c4f..05f9821 100644
--- a/src/mainboard/google/storm/mainboard.c
+++ b/src/mainboard/google/storm/mainboard.c
@@ -76,7 +76,7 @@
gpio_set(SW_RESET_GPIO, 1);
}
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
/* disable mmu and d-cache before setting up secure world.*/
dcache_mmu_disable();
@@ -104,7 +104,7 @@
audio_clock_config(6144000);
}
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = &mainboard_init;
}
diff --git a/src/mainboard/google/stout/chromeos.c b/src/mainboard/google/stout/chromeos.c
index 047e6a1..d2c0827 100644
--- a/src/mainboard/google/stout/chromeos.c
+++ b/src/mainboard/google/stout/chromeos.c
@@ -97,11 +97,11 @@
int get_recovery_mode_switch(void)
{
#ifdef __PRE_RAM__
- device_t dev = PCI_DEV(0, 0x1f, 0);
+ struct device *dev = PCI_DEV(0, 0x1f, 0);
#else
static int ec_in_rec_mode = 0;
static int ec_rec_flag_good = 0;
- device_t dev = dev_find_slot(0, PCI_DEVFN(0x1f,0));
+ struct device *dev = dev_find_slot(0, PCI_DEVFN(0x1f,0));
#endif
u8 ec_status = ec_read(EC_STATUS_REG);
diff --git a/src/mainboard/google/stout/mainboard.c b/src/mainboard/google/stout/mainboard.c
index 4e3839f..399e2b4 100644
--- a/src/mainboard/google/stout/mainboard.c
+++ b/src/mainboard/google/stout/mainboard.c
@@ -42,7 +42,7 @@
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
struct device *ethernet_dev = NULL;
@@ -64,7 +64,7 @@
// mainboard_enable is executed as first thing after
// enumerate_buses().
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = mainboard_init;
dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
diff --git a/src/mainboard/google/urara/mainboard.c b/src/mainboard/google/urara/mainboard.c
index 27fdd90..b5c1b7d 100644
--- a/src/mainboard/google/urara/mainboard.c
+++ b/src/mainboard/google/urara/mainboard.c
@@ -21,7 +21,7 @@
#include <vendorcode/google/chromeos/chromeos.h>
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
#if IS_ENABLED(CONFIG_CHROMEOS)
/* Copy WIFI calibration data into CBMEM. */
@@ -29,7 +29,7 @@
#endif
}
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
printk(BIOS_INFO, "Enable Pistachio device...\n");
dev->ops->init = &mainboard_init;
diff --git a/src/mainboard/google/veyron/mainboard.c b/src/mainboard/google/veyron/mainboard.c
index 15e2a57..93f14c2 100644
--- a/src/mainboard/google/veyron/mainboard.c
+++ b/src/mainboard/google/veyron/mainboard.c
@@ -99,7 +99,7 @@
write32(&rk3288_grf->iomux_edp_hotplug, IOMUX_EDP_HOTPLUG);
}
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
gpio_output(GPIO_RESET, 0);
@@ -110,7 +110,7 @@
configure_vop();
}
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = &mainboard_init;
}
diff --git a/src/mainboard/google/veyron_mickey/mainboard.c b/src/mainboard/google/veyron_mickey/mainboard.c
index 26fcbb9..cf78275 100644
--- a/src/mainboard/google/veyron_mickey/mainboard.c
+++ b/src/mainboard/google/veyron_mickey/mainboard.c
@@ -78,7 +78,7 @@
gpio_output(GPIO(7, B, 3), 1); /* POWER_HDMI_ON */
}
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
gpio_output(GPIO_RESET, 0);
@@ -89,7 +89,7 @@
configure_hdmi();
}
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = &mainboard_init;
}
diff --git a/src/mainboard/google/veyron_rialto/mainboard.c b/src/mainboard/google/veyron_rialto/mainboard.c
index b6b25be..40914ef 100644
--- a/src/mainboard/google/veyron_rialto/mainboard.c
+++ b/src/mainboard/google/veyron_rialto/mainboard.c
@@ -75,7 +75,7 @@
gpio_output(GPIO(4, D, 2), 0); /* 3G_ON_OFF */
}
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
gpio_output(GPIO_RESET, 0);
@@ -94,7 +94,7 @@
}
}
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = &mainboard_init;
}
diff --git a/src/mainboard/google/zoombini/mainboard.c b/src/mainboard/google/zoombini/mainboard.c
index eee2d74..96e1ac0 100644
--- a/src/mainboard/google/zoombini/mainboard.c
+++ b/src/mainboard/google/zoombini/mainboard.c
@@ -20,12 +20,12 @@
#include <arch/acpi.h>
#include <baseboard/variants.h>
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
{
mainboard_ec_init();
}
-static unsigned long mainboard_write_acpi_tables(device_t device,
+static unsigned long mainboard_write_acpi_tables(struct device *device,
unsigned long current, acpi_rsdp_t *rsdp)
{
uintptr_t start_addr;
@@ -49,7 +49,7 @@
return end_addr;
}
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
{
dev->ops->init = mainboard_init;
dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
--
To view, visit https://review.coreboot.org/26086
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e549e4222ae2ed6b9c46f81c5b5253e8b227ee8
Gerrit-Change-Number: 26086
Gerrit-PatchSet: 1
Gerrit-Owner: Elyes HAOUAS <ehaouas at noos.fr>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180504/4a84c3c0/attachment-0001.html>
More information about the coreboot-gerrit
mailing list