Change in coreboot[master]: mb/google/kohaku: Update USB port settings

[shkim (Code Review)]

Hello Seunghwan Kim,

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

https://review.coreboot.org/c/coreboot/+/35236

to review the following change.

Change subject: mb/google/kohaku: Update USB port settings
......................................................................

mb/google/kohaku: Update USB port settings

This change overrides USB port settings for kohaku.

Some port settings are same with baseboard, but I'd like to describe all
settings here to be aware of current setting and usage of USB ports on
kohaku.

Change-Id: I5ac05485d1cd94416e5a0aecf7fa6769bd7c9e84
Signed-off-by: Seunghwan Kim 
---
M src/mainboard/google/hatch/variants/kohaku/overridetree.cb
1 file changed, 18 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/35236/1

diff --git a/src/mainboard/google/hatch/variants/kohaku/overridetree.cb b/src/mainboard/google/hatch/variants/kohaku/overridetree.cb
index 9e33bac..adfca17 100644
--- a/src/mainboard/google/hatch/variants/kohaku/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/kohaku/overridetree.cb
@@ -23,6 +23,24 @@
    # Enable DMIC1
    register "PchHdaAudioLinkDmic1" = "1"

+	register "usb2_ports[0]" = "USB2_PORT_LONG(OC2)"        # Type-C Port 0
+	register "usb2_ports[1]" = "USB2_PORT_LONG(OC2)"        # Type-C Port 1
+	register "usb2_ports[2]" = "USB2_PORT_EMPTY"
+	register "usb2_ports[3]" = "USB2_PORT_LONG(OC_SKIP)"    # SD CARD
+	register "usb2_ports[4]" = "USB2_PORT_EMPTY"
+	register "usb2_ports[5]" = "USB2_PORT_EMPTY"
+	register "usb2_ports[6]" = "USB2_PORT_LONG(OC_SKIP)"    # Camera
+	register "usb2_ports[7]" = "USB2_PORT_EMPTY"
+	register "usb2_ports[8]" = "USB2_PORT_EMPTY"
+	register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)"     # CnVi BT
+
+	register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC2)"     # Type-C Port 0
+	register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC2)"     # Type-C Port 1
+	register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC_SKIP)" # World facing camera
+	register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC_SKIP)" # SD CARD
+	register "usb3_ports[4]" = "USB3_PORT_EMPTY"
+	register "usb3_ports[5]" = "USB3_PORT_EMPTY"
+
    # Intel Common SoC Config
    #+-------------------+---------------------------+
    #| Field	     |	Value			 |

[Paul Fagerburg (Code Review)]

Paul Fagerburg has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35236 )

Change subject: mb/google/kohaku: Update USB port settings
......................................................................

Patch Set 1: Code-Review+1

[SH Kim (Code Review)]

SH Kim has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35236 )

Change subject: mb/google/kohaku: Update USB port settings
......................................................................

Patch Set 1:

Can we merge this change?

[Furquan Shaikh (Code Review)]

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35236 )

Change subject: mb/google/kohaku: Update USB port settings
......................................................................

Patch Set 1: Code-Review+2

[Tim Wawrzynczak (Code Review)]

Tim Wawrzynczak has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35236 )

Change subject: mb/google/kohaku: Update USB port settings
......................................................................

Patch Set 1: Code-Review+2

[Furquan Shaikh (Code Review)]

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35236 )

Change subject: mb/google/kohaku: Update USB port settings
......................................................................

Patch Set 1:

(1 comment)

https://review.coreboot.org/c/coreboot/+/35236/1/src/mainboard/google/hatch/... 
File src/mainboard/google/hatch/variants/kohaku/overridetree.cb:

https://review.coreboot.org/c/coreboot/+/35236/1/src/mainboard/google/hatch/... 
PS1, Line 80: chip drivers/usb/acpi
Does this need to be updated as well?

[shkim (Code Review)]

Hello Seunghwan Kim, Paul Fagerburg, Tim Wawrzynczak, Shelley Chen, build bot (Jenkins), Furquan Shaikh,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/35236

to look at the new patch set (#2).

Change subject: mb/google/kohaku: Update USB port settings
......................................................................

mb/google/kohaku: Update USB port settings

This change overrides USB port settings for kohaku.

Some port settings are same with baseboard, but I'd like to describe all
settings here to be aware of current setting and usage of USB ports on
kohaku.

Change-Id: I5ac05485d1cd94416e5a0aecf7fa6769bd7c9e84
Signed-off-by: Seunghwan Kim 
---
M src/mainboard/google/hatch/variants/kohaku/overridetree.cb
1 file changed, 81 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/35236/2

[SH Kim (Code Review)]

SH Kim has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35236 )

Change subject: mb/google/kohaku: Update USB port settings
......................................................................

Patch Set 2:

(1 comment)

Can we merge this?

https://review.coreboot.org/c/coreboot/+/35236/1/src/mainboard/google/hatch/... 
File src/mainboard/google/hatch/variants/kohaku/overridetree.cb:

https://review.coreboot.org/c/coreboot/+/35236/1/src/mainboard/google/hatch/... 
PS1, Line 80: chip drivers/usb/acpi
> Does this need to be updated as well?

Yes, just updated.

[Furquan Shaikh (Code Review)]

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35236 )

Change subject: mb/google/kohaku: Update USB port settings
......................................................................

Patch Set 2: Code-Review+2

[Furquan Shaikh (Code Review)]

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35236 )

Change subject: mb/google/kohaku: Update USB port settings
......................................................................

Patch Set 2:

(1 comment)

https://review.coreboot.org/c/coreboot/+/35236/2//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/35236/2//COMMIT_MSG@14 
PS2, Line 14: 
Is there a corresponding BUG=?

[shkim (Code Review)]

Hello Seunghwan Kim, Paul Fagerburg, Tim Wawrzynczak, Shelley Chen, build bot (Jenkins), Furquan Shaikh,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/35236

to look at the new patch set (#3).

Change subject: mb/google/kohaku: Update USB port settings
......................................................................

mb/google/kohaku: Update USB port settings

This change overrides USB port settings for kohaku.

Some port settings are same with baseboard, but I'd like to describe all
settings here to be aware of current setting and usage of USB ports on
kohaku.

BUG=none
BRANCH=none
TEST=built and measured SI of USB ports internally

Change-Id: I5ac05485d1cd94416e5a0aecf7fa6769bd7c9e84
Signed-off-by: Seunghwan Kim 
---
M src/mainboard/google/hatch/variants/kohaku/overridetree.cb
1 file changed, 81 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/35236/3

[shkim (Code Review)]

shkim has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35236 )

Change subject: mb/google/kohaku: Update USB port settings
......................................................................

Patch Set 3:

(1 comment)

https://review.coreboot.org/c/coreboot/+/35236/2//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/35236/2//COMMIT_MSG@14 
PS2, Line 14:
> Is there a corresponding BUG=?

No bug for this since we checked about USB SI internally.

[Furquan Shaikh (Code Review)]

Furquan Shaikh has submitted this change. ( https://review.coreboot.org/c/coreboot/+/35236 )

Change subject: mb/google/kohaku: Update USB port settings
......................................................................

mb/google/kohaku: Update USB port settings

This change overrides USB port settings for kohaku.

Some port settings are same with baseboard, but I'd like to describe all
settings here to be aware of current setting and usage of USB ports on
kohaku.

BUG=none
BRANCH=none
TEST=built and measured SI of USB ports internally

Change-Id: I5ac05485d1cd94416e5a0aecf7fa6769bd7c9e84
Signed-off-by: Seunghwan Kim 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35236
Tested-by: build bot (Jenkins) 
Reviewed-by: Furquan Shaikh 
---
M src/mainboard/google/hatch/variants/kohaku/overridetree.cb
1 file changed, 81 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Furquan Shaikh: Looks good to me, approved

diff --git a/src/mainboard/google/hatch/variants/kohaku/overridetree.cb b/src/mainboard/google/hatch/variants/kohaku/overridetree.cb
index 9e33bac..ff6d817 100644
--- a/src/mainboard/google/hatch/variants/kohaku/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/kohaku/overridetree.cb
@@ -23,6 +23,24 @@
    # Enable DMIC1
    register "PchHdaAudioLinkDmic1" = "1"

+	register "usb2_ports[0]" = "USB2_PORT_LONG(OC2)"        # Type-C Port 0
+	register "usb2_ports[1]" = "USB2_PORT_LONG(OC2)"        # Type-C Port 1
+	register "usb2_ports[2]" = "USB2_PORT_EMPTY"
+	register "usb2_ports[3]" = "USB2_PORT_LONG(OC_SKIP)"    # SD CARD
+	register "usb2_ports[4]" = "USB2_PORT_EMPTY"
+	register "usb2_ports[5]" = "USB2_PORT_EMPTY"
+	register "usb2_ports[6]" = "USB2_PORT_LONG(OC_SKIP)"    # Camera
+	register "usb2_ports[7]" = "USB2_PORT_EMPTY"
+	register "usb2_ports[8]" = "USB2_PORT_EMPTY"
+	register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)"     # CnVi BT
+
+	register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC2)"     # Type-C Port 0
+	register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC2)"     # Type-C Port 1
+	register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC_SKIP)" # World facing camera
+	register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC_SKIP)" # SD CARD
+	register "usb3_ports[4]" = "USB3_PORT_EMPTY"
+	register "usb3_ports[5]" = "USB3_PORT_EMPTY"
+
    # Intel Common SoC Config
    #+-------------------+---------------------------+
    #| Field	     |	Value			 |
@@ -62,14 +80,77 @@
    		chip drivers/usb/acpi
    			device usb 0.0 on
    				chip drivers/usb/acpi
+						register "desc" = ""Left Type-C Port""
+						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
+						register "group" = "ACPI_PLD_GROUP(1, 1)"
+						device usb 2.0 on end
+					end
+					chip drivers/usb/acpi
+						register "desc" = ""Right Type-C Port""
+						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
+						register "group" = "ACPI_PLD_GROUP(2, 1)"
+						device usb 2.1 on end
+					end
+					chip drivers/usb/acpi
+						device usb 2.2 off end
+					end
+					chip drivers/usb/acpi
+						register "desc" = ""Micro SD Card""
+						register "type" = "UPC_TYPE_INTERNAL"
+						device usb 2.3 on end
+					end
+					chip drivers/usb/acpi
+						device usb 2.4 off end
+					end
+					chip drivers/usb/acpi
    					device usb 2.5 off end
    				end
    				chip drivers/usb/acpi
+						register "desc" = ""Camera""
+						register "type" = "UPC_TYPE_INTERNAL"
+						device usb 2.6 on end
+					end
+					chip drivers/usb/acpi
+						device usb 2.7 off end
+					end
+					chip drivers/usb/acpi
+						device usb 2.8 off end
+					end
+					chip drivers/usb/acpi
+						register "desc" = ""Bluetooth""
+						register "type" = "UPC_TYPE_INTERNAL"
+						register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_C14)"
+						device usb 2.9 on end
+					end
+					chip drivers/usb/acpi
+						register "desc" = ""Left Type-C Port""
+						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
+						register "group" = "ACPI_PLD_GROUP(1, 1)"
+						device usb 3.0 on end
+					end
+					chip drivers/usb/acpi
+						register "desc" = ""Right Type-C Port""
+						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
+						register "group" = "ACPI_PLD_GROUP(2, 1)"
+						device usb 3.1 on end
+					end
+					chip drivers/usb/acpi
+						register "desc" = ""WF Camera""
+						register "type" = "UPC_TYPE_INTERNAL"
+						device usb 3.2 on end
+					end
+					chip drivers/usb/acpi
+						register "desc" = ""Micro SD card""
+						register "type" = "UPC_TYPE_INTERNAL"
+						device usb 3.3 on end
+					end
+					chip drivers/usb/acpi
    					device usb 3.4 off end
    				end
    			end
    		end
    	end
+
    	device pci 14.5 off end # SDCard

device pci 15.0 on