[coreboot-gerrit] Change in ...coreboot[master]: mb/google/fizz/variants/karma: Disable SD controller and update GPIO

[David Wu (Code Review)]

David Wu has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/29765


Change subject: mb/google/fizz/variants/karma: Disable SD controller and update GPIO
......................................................................

mb/google/fizz/variants/karma: Disable SD controller and update GPIO

The SD cardreader is on USB bus, not on SDIO/SDXC.

BUG=b:119798840
BRANCH=master
TEST=Compiles successfully and boot on DUT.

Change-Id: I8015fe35a4ff79469b5781942f588c3e1b88b751
Signed-off-by: David Wu <David_Wu at quanta.corp-partner.google.com>
---
M src/mainboard/google/fizz/variants/karma/gpio.c
M src/mainboard/google/fizz/variants/karma/overridetree.cb
2 files changed, 25 insertions(+), 9 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/65/29765/1

diff --git a/src/mainboard/google/fizz/variants/karma/gpio.c b/src/mainboard/google/fizz/variants/karma/gpio.c
index 29c6f88..f811b00 100644
--- a/src/mainboard/google/fizz/variants/karma/gpio.c
+++ b/src/mainboard/google/fizz/variants/karma/gpio.c
@@ -27,8 +27,7 @@
 /* ESPI_IO3 */
 /* ESPI_CS# */
 /* SERIRQ */		PAD_CFG_NC(GPP_A6), /* TP331 */
-/* PIRQA# */		PAD_CFG_GPI_INT(GPP_A7, 20K_PU, DEEP,
-					EDGE), /* SD_CDZ */
+/* PIRQA# */		PAD_CFG_NC(GPP_A7), /* TP104 */
 /* CLKRUN# */		PAD_CFG_NC(GPP_A8), /* TP329 */
 /* ESPI_CLK */
 /* CLKOUT_LPC1 */	PAD_CFG_NC(GPP_A10), /* TP188 */
@@ -217,13 +216,13 @@
 /* EMMC_CLK */		PAD_CFG_NC(GPP_F22),
 /* RSVD */		PAD_CFG_NC(GPP_F23),
 
-/* SD_CMD */		PAD_CFG_NF(GPP_G0, NONE, DEEP, NF1),
-/* SD_DATA0 */		PAD_CFG_NF(GPP_G1, NONE, DEEP, NF1),
-/* SD_DATA1 */		PAD_CFG_NF(GPP_G2, NONE, DEEP, NF1),
-/* SD_DATA2 */		PAD_CFG_NF(GPP_G3, NONE, DEEP, NF1),
-/* SD_DATA3 */		PAD_CFG_NF(GPP_G4, NONE, DEEP, NF1),
-/* SD_CD# */		PAD_CFG_NF(GPP_G5, NONE, DEEP, NF1), /* SD_CDZ */
-/* SD_CLK */		PAD_CFG_NF(GPP_G6, NONE, DEEP, NF1),
+/* SD_CMD */		PAD_CFG_NC(GPP_G0),
+/* SD_DATA0 */		PAD_CFG_NC(GPP_G1),
+/* SD_DATA1 */		PAD_CFG_NC(GPP_G2),
+/* SD_DATA2 */		PAD_CFG_NC(GPP_G3),
+/* SD_DATA3 */		PAD_CFG_NC(GPP_G4),
+/* SD_CD# */		PAD_CFG_NC(GPP_G5),
+/* SD_CLK */		PAD_CFG_NC(GPP_G6),
 /* SD_WP */		PAD_CFG_NC(GPP_G7), /* TP292 */
 
 /* BATLOW# */		PAD_CFG_NC(GPD0), /* TP148 */
diff --git a/src/mainboard/google/fizz/variants/karma/overridetree.cb b/src/mainboard/google/fizz/variants/karma/overridetree.cb
index f04def2..32eac4d 100644
--- a/src/mainboard/google/fizz/variants/karma/overridetree.cb
+++ b/src/mainboard/google/fizz/variants/karma/overridetree.cb
@@ -4,9 +4,14 @@
 	#+----------------+-------+-----------------------------------+
 	#| Device         | Port# | Rev                               |
 	#+----------------+-------+-----------------------------------+
+	#| SD Card        |   4   |                                   |
 	#| Touchsreen     |   10  |                                   |
 	#+----------------+-------+-----------------------------------+
+	register "usb2_ports[3]" = "USB2_PORT_MID(OC_SKIP)"	# Card reader
 	register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)"	# Touchscreen
+
+	register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC_SKIP)"	# Card reader
+
 	register "psys_pmax" = "151"
 
 	device domain 0 on
@@ -14,10 +19,21 @@
 			chip drivers/usb/acpi
 				device usb 0.0 on
 					chip drivers/usb/acpi
+						register "desc" = ""USB2 SD Card""
+						register "type" = "UPC_TYPE_INTERNAL"
+						device usb 2.3 on end
+					end
+					chip drivers/usb/acpi
 						register "desc" = ""USB2 Touchscreen""
 						register "type" = "UPC_TYPE_INTERNAL"
 						device usb 2.9 on end
 					end
+					chip drivers/usb/acpi
+						register "desc" = ""USB3 SD Card""
+						register "type" = "UPC_TYPE_INTERNAL"
+						device usb 3.3 on end
+					end
+
 				end
 			end
 		end # USB xHCI
@@ -45,5 +61,6 @@
 				device i2c 1a on end
 			end
 		end # I2C #5
+		device pci 1e.6 off end # SDCard
 	end
 end

-- 
To view, visit https://review.coreboot.org/c/coreboot/+/29765
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I8015fe35a4ff79469b5781942f588c3e1b88b751
Gerrit-Change-Number: 29765
Gerrit-PatchSet: 1
Gerrit-Owner: David Wu <david_wu at quanta.corp-partner.google.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20181121/58fb7b13/attachment-0001.html>