7 files changed, 11 insertions, 11 deletions

diff --git a/src/soc/nvidia/tegra/dc.h b/src/soc/nvidia/tegra/dc.h
index a2687310e7..aed8b99cb3 100644
--- a/src/soc/nvidia/tegra/dc.h
+++ b/src/soc/nvidia/tegra/dc.h
@@ -516,7 +516,7 @@ unsigned long READL(void * p);
 void WRITEL(unsigned long value, void * p);
 
 #ifndef __PRE_RAM__
-void display_startup(device_t dev);
+void display_startup(struct device *dev);
 #endif
 void dp_init(void * _config);
 void dp_enable(void * _dp);
diff --git a/src/soc/nvidia/tegra124/display.c b/src/soc/nvidia/tegra124/display.c
index dce6ad257a..8d5a264ff7 100644
--- a/src/soc/nvidia/tegra124/display.c
+++ b/src/soc/nvidia/tegra124/display.c
@@ -212,7 +212,7 @@ uint32_t fb_base_mb(void)
 /* this is really aimed at the lcd panel. That said, there are two display
  * devices on this part and we may someday want to extend it for other boards.
  */
-void display_startup(device_t dev)
+void display_startup(struct device *dev)
 {
 	struct soc_nvidia_tegra124_config *config = dev->chip_info;
 	struct display_controller *disp_ctrl = (void *)config->display_controller;
diff --git a/src/soc/nvidia/tegra124/soc.c b/src/soc/nvidia/tegra124/soc.c
index faf1ddb414..e44ea8d32a 100644
--- a/src/soc/nvidia/tegra124/soc.c
+++ b/src/soc/nvidia/tegra124/soc.c
@@ -30,7 +30,7 @@
  * Will break if we get 2. Sigh.
  * We assume it's all multiples of MiB for MMUs sake.
  */
-static void soc_enable(device_t dev)
+static void soc_enable(struct device *dev)
 {
 	u32 lcdbase = fb_base_mb();
 	unsigned long fb_size = FB_SIZE_MB;
@@ -47,7 +47,7 @@ static void soc_enable(device_t dev)
 			(sdram_end_mb - sdram_max_addressable_mb())*KiB);
 }
 
-static void soc_init(device_t dev)
+static void soc_init(struct device *dev)
 {
 	if (display_init_required())
 		display_startup(dev);
@@ -64,7 +64,7 @@ static struct device_operations soc_ops = {
 	.scan_bus         = 0,
 };
 
-static void enable_tegra124_dev(device_t dev)
+static void enable_tegra124_dev(struct device *dev)
 {
 	dev->ops = &soc_ops;
 }
diff --git a/src/soc/nvidia/tegra210/dp.c b/src/soc/nvidia/tegra210/dp.c
index 119b4a74c8..848a314296 100644
--- a/src/soc/nvidia/tegra210/dp.c
+++ b/src/soc/nvidia/tegra210/dp.c
@@ -1570,7 +1570,7 @@ error_enable:
 	return;
 }
 
-void dp_display_startup(device_t dev)
+void dp_display_startup(struct device *dev)
 {
 	struct soc_nvidia_tegra210_config *config = dev->chip_info;
 	struct display_controller *disp_ctrl =
diff --git a/src/soc/nvidia/tegra210/dsi.c b/src/soc/nvidia/tegra210/dsi.c
index 5504b4d994..5a9d5a513d 100644
--- a/src/soc/nvidia/tegra210/dsi.c
+++ b/src/soc/nvidia/tegra210/dsi.c
@@ -965,7 +965,7 @@ static int dsi_enable(struct soc_nvidia_tegra210_config *config)
 	return 0;
 }
 
-void dsi_display_startup(device_t dev)
+void dsi_display_startup(struct device *dev)
 {
 	struct soc_nvidia_tegra210_config *config = dev->chip_info;
 	struct display_controller *disp_ctrl =
diff --git a/src/soc/nvidia/tegra210/include/soc/display.h b/src/soc/nvidia/tegra210/include/soc/display.h
index 84ad4dc1ae..dd7c9586bd 100644
--- a/src/soc/nvidia/tegra210/include/soc/display.h
+++ b/src/soc/nvidia/tegra210/include/soc/display.h
@@ -43,8 +43,8 @@ enum {
 struct soc_nvidia_tegra210_config;
 struct display_controller;
 
-void dsi_display_startup(device_t dev);
-void dp_display_startup(device_t dev);
+void dsi_display_startup(struct device *dev);
+void dp_display_startup(struct device *dev);
 
 int tegra_dc_init(struct display_controller *disp_ctrl);
 int update_display_mode(struct display_controller *disp_ctrl,
diff --git a/src/soc/nvidia/tegra210/soc.c b/src/soc/nvidia/tegra210/soc.c
index 1071d68b60..a8f111bdf9 100644
--- a/src/soc/nvidia/tegra210/soc.c
+++ b/src/soc/nvidia/tegra210/soc.c
@@ -35,7 +35,7 @@
 
 #include "chip.h"
 
-static void soc_read_resources(device_t dev)
+static void soc_read_resources(struct device *dev)
 {
 	unsigned long index = 0;
 	int i; uintptr_t begin, end;
@@ -65,7 +65,7 @@ static struct device_operations soc_ops = {
 	.scan_bus         = NULL,
 };
 
-static void enable_tegra210_dev(device_t dev)
+static void enable_tegra210_dev(struct device *dev)
 {
 	if (dev->path.type == DEVICE_PATH_CPU_CLUSTER)
 		dev->ops = &soc_ops;