From f3ca88b7ed9e3f60733cbbe9420928e088be2c28 Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Fri, 25 May 2018 09:52:45 +0200 Subject: soc/rockchip: Get rid of device_t Use of device_t has been abandoned in ramstage. Change-Id: Idf47ea3b29c3fab7256d7a6722c7978594001d8d Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/26535 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/soc/rockchip/rk3288/display.c | 3 +-- src/soc/rockchip/rk3288/include/soc/display.h | 3 +-- src/soc/rockchip/rk3288/soc.c | 4 ++-- src/soc/rockchip/rk3399/display.c | 2 +- src/soc/rockchip/rk3399/include/soc/display.h | 2 +- src/soc/rockchip/rk3399/soc.c | 6 +++--- 6 files changed, 9 insertions(+), 11 deletions(-) (limited to 'src/soc/rockchip') diff --git a/src/soc/rockchip/rk3288/display.c b/src/soc/rockchip/rk3288/display.c index 2298d8b6e3..5d3e3336c6 100644 --- a/src/soc/rockchip/rk3288/display.c +++ b/src/soc/rockchip/rk3288/display.c @@ -35,8 +35,7 @@ #include "chip.h" -void rk_display_init(device_t dev, u32 lcdbase, - unsigned long fb_size) +void rk_display_init(struct device *dev, u32 lcdbase, unsigned long fb_size) { struct edid edid; uint32_t val; diff --git a/src/soc/rockchip/rk3288/include/soc/display.h b/src/soc/rockchip/rk3288/include/soc/display.h index 8ed2ac9129..8ffa9222cf 100644 --- a/src/soc/rockchip/rk3288/include/soc/display.h +++ b/src/soc/rockchip/rk3288/include/soc/display.h @@ -23,8 +23,7 @@ #define REF_CLK_24M (0x0 << 0) #define REF_CLK_27M (0x1 << 0) -void rk_display_init(device_t dev, u32 lcdbase, - unsigned long fb_size); +void rk_display_init(struct device *dev, u32 lcdbase, unsigned long fb_size); void mainboard_power_on_backlight(void); diff --git a/src/soc/rockchip/rk3288/soc.c b/src/soc/rockchip/rk3288/soc.c index c16beb8310..eadbfc8ee2 100644 --- a/src/soc/rockchip/rk3288/soc.c +++ b/src/soc/rockchip/rk3288/soc.c @@ -30,7 +30,7 @@ #include "chip.h" -static void soc_init(device_t dev) +static void soc_init(struct device *dev) { ram_resource(dev, 0, (uintptr_t)_dram/KiB, sdram_size_mb()*(MiB/KiB)); if (display_init_required()) @@ -47,7 +47,7 @@ static struct device_operations soc_ops = { .scan_bus = 0, }; -static void enable_rk3288_dev(device_t dev) +static void enable_rk3288_dev(struct device *dev) { dev->ops = &soc_ops; } diff --git a/src/soc/rockchip/rk3399/display.c b/src/soc/rockchip/rk3399/display.c index f27d78ed86..43b9daba18 100644 --- a/src/soc/rockchip/rk3399/display.c +++ b/src/soc/rockchip/rk3399/display.c @@ -48,7 +48,7 @@ static void reset_edp(void) printk(BIOS_WARNING, "Retrying EDP initialization.\n"); } -void rk_display_init(device_t dev) +void rk_display_init(struct device *dev) { struct edid edid; struct soc_rockchip_rk3399_config *conf = dev->chip_info; diff --git a/src/soc/rockchip/rk3399/include/soc/display.h b/src/soc/rockchip/rk3399/include/soc/display.h index 494def61d8..880ac8ab4f 100644 --- a/src/soc/rockchip/rk3399/include/soc/display.h +++ b/src/soc/rockchip/rk3399/include/soc/display.h @@ -21,7 +21,7 @@ #define REF_CLK_24M (0x1 << 0) -void rk_display_init(device_t dev); +void rk_display_init(struct device *dev); void mainboard_power_on_backlight(void); const struct mipi_panel_data *mainboard_get_mipi_mode (struct edid_mode *edid_mode); diff --git a/src/soc/rockchip/rk3399/soc.c b/src/soc/rockchip/rk3399/soc.c index 37de652983..30f51d0ef5 100644 --- a/src/soc/rockchip/rk3399/soc.c +++ b/src/soc/rockchip/rk3399/soc.c @@ -27,12 +27,12 @@ #include #include -static void soc_read_resources(device_t dev) +static void soc_read_resources(struct device *dev) { ram_resource(dev, 0, (uintptr_t)_dram / KiB, sdram_size_mb() * KiB); } -static void soc_init(device_t dev) +static void soc_init(struct device *dev) { /* * Reserve the whole TZRAM area because it will be marked as secure-only @@ -54,7 +54,7 @@ static struct device_operations soc_ops = { .init = soc_init, }; -static void enable_soc_dev(device_t dev) +static void enable_soc_dev(struct device *dev) { dev->ops = &soc_ops; } -- cgit v1.2.3