<p>Maulik V Vaghela has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/25864">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">src/drivers/i2c: Change soc function name to maintain uniformity<br><br>I2C driver calls soc function to get configuration data related to soc.<br>Ideally all soc function names start with convention soc_<>. So changing<br>function name from "dw_i2c_get_soc_cfg" to "soc_get_dw_i2c_cfg" so that<br>function name convention inside soc is maintained.<br><br>Only changing one function name as of now since we plan to move other<br>functions to common block instead of keeping them inside soc folder.<br><br>BUG=none<br>BRANCH=none<br>TEST= Code compiles with different configurations.<br><br>Change-Id: Id7733d8b8d76b86c5cb74339953152d07299d9bb<br>Signed-off-by: Maulik V Vaghela <maulik.v.vaghela@intel.com><br>---<br>M src/drivers/i2c/designware/dw_i2c.c<br>M src/drivers/i2c/designware/dw_i2c.h<br>M src/soc/amd/stoneyridge/i2c.c<br>M src/soc/intel/apollolake/i2c.c<br>M src/soc/intel/cannonlake/i2c.c<br>M src/soc/intel/common/block/i2c/i2c_early.c<br>M src/soc/intel/skylake/i2c.c<br>7 files changed, 8 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/64/25864/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/drivers/i2c/designware/dw_i2c.c b/src/drivers/i2c/designware/dw_i2c.c</span><br><span>index 12284b6..fa99bda 100644</span><br><span>--- a/src/drivers/i2c/designware/dw_i2c.c</span><br><span>+++ b/src/drivers/i2c/designware/dw_i2c.c</span><br><span>@@ -793,7 +793,7 @@</span><br><span> if (bus < 0)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- config = dw_i2c_get_soc_cfg(bus);</span><br><span style="color: hsl(120, 100%, 40%);">+ config = soc_get_dw_i2c_cfg(bus);</span><br><span> </span><br><span> if (!config)</span><br><span> return;</span><br><span>@@ -827,7 +827,7 @@</span><br><span> if (bus < 0)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bcfg = dw_i2c_get_soc_cfg(bus);</span><br><span style="color: hsl(120, 100%, 40%);">+ bcfg = soc_get_dw_i2c_cfg(bus);</span><br><span> </span><br><span> if (!bcfg)</span><br><span> return;</span><br><span>diff --git a/src/drivers/i2c/designware/dw_i2c.h b/src/drivers/i2c/designware/dw_i2c.h</span><br><span>index ccdb3d2..547bb93 100644</span><br><span>--- a/src/drivers/i2c/designware/dw_i2c.h</span><br><span>+++ b/src/drivers/i2c/designware/dw_i2c.h</span><br><span>@@ -102,7 +102,7 @@</span><br><span> *</span><br><span> * Returns NULL if i2c config is not found</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-const struct dw_i2c_bus_config *dw_i2c_get_soc_cfg(unsigned int bus);</span><br><span style="color: hsl(120, 100%, 40%);">+const struct dw_i2c_bus_config *soc_get_dw_i2c_cfg(unsigned int bus);</span><br><span> </span><br><span> /* Get I2C controller base address */</span><br><span> uintptr_t dw_i2c_base_address(unsigned int bus);</span><br><span>diff --git a/src/soc/amd/stoneyridge/i2c.c b/src/soc/amd/stoneyridge/i2c.c</span><br><span>index b90e5d7..a79752b 100644</span><br><span>--- a/src/soc/amd/stoneyridge/i2c.c</span><br><span>+++ b/src/soc/amd/stoneyridge/i2c.c</span><br><span>@@ -56,7 +56,7 @@</span><br><span> return dev->chip_info;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const struct dw_i2c_bus_config *dw_i2c_get_soc_cfg(unsigned int bus)</span><br><span style="color: hsl(120, 100%, 40%);">+const struct dw_i2c_bus_config *soc_get_dw_i2c_cfg(unsigned int bus)</span><br><span> {</span><br><span> const struct soc_amd_stoneyridge_config *config;</span><br><span> </span><br><span>diff --git a/src/soc/intel/apollolake/i2c.c b/src/soc/intel/apollolake/i2c.c</span><br><span>index 3df333c..04a235d 100644</span><br><span>--- a/src/soc/intel/apollolake/i2c.c</span><br><span>+++ b/src/soc/intel/apollolake/i2c.c</span><br><span>@@ -21,7 +21,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 dw_i2c_bus_config *dw_i2c_get_soc_cfg(unsigned int bus)</span><br><span style="color: hsl(120, 100%, 40%);">+const struct dw_i2c_bus_config *soc_get_dw_i2c_cfg(unsigned int bus)</span><br><span> {</span><br><span> const struct soc_intel_apollolake_config *config;</span><br><span> const struct device *dev = dev_find_slot(0, SA_DEVFN_ROOT);</span><br><span>diff --git a/src/soc/intel/cannonlake/i2c.c b/src/soc/intel/cannonlake/i2c.c</span><br><span>index ef30345..07713ae 100644</span><br><span>--- a/src/soc/intel/cannonlake/i2c.c</span><br><span>+++ b/src/soc/intel/cannonlake/i2c.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 dw_i2c_bus_config *dw_i2c_get_soc_cfg(unsigned int bus)</span><br><span style="color: hsl(120, 100%, 40%);">+const struct dw_i2c_bus_config *soc_get_dw_i2c_cfg(unsigned int bus)</span><br><span> {</span><br><span> const struct soc_intel_cannonlake_config *config;</span><br><span> const struct device *dev = dev_find_slot(0, SA_DEVFN_ROOT);</span><br><span>diff --git a/src/soc/intel/common/block/i2c/i2c_early.c b/src/soc/intel/common/block/i2c/i2c_early.c</span><br><span>index c4af559..6e6a753 100644</span><br><span>--- a/src/soc/intel/common/block/i2c/i2c_early.c</span><br><span>+++ b/src/soc/intel/common/block/i2c/i2c_early.c</span><br><span>@@ -47,7 +47,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Skip if not enabled for early init */</span><br><span style="color: hsl(0, 100%, 40%);">- config = dw_i2c_get_soc_cfg(bus);</span><br><span style="color: hsl(120, 100%, 40%);">+ config = soc_get_dw_i2c_cfg(bus);</span><br><span> if (!config || !config->early_init) {</span><br><span> printk(BIOS_DEBUG, "I2C%u not enabled for early init\n", bus);</span><br><span> return -1;</span><br><span>diff --git a/src/soc/intel/skylake/i2c.c b/src/soc/intel/skylake/i2c.c</span><br><span>index baf6335..ed8a774 100644</span><br><span>--- a/src/soc/intel/skylake/i2c.c</span><br><span>+++ b/src/soc/intel/skylake/i2c.c</span><br><span>@@ -20,7 +20,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 dw_i2c_bus_config *dw_i2c_get_soc_cfg(unsigned int bus)</span><br><span style="color: hsl(120, 100%, 40%);">+const struct dw_i2c_bus_config *soc_get_dw_i2c_cfg(unsigned int bus)</span><br><span> {</span><br><span> const struct soc_intel_skylake_config *config;</span><br><span> const struct device *dev = dev_find_slot(0, SA_DEVFN_ROOT);</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/25864">change 25864</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/25864"/><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: Id7733d8b8d76b86c5cb74339953152d07299d9bb </div>
<div style="display:none"> Gerrit-Change-Number: 25864 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Maulik V Vaghela <maulik.v.vaghela@intel.com> </div>