diff options
Diffstat (limited to 'src/soc')
| -rw-r--r-- | src/soc/intel/apollolake/chip.c | 8 | ||||
| -rw-r--r-- | src/soc/intel/apollolake/chip.h | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c index 53ffdb9f84..60067735ce 100644 --- a/src/soc/intel/apollolake/chip.c +++ b/src/soc/intel/apollolake/chip.c @@ -531,12 +531,8 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *silupd) /* Parse device tree and disable unused device*/ parse_devicetree(silconfig); - silconfig->PcieRpClkReqNumber[0] = cfg->pcie_rp0_clkreq_pin; - silconfig->PcieRpClkReqNumber[1] = cfg->pcie_rp1_clkreq_pin; - silconfig->PcieRpClkReqNumber[2] = cfg->pcie_rp2_clkreq_pin; - silconfig->PcieRpClkReqNumber[3] = cfg->pcie_rp3_clkreq_pin; - silconfig->PcieRpClkReqNumber[4] = cfg->pcie_rp4_clkreq_pin; - silconfig->PcieRpClkReqNumber[5] = cfg->pcie_rp5_clkreq_pin; + memcpy(silconfig->PcieRpClkReqNumber, cfg->pcie_rp_clkreq_pin, + sizeof(silconfig->PcieRpClkReqNumber)); if (cfg->emmc_tx_cmd_cntl != 0) silconfig->EmmcTxCmdCntl = cfg->emmc_tx_cmd_cntl; diff --git a/src/soc/intel/apollolake/chip.h b/src/soc/intel/apollolake/chip.h index 8573cf44b5..7a1d16a1ad 100644 --- a/src/soc/intel/apollolake/chip.h +++ b/src/soc/intel/apollolake/chip.h @@ -28,6 +28,7 @@ #include <soc/pm.h> #include <soc/usb.h> +#define MAX_PCIE_PORTS 6 #define CLKREQ_DISABLED 0xf #define APOLLOLAKE_I2C_DEV_MAX 8 @@ -43,12 +44,7 @@ struct soc_intel_apollolake_config { * four CLKREQ inputs, but six root ports. Root ports without an * associated CLKREQ signal must be marked with "CLKREQ_DISABLED" */ - uint8_t pcie_rp0_clkreq_pin; - uint8_t pcie_rp1_clkreq_pin; - uint8_t pcie_rp2_clkreq_pin; - uint8_t pcie_rp3_clkreq_pin; - uint8_t pcie_rp4_clkreq_pin; - uint8_t pcie_rp5_clkreq_pin; + uint8_t pcie_rp_clkreq_pin[MAX_PCIE_PORTS]; /* [14:8] DDR mode Number of dealy elements.Each = 125pSec. * [6:0] SDR mode Number of dealy elements.Each = 125pSec. |