<p>Srinidhi N Kaushik has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/23787">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">src/mainboard/intel/glkrvp: Common code for ThunderPeak and JeffersonPeak<br><br>This changeset will include common code for<br>Thunderpeak and Jeffersonpeak based on auto detect.<br><br>Change-Id: I875bb655b6ae87660b87a45fa52caf79f6e0d753<br>Signed-off-by: Srinidhi N Kaushik <srinidhi.n.kaushik@intel.com><br>---<br>M src/mainboard/intel/glkrvp/mainboard.c<br>M src/mainboard/intel/glkrvp/variants/baseboard/devicetree.cb<br>M src/mainboard/intel/glkrvp/variants/baseboard/gpio.c<br>M src/mainboard/intel/glkrvp/variants/baseboard/include/baseboard/variants.h<br>4 files changed, 55 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/87/23787/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/intel/glkrvp/mainboard.c b/src/mainboard/intel/glkrvp/mainboard.c</span><br><span>index ac5e973..ab855e0 100644</span><br><span>--- a/src/mainboard/intel/glkrvp/mainboard.c</span><br><span>+++ b/src/mainboard/intel/glkrvp/mainboard.c</span><br><span>@@ -38,6 +38,12 @@</span><br><span> pads = variant_gpio_table(&num);</span><br><span> gpio_configure_pads(pads, num);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Separate gpio table for cnvi bases wifi</span><br><span style="color: hsl(120, 100%, 40%);">+ * Will be adding one more table for pcie</span><br><span style="color: hsl(120, 100%, 40%);">+ * based wifi */</span><br><span style="color: hsl(120, 100%, 40%);">+ pads = variant_cnvi_wifi_gpio_table(&num);</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_configure_pads(pads, num);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> mainboard_ec_init();</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/mainboard/intel/glkrvp/variants/baseboard/devicetree.cb b/src/mainboard/intel/glkrvp/variants/baseboard/devicetree.cb</span><br><span>index 4b93947..5a83d47 100644</span><br><span>--- a/src/mainboard/intel/glkrvp/variants/baseboard/devicetree.cb</span><br><span>+++ b/src/mainboard/intel/glkrvp/variants/baseboard/devicetree.cb</span><br><span>@@ -9,13 +9,13 @@</span><br><span> register "pcie_rp1_clkreq_pin" = "3" # wifi/bt</span><br><span> register "pcie_rp2_clkreq_pin" = "CLKREQ_DISABLED"</span><br><span> register "pcie_rp3_clkreq_pin" = "CLKREQ_DISABLED"</span><br><span style="color: hsl(0, 100%, 40%);">- register "pcie_rp4_clkreq_pin" = "1"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "pcie_rp4_clkreq_pin" = "CLKREQ_DISABLED"</span><br><span> register "pcie_rp5_clkreq_pin" = "CLKREQ_DISABLED"</span><br><span> </span><br><span> # GPIO for PERST_0</span><br><span> # If the Board has PERST_0 signal, assign the GPIO</span><br><span> # If the Board does not have PERST_0, assign GPIO_PRT0_UDEF</span><br><span style="color: hsl(0, 100%, 40%);">- register "prt0_gpio" = "GPIO_PRT0_UDEF"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "prt0_gpio" = "GPIO_163"</span><br><span> </span><br><span> # GPIO for SD card detect</span><br><span> register "sdcard_cd_gpio" = "GPIO_186"</span><br><span>@@ -115,9 +115,9 @@</span><br><span> device pci 12.0 on end # - SATA</span><br><span> device pci 13.0 off end # - PCIe-A 0 Slot 1</span><br><span> device pci 13.1 off end # - PCIe-A 1</span><br><span style="color: hsl(0, 100%, 40%);">- device pci 13.2 on end # - PCIe-A 2 Onboard Lan</span><br><span style="color: hsl(120, 100%, 40%);">+ device pci 13.2 off end # - PCIe-A 2 Onboard Lan</span><br><span> device pci 13.3 off end # - PCIe-A 3</span><br><span style="color: hsl(0, 100%, 40%);">- device pci 14.0 off end # - PCIe-B 0 Slot2</span><br><span style="color: hsl(120, 100%, 40%);">+ device pci 14.0 on end # - PCIe-B 0 Slot2</span><br><span> device pci 14.1 on end # - PCIe-B 1 Onboard M2 Slot(Wifi/BT)</span><br><span> device pci 15.0 on end # - XHCI</span><br><span> device pci 15.1 off end # - XDCI</span><br><span>diff --git a/src/mainboard/intel/glkrvp/variants/baseboard/gpio.c b/src/mainboard/intel/glkrvp/variants/baseboard/gpio.c</span><br><span>index 9014aa5..974f183 100644</span><br><span>--- a/src/mainboard/intel/glkrvp/variants/baseboard/gpio.c</span><br><span>+++ b/src/mainboard/intel/glkrvp/variants/baseboard/gpio.c</span><br><span>@@ -22,6 +22,49 @@</span><br><span> * table found in EDS vol 1, but some pins aren't grouped functionally in</span><br><span> * the table so those were moved for more logical grouping.</span><br><span> */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static const struct pad_config cnvi_wifi_gpio_table[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ PAD_CFG_NF(GPIO_21, UP_20K, DEEP, NF2), /* CNV_MFUART2_RXD */</span><br><span style="color: hsl(120, 100%, 40%);">+ PAD_CFG_NF_IOSSTATE(GPIO_22, UP_20K, DEEP, NF2, TxDRxE), /*CNV_MFUART2_TXD */</span><br><span style="color: hsl(120, 100%, 40%);">+ PAD_CFG_NF(GPIO_23, UP_20K, DEEP, NF2), /* CNV_GNSS_PABLANKIt */</span><br><span style="color: hsl(120, 100%, 40%);">+ PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_27, UP_20K, DEEP, NF2, TxLASTRxE, DISPUPD),/*RF_KILL_WiFi/WiFi_Disable */</span><br><span style="color: hsl(120, 100%, 40%);">+ PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_28, 1, DEEP, UP_20K, TxLASTRxE, DISPUPD),/* RF_KILL_BT/BT_Disable */</span><br><span style="color: hsl(120, 100%, 40%);">+ PAD_CFG_NF_IOSTANDBY_IGNORE(GPIO_191, NONE, DEEP, NF1),/*CNV_BRI_DT*/</span><br><span style="color: hsl(120, 100%, 40%);">+ PAD_CFG_NF_IOSTANDBY_IGNORE(GPIO_192, UP_20K, DEEP, NF1),/*CNV_BRI_RSP*/</span><br><span style="color: hsl(120, 100%, 40%);">+ PAD_CFG_NF_IOSTANDBY_IGNORE(GPIO_193, NONE, DEEP, NF1),/*CNV_RGI_DT*/</span><br><span style="color: hsl(120, 100%, 40%);">+ PAD_CFG_NF_IOSTANDBY_IGNORE(GPIO_194, UP_20K, DEEP, NF1),/*CNV_RGI_RSP*/</span><br><span style="color: hsl(120, 100%, 40%);">+ PAD_CFG_NF_IOSTANDBY_IGNORE(GPIO_195, NONE, DEEP, NF1),/*CNV_RF_RESET_B*/</span><br><span style="color: hsl(120, 100%, 40%);">+ PAD_CFG_NF_IOSTANDBY_IGNORE(GPIO_196, NONE, DEEP, NF1),/*XTAL_CLKREQ*/</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+const struct pad_config * __attribute__((weak))</span><br><span style="color: hsl(120, 100%, 40%);">+variant_cnvi_wifi_gpio_table(size_t *num)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ *num = ARRAY_SIZE(cnvi_wifi_gpio_table);</span><br><span style="color: hsl(120, 100%, 40%);">+ return cnvi_wifi_gpio_table;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static const struct pad_config pcie_wifi_gpio_table[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_21, 1, DEEP, UP_20K, TxLASTRxE, ENPU),/*CNV_BRI_DT*/</span><br><span style="color: hsl(120, 100%, 40%);">+ PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_22, 1, DEEP, UP_20K, TxDRxE, ENPU),/*CNV_BRI_DT*/</span><br><span style="color: hsl(120, 100%, 40%);">+ PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_23, 1, DEEP, UP_20K, TxLASTRxE, ENPU),/*CNV_BRI_DT*/</span><br><span style="color: hsl(120, 100%, 40%);">+ PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_27, 1, DEEP, NONE, IGNORE, DISPUPD),/*RF_KILL_WiFi/WiFi_Disable */</span><br><span style="color: hsl(120, 100%, 40%);">+ PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_28, 1, DEEP, UP_20K, TxLASTRxE, ENPU),/* RF_KILL_BT/BT_Disable */</span><br><span style="color: hsl(120, 100%, 40%);">+ PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_191, 1, DEEP, NONE, IGNORE, SAME),/*CNV_BRI_DT*/</span><br><span style="color: hsl(120, 100%, 40%);">+ PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_192, 1, DEEP, UP_20K, IGNORE, ENPU ),/*CNV_BRI_RSP*/</span><br><span style="color: hsl(120, 100%, 40%);">+ PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_193, 1, DEEP, NONE, IGNORE, SAME),/*CNV_RGI_DT*/</span><br><span style="color: hsl(120, 100%, 40%);">+ PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_194, 1, DEEP, UP_20K, IGNORE, ENPU),/*CNV_RGI_RSP*/</span><br><span style="color: hsl(120, 100%, 40%);">+ PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_195, 1, DEEP, NONE, IGNORE, SAME),/*CNV_RF_RESET_B*/</span><br><span style="color: hsl(120, 100%, 40%);">+ PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_196, 1, DEEP, NONE, IGNORE, SAME),/*XTAL_CLKREQ*/</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+const struct pad_config * __attribute__((weak))</span><br><span style="color: hsl(120, 100%, 40%);">+variant_pcie_wifi_gpio_table(size_t *num)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ *num = ARRAY_SIZE(pcie_wifi_gpio_table);</span><br><span style="color: hsl(120, 100%, 40%);">+ return pcie_wifi_gpio_table;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static const struct pad_config gpio_table[] = {</span><br><span> /* NORTHWEST COMMUNITY GPIOS */</span><br><span> PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_0, DN_20K, DEEP, NF1, IGNORE, ENPD), /* TCK */</span><br><span>@@ -45,14 +88,9 @@</span><br><span> PAD_CFG_GPI_APIC_IOS(GPIO_18, UP_20K, DEEP, LEVEL, NONE, IGNORE, SAME),/* Touch Pad Interrupt */</span><br><span> PAD_CFG_GPI_APIC_IOS(GPIO_19, UP_20K, DEEP, EDGE_SINGLE, NONE, TxDRxE, SAME),/*PMIC Interrupt*/</span><br><span> PAD_CFG_GPI_APIC_IOS(GPIO_20, UP_20K, DEEP, LEVEL, INVERT, IGNORE, SAME),/* Audio Codec Interrupt*/</span><br><span style="color: hsl(0, 100%, 40%);">- PAD_CFG_NF(GPIO_21, UP_20K, DEEP, NF2), /* CNV_MFUART2_RXD */</span><br><span style="color: hsl(0, 100%, 40%);">- PAD_CFG_NF_IOSSTATE(GPIO_22, UP_20K, DEEP, NF2, TxDRxE), /* CNV_MFUART2_TXD */</span><br><span style="color: hsl(0, 100%, 40%);">- PAD_CFG_NF(GPIO_23, UP_20K, DEEP, NF2), /* CNV_GNSS_PABLANKIt */</span><br><span> PAD_CFG_GPO_GPIO_DRIVER(GPIO_24, 1, DEEP, DN_20K),</span><br><span> PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_25, 1, DEEP, UP_20K, TxLASTRxE, SAME),/*WWAN /RF_KILL_GPS*/</span><br><span> PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_26, UP_20K, DEEP, NF2, HIZCRx1, DISPUPD),/* NFC Interrupt */</span><br><span style="color: hsl(0, 100%, 40%);">- PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_27, UP_20K, DEEP, NF2, TxLASTRxE, DISPUPD),/* RF_KILL_WiFi/WiFi_Disable */</span><br><span style="color: hsl(0, 100%, 40%);">- PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_28, 1, DEEP, UP_20K, TxLASTRxE, DISPUPD),/* RF_KILL_BT/BT_Disable */</span><br><span> PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_29, 1, DEEP, UP_20K, HIZCRx0, DISPUPD),/* Codec Power Down: Ouput/ISH_GPIO_3*/</span><br><span> PAD_CFG_NF_IOSTANDBY_IGNORE(GPIO_30, DN_20K, DEEP, NF1), /* ISH_GPIO_4 */</span><br><span> PAD_CFG_NF_IOSTANDBY_IGNORE(GPIO_31, DN_20K, DEEP, NF1), /* ISH_GPIO_5 */</span><br><span>@@ -229,12 +267,6 @@</span><br><span> PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_210, 1, DEEP, UP_20K, HIZCRx0, DISPUPD),</span><br><span> PAD_CFG_NF_IOSSTATE(GPIO_189, DN_20K, DEEP, NF1, HIZCRx0),/*OSC_CLK_OUT_0*/</span><br><span> PAD_CFG_NF_IOSSTATE(GPIO_190, DN_20K, DEEP, NF1, HIZCRx0),/*OSC_CLK_OUT_1*/</span><br><span style="color: hsl(0, 100%, 40%);">- PAD_CFG_NF_IOSTANDBY_IGNORE(GPIO_191, NONE, DEEP, NF1),/*CNV_BRI_DT*/</span><br><span style="color: hsl(0, 100%, 40%);">- PAD_CFG_NF_IOSTANDBY_IGNORE(GPIO_192, UP_20K, DEEP, NF1),/*CNV_BRI_RSP*/</span><br><span style="color: hsl(0, 100%, 40%);">- PAD_CFG_NF_IOSTANDBY_IGNORE(GPIO_193, NONE, DEEP, NF1),/*CNV_RGI_DT*/</span><br><span style="color: hsl(0, 100%, 40%);">- PAD_CFG_NF_IOSTANDBY_IGNORE(GPIO_194, UP_20K, DEEP, NF1),/*CNV_RGI_RSP*/</span><br><span style="color: hsl(0, 100%, 40%);">- PAD_CFG_NF_IOSTANDBY_IGNORE(GPIO_195, NONE, DEEP, NF1),/*CNV_RF_RESET_B*/</span><br><span style="color: hsl(0, 100%, 40%);">- PAD_CFG_NF_IOSTANDBY_IGNORE(GPIO_196, NONE, DEEP, NF1),/*XTAL_CLKREQ*/</span><br><span> PAD_CFG_NF(GPIO_197, DN_20K, DEEP, NF1),/*SDIO_CLK_FB*/</span><br><span> PAD_CFG_NF_IOSSTATE(GPIO_198, DN_20K, DEEP, NF1, HIZCRx0),/*EMMC0_CLK*/</span><br><span> PAD_CFG_NF(GPIO_199, DN_20K, DEEP, NF1),/*EMMC0_CLK_FB*/</span><br><span>diff --git a/src/mainboard/intel/glkrvp/variants/baseboard/include/baseboard/variants.h b/src/mainboard/intel/glkrvp/variants/baseboard/include/baseboard/variants.h</span><br><span>index c278cde..62aa7a4 100644</span><br><span>--- a/src/mainboard/intel/glkrvp/variants/baseboard/include/baseboard/variants.h</span><br><span>+++ b/src/mainboard/intel/glkrvp/variants/baseboard/include/baseboard/variants.h</span><br><span>@@ -29,6 +29,8 @@</span><br><span> const struct pad_config *variant_gpio_table(size_t *num);</span><br><span> const struct pad_config *variant_early_gpio_table(size_t *num);</span><br><span> const struct pad_config *variant_sleep_gpio_table(size_t *num);</span><br><span style="color: hsl(120, 100%, 40%);">+const struct pad_config *variant_cnvi_wifi_gpio_table(size_t *num);</span><br><span style="color: hsl(120, 100%, 40%);">+const struct pad_config *variant_pcie_wifi_gpio_table(size_t *num);</span><br><span> </span><br><span> /* Baseboard default swizzle. Can be reused if swizzle is same. */</span><br><span> extern const struct lpddr4_swizzle_cfg baseboard_lpddr4_swizzle;</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/23787">change 23787</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/23787"/><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: I875bb655b6ae87660b87a45fa52caf79f6e0d753 </div>
<div style="display:none"> Gerrit-Change-Number: 23787 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Srinidhi N Kaushik <srinidhi.n.kaushik@intel.com> </div>