From cbfcec9e1be2c43613d1c411a97ecb107093af71 Mon Sep 17 00:00:00 2001 From: Venkateswarlu Vinjamuri Date: Fri, 24 Feb 2017 15:54:39 -0800 Subject: [PATCH] UPSTREAM: mainboard/google/reef: Configure SDCARD card detect pin This configures GPIO_177 as an input pin for SDCARD card detect. This also changes the ownership of the pin from ACPI to GPIO driver. Assign the sdcard card detect pin in devicetree for reef variants. CQ-DEPEND=CL:448173 BUG=chrome-os-partner:63070 TEST=None Change-Id: I6a146d62c0e7f6715d5b63180bfe8cd7f85dd56e Signed-off-by: Patrick Georgi Original-Commit-Id: 7e4d12c5b12107bb7682e050c66f97000e064ce2 Original-Change-Id: Ia8aef60bd7d0ea36afb39f76fab051aa46a2ed64 Original-Signed-off-by: Venkateswarlu Vinjamuri Original-Reviewed-on: https://review.coreboot.org/18497 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Aaron Durbin Reviewed-on: https://chromium-review.googlesource.com/452894 --- src/mainboard/google/reef/variants/baseboard/devicetree.cb | 3 +++ src/mainboard/google/reef/variants/baseboard/gpio.c | 2 +- src/mainboard/google/reef/variants/pyro/devicetree.cb | 3 +++ src/mainboard/google/reef/variants/snappy/devicetree.cb | 3 +++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/mainboard/google/reef/variants/baseboard/devicetree.cb b/src/mainboard/google/reef/variants/baseboard/devicetree.cb index b0c82e2be8..443918e037 100644 --- a/src/mainboard/google/reef/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/reef/variants/baseboard/devicetree.cb @@ -17,6 +17,9 @@ chip soc/intel/apollolake # If the Board does not have PERST_0, assign GPIO_PRT0_UDEF register "prt0_gpio" = "GPIO_122" + # GPIO for SD card detect + register "sdcard_cd_gpio" = "GPIO_177" + # EMMC TX DATA Delay 1 # Refer to EDS-Vol2-22.3. # [14:8] steps of delay for HS400, each 125ps. diff --git a/src/mainboard/google/reef/variants/baseboard/gpio.c b/src/mainboard/google/reef/variants/baseboard/gpio.c index ae89da10d3..c572b1ebdd 100644 --- a/src/mainboard/google/reef/variants/baseboard/gpio.c +++ b/src/mainboard/google/reef/variants/baseboard/gpio.c @@ -59,7 +59,7 @@ static const struct pad_config gpio_table[] = { PAD_CFG_NF(GPIO_175, UP_20K, DEEP, NF1), /* SDCARD_D2 */ PAD_CFG_NF(GPIO_176, UP_20K, DEEP, NF1), /* SDCARD_D3 */ /* Card detect is active LOW with external pull up. */ - PAD_CFG_NF(GPIO_177, NONE, DEEP, NF1), /* SDCARD_CD_N */ + PAD_CFG_GPI_GPIO_DRIVER(GPIO_177, NONE, DEEP), /* SDCARD_CD_N */ PAD_CFG_NF(GPIO_178, UP_20K, DEEP, NF1), /* SDCARD_CMD */ /* CLK feedback, internal signal, needs 20K pull down */ PAD_CFG_NF(GPIO_179, DN_20K, DEEP, NF1), /* SDCARD_CLK_FB */ diff --git a/src/mainboard/google/reef/variants/pyro/devicetree.cb b/src/mainboard/google/reef/variants/pyro/devicetree.cb index 808ed2c4e7..5bfe2c20f0 100644 --- a/src/mainboard/google/reef/variants/pyro/devicetree.cb +++ b/src/mainboard/google/reef/variants/pyro/devicetree.cb @@ -17,6 +17,9 @@ chip soc/intel/apollolake # If the Board does not have PERST_0, assign GPIO_PRT0_UDEF register "prt0_gpio" = "GPIO_122" + # GPIO for SD card detect + register "sdcard_cd_gpio" = "GPIO_177" + # EMMC TX DATA Delay 1 # Refer to EDS-Vol2-22.3. # [14:8] steps of delay for HS400, each 125ps. diff --git a/src/mainboard/google/reef/variants/snappy/devicetree.cb b/src/mainboard/google/reef/variants/snappy/devicetree.cb index 2b47c5727d..cf3e4dfe08 100644 --- a/src/mainboard/google/reef/variants/snappy/devicetree.cb +++ b/src/mainboard/google/reef/variants/snappy/devicetree.cb @@ -17,6 +17,9 @@ chip soc/intel/apollolake # If the Board does not have PERST_0, assign GPIO_PRT0_UDEF register "prt0_gpio" = "GPIO_122" + # GPIO for SD card detect + register "sdcard_cd_gpio" = "GPIO_177" + # EMMC TX DATA Delay 1 # Refer to EDS-Vol2-22.3. # [14:8] steps of delay for HS400, each 125ps.