<p>Maulik V Vaghela has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/25865">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/intel/gspi: change SOC function name to maintain uniformity<br><br>GSPI driver calls soc function to get soc specific configurations for<br>GSPI. SOC functions name starts with soc_<> but in this case naming<br>convention was not followed. Thus changing function name from<br>"gspi_get_soc_cfg" to "soc_get_gspi_cfg". This will maintain uniformity<br>inside soc folder.<br><br>Not modifying other functions name inside soc folder since other<br>functions are common across soc and we plan to move it to common block.<br><br>BUG=none<br>BRANCH=none<br>TEST= code compiles with different configurations.<br><br>Change-Id: I7efc706af4701df954d85c3b8aca79556c9786b3<br>Signed-off-by: Maulik V Vaghela <maulik.v.vaghela@intel.com><br>---<br>M src/soc/intel/apollolake/gspi.c<br>M src/soc/intel/cannonlake/gspi.c<br>M src/soc/intel/common/block/gspi/gspi.c<br>M src/soc/intel/common/block/include/intelblocks/gspi.h<br>M src/soc/intel/skylake/gspi.c<br>5 files changed, 6 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/65/25865/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/intel/apollolake/gspi.c b/src/soc/intel/apollolake/gspi.c</span><br><span>index 6d5f8e5..4af7c95 100644</span><br><span>--- a/src/soc/intel/apollolake/gspi.c</span><br><span>+++ b/src/soc/intel/apollolake/gspi.c</span><br><span>@@ -22,7 +22,7 @@</span><br><span> #include <soc/pci_devs.h></span><br><span> #include "chip.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const struct gspi_cfg *gspi_get_soc_cfg(void)</span><br><span style="color: hsl(120, 100%, 40%);">+const struct gspi_cfg *soc_get_gspi_cfg(void)</span><br><span> {</span><br><span> DEVTREE_CONST struct soc_intel_apollolake_config *config;</span><br><span> int devfn = SA_DEVFN_ROOT;</span><br><span>diff --git a/src/soc/intel/cannonlake/gspi.c b/src/soc/intel/cannonlake/gspi.c</span><br><span>index e4f682d..327cbb8 100644</span><br><span>--- a/src/soc/intel/cannonlake/gspi.c</span><br><span>+++ b/src/soc/intel/cannonlake/gspi.c</span><br><span>@@ -22,7 +22,7 @@</span><br><span> #include <soc/pci_devs.h></span><br><span> #include "chip.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const struct gspi_cfg *gspi_get_soc_cfg(void)</span><br><span style="color: hsl(120, 100%, 40%);">+const struct gspi_cfg *soc_get_gspi_cfg(void)</span><br><span> {</span><br><span> DEVTREE_CONST struct soc_intel_cannonlake_config *config;</span><br><span> int devfn = SA_DEVFN_ROOT;</span><br><span>diff --git a/src/soc/intel/common/block/gspi/gspi.c b/src/soc/intel/common/block/gspi/gspi.c</span><br><span>index 175fad8..745c57b 100644</span><br><span>--- a/src/soc/intel/common/block/gspi/gspi.c</span><br><span>+++ b/src/soc/intel/common/block/gspi/gspi.c</span><br><span>@@ -130,7 +130,7 @@</span><br><span> {</span><br><span> unsigned int gspi_bus;</span><br><span> const unsigned int gspi_max = CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_MAX;</span><br><span style="color: hsl(0, 100%, 40%);">- const struct gspi_cfg *cfg = gspi_get_soc_cfg();</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gspi_cfg *cfg = soc_get_gspi_cfg();</span><br><span> int devfn;</span><br><span> uintptr_t gspi_base_addr;</span><br><span> </span><br><span>@@ -202,7 +202,7 @@</span><br><span> </span><br><span> static uint32_t gspi_get_bus_clk_mhz(unsigned int gspi_bus)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- const struct gspi_cfg *cfg = gspi_get_soc_cfg();</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gspi_cfg *cfg = soc_get_gspi_cfg();</span><br><span> if (!cfg)</span><br><span> return 0;</span><br><span> return cfg[gspi_bus].speed_mhz;</span><br><span>diff --git a/src/soc/intel/common/block/include/intelblocks/gspi.h b/src/soc/intel/common/block/include/intelblocks/gspi.h</span><br><span>index 4e10e25..0e1c475 100644</span><br><span>--- a/src/soc/intel/common/block/include/intelblocks/gspi.h</span><br><span>+++ b/src/soc/intel/common/block/include/intelblocks/gspi.h</span><br><span>@@ -34,7 +34,7 @@</span><br><span> </span><br><span> /* SoC-callbacks */</span><br><span> /* Get gspi_config array from SoC. Returns NULL in case of error. */</span><br><span style="color: hsl(0, 100%, 40%);">-const struct gspi_cfg *gspi_get_soc_cfg(void);</span><br><span style="color: hsl(120, 100%, 40%);">+const struct gspi_cfg *soc_get_gspi_cfg(void);</span><br><span> </span><br><span> /* Get base address for early init of GSPI controllers. */</span><br><span> uintptr_t gspi_get_soc_early_base(void);</span><br><span>diff --git a/src/soc/intel/skylake/gspi.c b/src/soc/intel/skylake/gspi.c</span><br><span>index 252be777..46c0e61 100644</span><br><span>--- a/src/soc/intel/skylake/gspi.c</span><br><span>+++ b/src/soc/intel/skylake/gspi.c</span><br><span>@@ -21,7 +21,7 @@</span><br><span> #include <soc/iomap.h></span><br><span> #include "chip.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const struct gspi_cfg *gspi_get_soc_cfg(void)</span><br><span style="color: hsl(120, 100%, 40%);">+const struct gspi_cfg *soc_get_gspi_cfg(void)</span><br><span> {</span><br><span> DEVTREE_CONST struct soc_intel_skylake_config *config;</span><br><span> int devfn = SA_DEVFN_ROOT;</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/25865">change 25865</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/25865"/><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: I7efc706af4701df954d85c3b8aca79556c9786b3 </div>
<div style="display:none"> Gerrit-Change-Number: 25865 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Maulik V Vaghela <maulik.v.vaghela@intel.com> </div>