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