summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Wawrzynczak <twawrzynczak@chromium.org>2019-04-23 10:50:27 -0600
committerStefan Reinauer <stefan.reinauer@coreboot.org>2019-04-24 16:34:38 +0000
commit40dee3d5065ff294b8c1ded6ac9187b584a59d42 (patch)
treed35c159abe42a767b41537806adcf7a8c4d68faa
parent4d99b270187ac8c297404e811c268bb3470f283e (diff)
mb/google/hatch: Move SD card detect GPIO.
Not all Hatch variants utilize the SoC's native SD card support. Move the support to board-specific variants instead of the base device tree. BUG=none BRANCH=none TEST=compiles (no Hatch device to test with) Change-Id: Iae24114aad2c4d042c25da6f8cb740ccc8960082 Signed-off-by: Tim Wawrzynczak <twawrzynczak@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/32417 Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Reviewed-by: Furquan Shaikh <furquan@google.com> Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/mainboard/google/hatch/variants/baseboard/devicetree.cb3
-rw-r--r--src/mainboard/google/hatch/variants/hatch/overridetree.cb3
-rw-r--r--src/mainboard/google/hatch/variants/hatch_whl/overridetree.cb3
3 files changed, 6 insertions, 3 deletions
diff --git a/src/mainboard/google/hatch/variants/baseboard/devicetree.cb b/src/mainboard/google/hatch/variants/baseboard/devicetree.cb
index e39f140588..3889d75262 100644
--- a/src/mainboard/google/hatch/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/hatch/variants/baseboard/devicetree.cb
@@ -77,9 +77,6 @@ chip soc/intel/cannonlake
# ClkReq-to-ClkSrc mapping for CLK SRC 1
register "PcieClkSrcClkReq[1]" = "1"
- # GPIO for SD card detect
- register "sdcard_cd_gpio" = "vSD3_CD_B"
-
# PCIe port 14 for M.2 E-key WLAN
register "PcieRpEnable[13]" = "1"
# RP 14 uses CLK SRC 3
diff --git a/src/mainboard/google/hatch/variants/hatch/overridetree.cb b/src/mainboard/google/hatch/variants/hatch/overridetree.cb
index 22a0947b77..13e7766747 100644
--- a/src/mainboard/google/hatch/variants/hatch/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/hatch/overridetree.cb
@@ -44,6 +44,9 @@ chip soc/intel/cannonlake
},
}"
+ # GPIO for SD card detect
+ register "sdcard_cd_gpio" = "vSD3_CD_B"
+
device domain 0 on
device pci 15.0 on
chip drivers/i2c/generic
diff --git a/src/mainboard/google/hatch/variants/hatch_whl/overridetree.cb b/src/mainboard/google/hatch/variants/hatch_whl/overridetree.cb
index 5bcb67e9c7..15b93f38d4 100644
--- a/src/mainboard/google/hatch/variants/hatch_whl/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/hatch_whl/overridetree.cb
@@ -29,6 +29,9 @@ chip soc/intel/cannonlake
},
}"
+ # GPIO for SD card detect
+ register "sdcard_cd_gpio" = "vSD3_CD_B"
+
device domain 0 on
device pci 15.0 on
chip drivers/i2c/generic