<p>Elyes HAOUAS has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26535">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/rockchip: Get rid of device_t<br><br>Use of device_t has been abandoned in ramstage.<br><br>Change-Id: Idf47ea3b29c3fab7256d7a6722c7978594001d8d<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M src/soc/rockchip/rk3288/display.c<br>M src/soc/rockchip/rk3288/include/soc/display.h<br>M src/soc/rockchip/rk3288/soc.c<br>M src/soc/rockchip/rk3399/display.c<br>M src/soc/rockchip/rk3399/include/soc/display.h<br>M src/soc/rockchip/rk3399/soc.c<br>6 files changed, 9 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/26535/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/rockchip/rk3288/display.c b/src/soc/rockchip/rk3288/display.c</span><br><span>index 2298d8b..0c00b75 100644</span><br><span>--- a/src/soc/rockchip/rk3288/display.c</span><br><span>+++ b/src/soc/rockchip/rk3288/display.c</span><br><span>@@ -35,7 +35,7 @@</span><br><span> </span><br><span> #include "chip.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void rk_display_init(device_t dev, u32 lcdbase,</span><br><span style="color: hsl(120, 100%, 40%);">+void rk_display_init(struct device *dev, u32 lcdbase,</span><br><span> unsigned long fb_size)</span><br><span> {</span><br><span> struct edid edid;</span><br><span>diff --git a/src/soc/rockchip/rk3288/include/soc/display.h b/src/soc/rockchip/rk3288/include/soc/display.h</span><br><span>index 8ed2ac9..d4ee137 100644</span><br><span>--- a/src/soc/rockchip/rk3288/include/soc/display.h</span><br><span>+++ b/src/soc/rockchip/rk3288/include/soc/display.h</span><br><span>@@ -23,7 +23,7 @@</span><br><span> #define REF_CLK_24M (0x0 << 0)</span><br><span> #define REF_CLK_27M (0x1 << 0)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void rk_display_init(device_t dev, u32 lcdbase,</span><br><span style="color: hsl(120, 100%, 40%);">+void rk_display_init(struct device *dev, u32 lcdbase,</span><br><span> unsigned long fb_size);</span><br><span> </span><br><span> void mainboard_power_on_backlight(void);</span><br><span>diff --git a/src/soc/rockchip/rk3288/soc.c b/src/soc/rockchip/rk3288/soc.c</span><br><span>index c16beb8..eadbfc8 100644</span><br><span>--- a/src/soc/rockchip/rk3288/soc.c</span><br><span>+++ b/src/soc/rockchip/rk3288/soc.c</span><br><span>@@ -30,7 +30,7 @@</span><br><span> </span><br><span> #include "chip.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void soc_init(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void soc_init(struct device *dev)</span><br><span> {</span><br><span> ram_resource(dev, 0, (uintptr_t)_dram/KiB, sdram_size_mb()*(MiB/KiB));</span><br><span> if (display_init_required())</span><br><span>@@ -47,7 +47,7 @@</span><br><span> .scan_bus = 0,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void enable_rk3288_dev(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void enable_rk3288_dev(struct device *dev)</span><br><span> {</span><br><span> dev->ops = &soc_ops;</span><br><span> }</span><br><span>diff --git a/src/soc/rockchip/rk3399/display.c b/src/soc/rockchip/rk3399/display.c</span><br><span>index f27d78e..43b9dab 100644</span><br><span>--- a/src/soc/rockchip/rk3399/display.c</span><br><span>+++ b/src/soc/rockchip/rk3399/display.c</span><br><span>@@ -48,7 +48,7 @@</span><br><span> printk(BIOS_WARNING, "Retrying EDP initialization.\n");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void rk_display_init(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+void rk_display_init(struct device *dev)</span><br><span> {</span><br><span> struct edid edid;</span><br><span> struct soc_rockchip_rk3399_config *conf = dev->chip_info;</span><br><span>diff --git a/src/soc/rockchip/rk3399/include/soc/display.h b/src/soc/rockchip/rk3399/include/soc/display.h</span><br><span>index 494def6..880ac8a 100644</span><br><span>--- a/src/soc/rockchip/rk3399/include/soc/display.h</span><br><span>+++ b/src/soc/rockchip/rk3399/include/soc/display.h</span><br><span>@@ -21,7 +21,7 @@</span><br><span> </span><br><span> #define REF_CLK_24M (0x1 << 0)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void rk_display_init(device_t dev);</span><br><span style="color: hsl(120, 100%, 40%);">+void rk_display_init(struct device *dev);</span><br><span> void mainboard_power_on_backlight(void);</span><br><span> const struct mipi_panel_data *mainboard_get_mipi_mode</span><br><span> (struct edid_mode *edid_mode);</span><br><span>diff --git a/src/soc/rockchip/rk3399/soc.c b/src/soc/rockchip/rk3399/soc.c</span><br><span>index 37de652..30f51d0 100644</span><br><span>--- a/src/soc/rockchip/rk3399/soc.c</span><br><span>+++ b/src/soc/rockchip/rk3399/soc.c</span><br><span>@@ -27,12 +27,12 @@</span><br><span> #include <symbols.h></span><br><span> #include <arm-trusted-firmware/plat/rockchip/rk3399/include/shared/bl31_param.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void soc_read_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void soc_read_resources(struct device *dev)</span><br><span> {</span><br><span> ram_resource(dev, 0, (uintptr_t)_dram / KiB, sdram_size_mb() * KiB);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void soc_init(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void soc_init(struct device *dev)</span><br><span> {</span><br><span> /*</span><br><span> * Reserve the whole TZRAM area because it will be marked as secure-only</span><br><span>@@ -54,7 +54,7 @@</span><br><span> .init = soc_init,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void enable_soc_dev(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void enable_soc_dev(struct device *dev)</span><br><span> {</span><br><span> dev->ops = &soc_ops;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26535">change 26535</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/26535"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Idf47ea3b29c3fab7256d7a6722c7978594001d8d </div>
<div style="display:none"> Gerrit-Change-Number: 26535 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>