<p>Subrata Banik has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22392">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/intel/{cannonlake,skylake}: Add _soc_ prefix in spi soc routine<br><br>This ensures that function callback into the SoC code.<br><br>Change-Id: Idc16d315ba25d17a2ab537fcdf0c2b51c8802a67<br>Signed-off-by: Subrata Banik <subrata.banik@intel.com><br>---<br>M src/soc/intel/cannonlake/include/soc/pci_devs.h<br>M src/soc/intel/cannonlake/spi.c<br>M src/soc/intel/skylake/include/soc/pci_devs.h<br>M src/soc/intel/skylake/spi.c<br>4 files changed, 5 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/92/22392/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/soc/intel/cannonlake/include/soc/pci_devs.h b/src/soc/intel/cannonlake/include/soc/pci_devs.h<br>index 285fbd6..52245df 100644<br>--- a/src/soc/intel/cannonlake/include/soc/pci_devs.h<br>+++ b/src/soc/intel/cannonlake/include/soc/pci_devs.h<br>@@ -175,7 +175,7 @@<br> #define  PCH_DEV_GBE              _PCH_DEV(LPC, 6)<br> #define  PCH_DEV_TRACEHUB    _PCH_DEV(LPC, 7)<br> <br>-static inline int spi_devfn_to_bus(unsigned int devfn)<br>+static inline int spi_soc_devfn_to_bus(unsigned int devfn)<br> {<br>         switch (devfn) {<br>      case PCH_DEVFN_SPI: return 0;<br>diff --git a/src/soc/intel/cannonlake/spi.c b/src/soc/intel/cannonlake/spi.c<br>index 1d65dee..7b702ad 100644<br>--- a/src/soc/intel/cannonlake/spi.c<br>+++ b/src/soc/intel/cannonlake/spi.c<br>@@ -40,7 +40,7 @@<br> <br> static int spi_dev_to_bus(struct device *dev)<br> {<br>-     return spi_devfn_to_bus(dev->path.pci.devfn);<br>+     return spi_soc_devfn_to_bus(dev->path.pci.devfn);<br> }<br> <br> static struct spi_bus_operations spi_bus_ops = {<br>diff --git a/src/soc/intel/skylake/include/soc/pci_devs.h b/src/soc/intel/skylake/include/soc/pci_devs.h<br>index c8a5e47..081a04b 100644<br>--- a/src/soc/intel/skylake/include/soc/pci_devs.h<br>+++ b/src/soc/intel/skylake/include/soc/pci_devs.h<br>@@ -160,7 +160,7 @@<br> #define  PCH_DEV_GBE             _PCH_DEV(LPC, 6)<br> #define  PCH_DEV_TRACEHUB    _PCH_DEV(LPC, 7)<br> <br>-static inline int spi_devfn_to_bus(unsigned int devfn)<br>+static inline int spi_soc_devfn_to_bus(unsigned int devfn)<br> {<br>         switch (devfn) {<br>      case PCH_DEVFN_SPI: return 0;<br>@@ -170,7 +170,7 @@<br>    return -1;<br> }<br> <br>-static inline int spi_bus_to_devfn(unsigned int bus)<br>+static inline int spi_soc_bus_to_devfn(unsigned int bus)<br> {<br>       switch (bus) {<br>        case 0: return PCH_DEVFN_SPI;<br>diff --git a/src/soc/intel/skylake/spi.c b/src/soc/intel/skylake/spi.c<br>index e575e6e..7266edd 100644<br>--- a/src/soc/intel/skylake/spi.c<br>+++ b/src/soc/intel/skylake/spi.c<br>@@ -39,7 +39,7 @@<br> <br> static int spi_dev_to_bus(struct device *dev)<br> {<br>- return spi_devfn_to_bus(dev->path.pci.devfn);<br>+     return spi_soc_devfn_to_bus(dev->path.pci.devfn);<br> }<br> <br> static struct spi_bus_operations spi_bus_ops = {<br></pre><p>To view, visit <a href="https://review.coreboot.org/22392">change 22392</a>. To unsubscribe, 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/22392"/><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: Idc16d315ba25d17a2ab537fcdf0c2b51c8802a67 </div>
<div style="display:none"> Gerrit-Change-Number: 22392 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Subrata Banik <subrata.banik@intel.com> </div>