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@quanta.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/29765
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>

4 files changed, 45 insertions, 26 deletions

diff --git a/src/mainboard/google/fizz/variants/baseboard/devicetree.cb b/src/mainboard/google/fizz/variants/baseboard/devicetree.cb
index ff0db37964..45997a99dd 100644
--- a/src/mainboard/google/fizz/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/fizz/variants/baseboard/devicetree.cb
@@ -323,9 +323,6 @@ chip soc/intel/skylake
 	register "psys_pmax" = "120"
 	register "tcc_offset" = "6"     # TCC of 94C
 
-	# Use default SD card detect GPIO configuration
-	register "sdcard_cd_gpio_default" = "GPP_A7"
-
 	device cpu_cluster 0 on
 		device lapic 0 on end
 	end
@@ -353,11 +350,6 @@ chip soc/intel/skylake
 						device usb 2.2 on end
 					end
 					chip drivers/usb/acpi
-						register "desc" = ""USB2 Type-A Front Left""
-						register "type" = "UPC_TYPE_A"
-						device usb 2.3 on end
-					end
-					chip drivers/usb/acpi
 						register "desc" = ""USB2 Type-A Rear Right""
 						register "type" = "UPC_TYPE_A"
 						device usb 2.4 on end
@@ -388,11 +380,6 @@ chip soc/intel/skylake
 						device usb 3.2 on end
 					end
 					chip drivers/usb/acpi
-						register "desc" = ""USB3 Type-A Front Left""
-						register "type" = "UPC_TYPE_USB3_A"
-						device usb 3.3 on end
-					end
-					chip drivers/usb/acpi
 						register "desc" = ""USB3 Type-A Rear Right""
 						register "type" = "UPC_TYPE_USB3_A"
 						device usb 3.4 on end
diff --git a/src/mainboard/google/fizz/variants/fizz/overridetree.cb b/src/mainboard/google/fizz/variants/fizz/overridetree.cb
index 0d3c4fc54e..05d8a97560 100644
--- a/src/mainboard/google/fizz/variants/fizz/overridetree.cb
+++ b/src/mainboard/google/fizz/variants/fizz/overridetree.cb
@@ -1,6 +1,25 @@
 chip soc/intel/skylake
 
+	# Use default SD card detect GPIO configuration
+	register "sdcard_cd_gpio_default" = "GPP_A7"
+
 	device domain 0 on
+		device pci 14.0 on
+			chip drivers/usb/acpi
+				device usb 0.0 on
+					chip drivers/usb/acpi
+						register "desc" = ""USB2 Type-A Front Left""
+						register "type" = "UPC_TYPE_A"
+						device usb 2.3 on end
+					end
+					chip drivers/usb/acpi
+						register "desc" = ""USB3 Type-A Front Left""
+						register "type" = "UPC_TYPE_USB3_A"
+						device usb 3.3 on end
+					end
+				end
+			end
+		end # USB xHCI
 		device pci 19.1 on
 			chip drivers/i2c/generic
 				register "hid" = ""10EC5663""
@@ -10,7 +29,5 @@ chip soc/intel/skylake
 				device i2c 13 on end
 			end
 		end # I2C #5
-
 	end
-
 end
diff --git a/src/mainboard/google/fizz/variants/karma/gpio.c b/src/mainboard/google/fizz/variants/karma/gpio.c
index c54f75cf4d..0c775b696c 100644
--- a/src/mainboard/google/fizz/variants/karma/gpio.c
+++ b/src/mainboard/google/fizz/variants/karma/gpio.c
@@ -27,8 +27,7 @@ static const struct pad_config gpio_table[] = {
 /* 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 */
@@ -38,8 +37,8 @@ static const struct pad_config gpio_table[] = {
 						DEEP), /* eSPI mode */
 /* ESPI_RESET# */
 /* SUSACK# */		PAD_CFG_NC(GPP_A15), /* TP150 */
-/* SD_1P8_SEL */	PAD_CFG_NF(GPP_A16, NONE, DEEP, NF1),
-/* SD_PWR_EN# */	PAD_CFG_NF(GPP_A17, NONE, DEEP, NF1),
+/* SD_1P8_SEL */	PAD_CFG_NC(GPP_A16),
+/* SD_PWR_EN# */	PAD_CFG_NC(GPP_A17),
 /* ISH_GP0 */		PAD_CFG_GPO(GPP_A18, 0, DEEP), /* 7322_OE */
 /* ISH_GP1 */		PAD_CFG_GPI_GPIO_DRIVER(GPP_A19, NONE, DEEP), /* HDPO */
 /* ISH_GP2 */		PAD_CFG_NC(GPP_A20),
@@ -217,13 +216,13 @@ static const struct pad_config gpio_table[] = {
 /* 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 f04def2a05..ee88352d13 100644
--- a/src/mainboard/google/fizz/variants/karma/overridetree.cb
+++ b/src/mainboard/google/fizz/variants/karma/overridetree.cb
@@ -4,9 +4,14 @@ chip soc/intel/skylake
 	#+----------------+-------+-----------------------------------+
 	#| 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,20 @@ chip soc/intel/skylake
 			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 +60,6 @@ chip soc/intel/skylake
 				device i2c 1a on end
 			end
 		end # I2C #5
+		device pci 1e.6 off end # SDCard
 	end
 end