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@noos.fr>
Reviewed-on: https://review.coreboot.org/26086
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>

40 files changed, 92 insertions, 92 deletions

diff --git a/src/mainboard/google/auron/mainboard.c b/src/mainboard/google/auron/mainboard.c
index ca0c08337a4d..9eece731b0e3 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 @@ static int mainboard_smbios_data(device_t dev, int *handle,
 // 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/beltino/mainboard.c b/src/mainboard/google/beltino/mainboard.c
index 00c1da0a0dc8..eb1d31c65786 100644
--- a/src/mainboard/google/beltino/mainboard.c
+++ b/src/mainboard/google/beltino/mainboard.c
@@ -40,7 +40,7 @@ void mainboard_suspend_resume(void)
 
 
 
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
 {
 	lan_init();
 }
@@ -48,7 +48,7 @@ static void mainboard_init(device_t dev)
 // 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/mainboard.c b/src/mainboard/google/butterfly/mainboard.c
index a100981df59e..e7235ed702e2 100644
--- a/src/mainboard/google/butterfly/mainboard.c
+++ b/src/mainboard/google/butterfly/mainboard.c
@@ -181,7 +181,7 @@ static void program_keyboard_type(u32 search_address, u32 search_length)
 	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 void mainboard_init(device_t dev)
 	}
 }
 
-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 @@ static int butterfly_onboard_smbios_data(device_t dev, int *handle,
 // 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 bfa79b4df68f..e2cf9ad60138 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 @@ static unsigned long mainboard_write_acpi_tables(
  * 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 c249a32456d0..568d4864a5eb 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 e5ad945b90ef..4cce5a51ed91 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 @@ static void mainboard_init(device_t dev)
  * 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 336a9e5f4a35..b6c55181bddc 100644
--- a/src/mainboard/google/daisy/mainboard.c
+++ b/src/mainboard/google/daisy/mainboard.c
@@ -252,7 +252,7 @@ static void gpio_init(void)
 }
 
 /* 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 @@ static void mainboard_init(device_t dev)
 	// 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 d30eff26e63c..b9ad35879122 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 @@ static unsigned long mainboard_write_acpi_tables(
 	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 e6a0296274d3..eb48e40453a2 100644
--- a/src/mainboard/google/fizz/mainboard.c
+++ b/src/mainboard/google/fizz/mainboard.c
@@ -227,13 +227,13 @@ const char *smbios_mainboard_sku(void)
 	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 @@ static void set_bj_adapter_limit(void)
 		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 65e41cc9fdc7..3c2d831bf821 100644
--- a/src/mainboard/google/foster/mainboard.c
+++ b/src/mainboard/google/foster/mainboard.c
@@ -106,7 +106,7 @@ static void setup_audio(void)
 	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 @@ static void mainboard_init(device_t dev)
 	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 de384f9ea8c5..3a69fa2ae710 100644
--- a/src/mainboard/google/gale/mainboard.c
+++ b/src/mainboard/google/gale/mainboard.c
@@ -37,7 +37,7 @@ static void setup_usb(void)
 	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 @@ static void mainboard_init(device_t dev)
 	//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 855d69d6a191..be23f4e23aa7 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 @@ static unsigned long mainboard_write_acpi_tables(
  * 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 c9f3c4891fbb..41307c7111a2 100644
--- a/src/mainboard/google/gru/mainboard.c
+++ b/src/mainboard/google/gru/mainboard.c
@@ -333,7 +333,7 @@ static void setup_usb(int port)
 		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 @@ const struct mipi_panel_data *mainboard_get_mipi_mode
 	}
 }
 
-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/mainboard.c b/src/mainboard/google/jecht/mainboard.c
index 7e575054262a..0a827c606788 100644
--- a/src/mainboard/google/jecht/mainboard.c
+++ b/src/mainboard/google/jecht/mainboard.c
@@ -25,7 +25,7 @@ void mainboard_suspend_resume(void)
 	outb(0xcb, 0xb2);
 }
 
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
 {
 	lan_init();
 }
@@ -33,7 +33,7 @@ static void mainboard_init(device_t dev)
 // 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 f1df8817e77c..a01ae0acf549 100644
--- a/src/mainboard/google/kahlee/mainboard.c
+++ b/src/mainboard/google/kahlee/mainboard.c
@@ -184,7 +184,7 @@ static void mainboard_init(void *chip_info)
 /*************************************************
  * 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 e29b3e3703c4..860bb5aec55d 100644
--- a/src/mainboard/google/kahlee/mptable.c
+++ b/src/mainboard/google/kahlee/mptable.c
@@ -115,7 +115,7 @@ static void *smp_write_config_table(void *v)
 	/* 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 e0444059bf0d..43895fba505d 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 @@ static unsigned long mainboard_write_acpi_tables(
  * 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 24062e9b3709..ce61912ae71a 100644
--- a/src/mainboard/google/link/mainboard.c
+++ b/src/mainboard/google/link/mainboard.c
@@ -141,7 +141,7 @@ static int int15_handler(void)
 
 
 
-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 void mainboard_init(device_t dev)
 	}
 }
 
-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 @@ static int link_onboard_smbios_data(device_t dev, int *handle,
 // 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 92bb3e34098c..b447a4a8975e 100644
--- a/src/mainboard/google/nyan/mainboard.c
+++ b/src/mainboard/google/nyan/mainboard.c
@@ -194,7 +194,7 @@ static void setup_ec_spi(void)
 	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 @@ static void mainboard_init(device_t dev)
 	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 0c0fe5ed55fa..5457be603cde 100644
--- a/src/mainboard/google/nyan_big/mainboard.c
+++ b/src/mainboard/google/nyan_big/mainboard.c
@@ -194,7 +194,7 @@ static void setup_ec_spi(void)
 	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 @@ static void mainboard_init(device_t dev)
 	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 c3b936c1b00b..6b448cba10fe 100644
--- a/src/mainboard/google/nyan_blaze/mainboard.c
+++ b/src/mainboard/google/nyan_blaze/mainboard.c
@@ -194,7 +194,7 @@ static void setup_ec_spi(void)
 	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 @@ static void mainboard_init(device_t dev)
 	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 327e7994992b..82e6fc06f6a3 100644
--- a/src/mainboard/google/oak/mainboard.c
+++ b/src/mainboard/google/oak/mainboard.c
@@ -311,7 +311,7 @@ static void display_startup(void)
 	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 @@ static void mainboard_init(device_t dev)
 	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 37098235929a..fc533af8a9e4 100644
--- a/src/mainboard/google/octopus/mainboard.c
+++ b/src/mainboard/google/octopus/mainboard.c
@@ -42,7 +42,7 @@ static void mainboard_init(void *chip_info)
 }
 
 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 @@ static unsigned long mainboard_write_acpi_tables(
 	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/mainboard.c b/src/mainboard/google/parrot/mainboard.c
index 4d357f898bb8..9940c14f4a4f 100644
--- a/src/mainboard/google/parrot/mainboard.c
+++ b/src/mainboard/google/parrot/mainboard.c
@@ -41,13 +41,13 @@ void mainboard_suspend_resume(void)
 }
 
 
-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 @@ static int parrot_onboard_smbios_data(device_t dev, int *handle,
 // 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 14d3e2f51e43..d94b8c65502d 100644
--- a/src/mainboard/google/peach_pit/mainboard.c
+++ b/src/mainboard/google/peach_pit/mainboard.c
@@ -399,7 +399,7 @@ static void sdmmc_vdd(void)
 }
 
 /* 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 @@ static void mainboard_init(device_t dev)
 	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 743a920a0f5b..b3e91e888e22 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 @@ static unsigned long mainboard_write_acpi_tables(device_t device,
 	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 11d406039f71..544cdd5b24db 100644
--- a/src/mainboard/google/poppy/variants/nami/mainboard.c
+++ b/src/mainboard/google/poppy/variants/nami/mainboard.c
@@ -42,7 +42,7 @@ void variant_devtree_update(void)
 {
 	/* 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/purin/mainboard.c b/src/mainboard/google/purin/mainboard.c
index c2384422111d..bc7b545ca5ce 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 b8dd805eff4e..32ef9605e243 100644
--- a/src/mainboard/google/rambi/mainboard.c
+++ b/src/mainboard/google/rambi/mainboard.c
@@ -126,7 +126,7 @@ static int int15_handler(void)
 }
 #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 @@ static void mainboard_init(device_t dev)
 #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 @@ static int mainboard_smbios_data(device_t dev, int *handle,
 // 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 6831d5779011..6db9ac69ecfa 100644
--- a/src/mainboard/google/reef/mainboard.c
+++ b/src/mainboard/google/reef/mainboard.c
@@ -108,7 +108,7 @@ void __weak variant_nhlt_oem_overrides(const char **oem_id,
 }
 
 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 @@ static unsigned long mainboard_write_acpi_tables(
 	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 92d29e88774a..63867bbd34ac 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 10252d82b182..cfe091751134 100644
--- a/src/mainboard/google/slippy/mainboard.c
+++ b/src/mainboard/google/slippy/mainboard.c
@@ -41,12 +41,12 @@ void mainboard_suspend_resume(void)
 
 
 
-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 @@ static int mainboard_smbios_data(device_t dev, int *handle,
 // 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 c783ca472782..8628426ef17b 100644
--- a/src/mainboard/google/smaug/mainboard.c
+++ b/src/mainboard/google/smaug/mainboard.c
@@ -183,7 +183,7 @@ static void powergate_unused_partitions(void)
 		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 @@ static void mainboard_init(device_t dev)
 	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 df01c4f63cd2..05f982173b0d 100644
--- a/src/mainboard/google/storm/mainboard.c
+++ b/src/mainboard/google/storm/mainboard.c
@@ -76,7 +76,7 @@ static void assert_sw_reset(void)
 	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 @@ static void mainboard_init(device_t dev)
 	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/mainboard.c b/src/mainboard/google/stout/mainboard.c
index 4e3839f02b1e..399e2b4b31b3 100644
--- a/src/mainboard/google/stout/mainboard.c
+++ b/src/mainboard/google/stout/mainboard.c
@@ -42,7 +42,7 @@ void mainboard_suspend_resume(void)
 
 
 
-static void mainboard_init(device_t dev)
+static void mainboard_init(struct device *dev)
 {
 	struct device *ethernet_dev = NULL;
 
@@ -64,7 +64,7 @@ static void mainboard_init(device_t dev)
 // 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 27fdd90af517..b5c1b7dc3166 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 @@ static void mainboard_init(device_t dev)
 #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 15e2a574e899..93f14c2e6f80 100644
--- a/src/mainboard/google/veyron/mainboard.c
+++ b/src/mainboard/google/veyron/mainboard.c
@@ -99,7 +99,7 @@ static void configure_vop(void)
 	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 @@ static void mainboard_init(device_t dev)
 	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 26fcbb946708..cf78275e00df 100644
--- a/src/mainboard/google/veyron_mickey/mainboard.c
+++ b/src/mainboard/google/veyron_mickey/mainboard.c
@@ -78,7 +78,7 @@ static void configure_hdmi(void)
 	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 @@ static void mainboard_init(device_t dev)
 	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 b6b25be732ce..40914ef54011 100644
--- a/src/mainboard/google/veyron_rialto/mainboard.c
+++ b/src/mainboard/google/veyron_rialto/mainboard.c
@@ -75,7 +75,7 @@ static void configure_3g(void)
 	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_init(device_t 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/zoombini/mainboard.c b/src/mainboard/google/zoombini/mainboard.c
index eee2d74d453b..96e1ac019033 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 @@ static unsigned long mainboard_write_acpi_tables(device_t device,
 	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;