Change in coreboot[master]: mb/google/poppy/variants/atlas: enable NVMe

[Caveh Jalali (Code Review)]

Hello caveh jalali,

I'd like you to do a code review. Please visit

https://review.coreboot.org/28535

to review the following change.

Change subject: mb/google/poppy/variants/atlas: enable NVMe
......................................................................

mb/google/poppy/variants/atlas: enable NVMe

This adds support for a x2 NVMe device on PCIe bus PCIe lines 5+6 and
clock#4.

BUG=b:113369699
TEST=booted on atlas

Change-Id: I08e7c4d65662ddbb7d936915c896eb1fcb240ba8
Signed-off-by: Caveh Jalali 
---
M src/mainboard/google/poppy/variants/atlas/devicetree.cb
M src/mainboard/google/poppy/variants/atlas/gpio.c
2 files changed, 18 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/28535/1

diff --git a/src/mainboard/google/poppy/variants/atlas/devicetree.cb b/src/mainboard/google/poppy/variants/atlas/devicetree.cb
index c96081c..968faef 100644
--- a/src/mainboard/google/poppy/variants/atlas/devicetree.cb
+++ b/src/mainboard/google/poppy/variants/atlas/devicetree.cb
@@ -147,7 +147,7 @@
    	.dc_loadline = 441,
    }"

-	# PCIe Root port 1 with SRCCLKREQ1#
+	# PCIe Root port 1 with SRCCLKREQ1# (WLAN)
    register "PcieRpEnable[0]" = "1"
    register "PcieRpClkReqSupport[0]" = "1"
    register "PcieRpClkReqNumber[0]" = "1"
@@ -155,6 +155,20 @@
    register "PcieRpAdvancedErrorReporting[0]" = "1"
    register "PcieRpLtrEnable[0]" = "1"

+        # PCIe Root port 5 (NVMe)
+        #  PcieRpEnable:                 Enable root port
+        #  PcieRpClkReqSupport:          Enable CLKREQ#
+        #  PcieRpClkReqNumber:           Uses SRCCLKREQ4#
+        #  PcieRpClkSrcNumber:           Uses CLKOUT_PCIE_4
+        #  PcieRpAdvancedErrorReporting: Enable Advanced Error Reporting
+        #  PcieRpLtrEnable:              Enable Latency Tolerance Reporting Mechanism
+        register "PcieRpEnable[4]" = "1"
+        register "PcieRpClkReqSupport[4]" = "1"
+        register "PcieRpClkReqNumber[4]" = "4"
+        register "PcieRpClkSrcNumber[4]" = "4"
+        register "PcieRpAdvancedErrorReporting[4]" = "1"
+        register "PcieRpLtrEnable[4]" = "1"
+
    # USB 2.0
    register "usb2_ports[0]" = "USB2_PORT_LONG(OC0)"	# Type-C Port 1
    register "usb2_ports[1]" = "USB2_PORT_EMPTY"		# Empty
@@ -329,7 +343,7 @@
    	device pci 1c.1 off end # PCI Express Port 2
    	device pci 1c.2 off end # PCI Express Port 3
    	device pci 1c.3 off end # PCI Express Port 4
-		device pci 1c.4 off end # PCI Express Port 5
+		device pci 1c.4 on  end # PCI Express Port 5 (NVMe)
    	device pci 1c.5 off end # PCI Express Port 6
    	device pci 1c.6 off end # PCI Express Port 7
    	device pci 1c.7 off end # PCI Express Port 8
diff --git a/src/mainboard/google/poppy/variants/atlas/gpio.c b/src/mainboard/google/poppy/variants/atlas/gpio.c
index 5f1a1f5..f82976e 100644
--- a/src/mainboard/google/poppy/variants/atlas/gpio.c
+++ b/src/mainboard/google/poppy/variants/atlas/gpio.c
@@ -78,8 +78,8 @@
    PAD_CFG_NC(GPP_B7),
    /* B8  : SRCCLKREQ3# ==> WLAN_PE_RST */
    PAD_CFG_GPO(GPP_B8, 0, RSMRST),
-	/* B9  : SRCCLKREQ4# ==> NC */
-	PAD_CFG_NC(GPP_B9),
+	/* B9  : SRCCLKREQ4# ==> NVME_PCIE_CLKREQ_L */
+	PAD_CFG_NF(GPP_B9, NONE, DEEP, NF1),
    /* B10 : SRCCLKREQ5# ==> NC */
    PAD_CFG_NC(GPP_B10),
    /* B11 : EXT_PWR_GATE# ==> NC */