diff options
| author | Felix Singer <felixsinger@posteo.net> | 2023-10-23 07:26:28 +0200 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2023-10-25 14:16:16 +0000 |
| commit | 21b5a9aff41136bacb3cce78ae027cd588c74295 (patch) | |
| tree | 57ff2a980d3a8704f16c9d7cd80341b107840e82 /src/mainboard/google | |
| parent | a41abea65d673d7c006dbde2ca832abdedd0bb2b (diff) | |
devicetrees: Remove trailing backslash from multiline values
It's not needed to put a backslash at the end of a line for quoted
multiline values. Thus, remove it.
Change-Id: I1b83d53598ba2adeed853a96d6c2c1a21f01a9f7
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/78576
Reviewed-by: Erik van den Bogaert <ebogaert@eltan.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Diffstat (limited to 'src/mainboard/google')
20 files changed, 139 insertions, 139 deletions
diff --git a/src/mainboard/google/brya/variants/aurash/overridetree.cb b/src/mainboard/google/brya/variants/aurash/overridetree.cb index bd3e9d1254..2b9ebfea64 100644 --- a/src/mainboard/google/brya/variants/aurash/overridetree.cb +++ b/src/mainboard/google/brya/variants/aurash/overridetree.cb @@ -37,13 +37,13 @@ chip soc/intel/alderlake }" # Type-A port A2 register "tcss_ports[3]" = "TCSS_PORT_EMPTY" # Disable TCP3 # Bitmap for Wake Enable on USB attach/detach - register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(4) | \ - USB_PORT_WAKE_ENABLE(6) | \ - USB_PORT_WAKE_ENABLE(7) | \ + register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(4) | + USB_PORT_WAKE_ENABLE(6) | + USB_PORT_WAKE_ENABLE(7) | USB_PORT_WAKE_ENABLE(8)" - register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ - USB_PORT_WAKE_ENABLE(2) | \ - USB_PORT_WAKE_ENABLE(3) | \ + register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | + USB_PORT_WAKE_ENABLE(2) | + USB_PORT_WAKE_ENABLE(3) | USB_PORT_WAKE_ENABLE(4)" register "tcc_offset" = "0" # TCC of 100C register "power_limits_config[ADL_P_142_242_282_15W_CORE]" = "{ diff --git a/src/mainboard/google/brya/variants/kinox/overridetree.cb b/src/mainboard/google/brya/variants/kinox/overridetree.cb index 96e6e60951..fcca3d89f5 100644 --- a/src/mainboard/google/brya/variants/kinox/overridetree.cb +++ b/src/mainboard/google/brya/variants/kinox/overridetree.cb @@ -45,14 +45,14 @@ chip soc/intel/alderlake register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC_SKIP)" # USB HUB # Bitmap for Wake Enable on USB attach/detach - register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ - USB_PORT_WAKE_ENABLE(6) | \ - USB_PORT_WAKE_ENABLE(7) | \ - USB_PORT_WAKE_ENABLE(8) | \ + register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | + USB_PORT_WAKE_ENABLE(6) | + USB_PORT_WAKE_ENABLE(7) | + USB_PORT_WAKE_ENABLE(8) | USB_PORT_WAKE_ENABLE(9)" - register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ - USB_PORT_WAKE_ENABLE(2) | \ - USB_PORT_WAKE_ENABLE(3) | \ + register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | + USB_PORT_WAKE_ENABLE(2) | + USB_PORT_WAKE_ENABLE(3) | USB_PORT_WAKE_ENABLE(4)" register "tcss_ports[1]" = "TCSS_PORT_DEFAULT(OC1)" # BTB diff --git a/src/mainboard/google/brya/variants/moli/overridetree.cb b/src/mainboard/google/brya/variants/moli/overridetree.cb index cad69bb95f..e636540033 100644 --- a/src/mainboard/google/brya/variants/moli/overridetree.cb +++ b/src/mainboard/google/brya/variants/moli/overridetree.cb @@ -38,13 +38,13 @@ chip soc/intel/alderlake register "tcss_ports[3]" = "TCSS_PORT_EMPTY" # Disable TCP3 # Bitmap for Wake Enable on USB attach/detach - register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(4) | \ - USB_PORT_WAKE_ENABLE(6) | \ - USB_PORT_WAKE_ENABLE(7) | \ + register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(4) | + USB_PORT_WAKE_ENABLE(6) | + USB_PORT_WAKE_ENABLE(7) | USB_PORT_WAKE_ENABLE(8)" - register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ - USB_PORT_WAKE_ENABLE(2) | \ - USB_PORT_WAKE_ENABLE(3) | \ + register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | + USB_PORT_WAKE_ENABLE(2) | + USB_PORT_WAKE_ENABLE(3) | USB_PORT_WAKE_ENABLE(4)" register "tcc_offset" = "0" # TCC of 100C diff --git a/src/mainboard/google/dedede/variants/boxy/overridetree.cb b/src/mainboard/google/dedede/variants/boxy/overridetree.cb index 5c3e90c153..ab6fc16408 100644 --- a/src/mainboard/google/dedede/variants/boxy/overridetree.cb +++ b/src/mainboard/google/dedede/variants/boxy/overridetree.cb @@ -83,13 +83,13 @@ chip soc/intel/jasperlake register "usb2_ports[3]" = "USB2_PORT_MID(OC_SKIP)" # Type-C Port C1 #Bitmap for Wake Enable on USB attach/detach - register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ - USB_PORT_WAKE_ENABLE(2) | \ - USB_PORT_WAKE_ENABLE(3) | \ + register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | + USB_PORT_WAKE_ENABLE(2) | + USB_PORT_WAKE_ENABLE(3) | USB_PORT_WAKE_ENABLE(4)" - register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ - USB_PORT_WAKE_ENABLE(2) | \ - USB_PORT_WAKE_ENABLE(3) | \ + register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | + USB_PORT_WAKE_ENABLE(2) | + USB_PORT_WAKE_ENABLE(3) | USB_PORT_WAKE_ENABLE(4)" device domain 0 on diff --git a/src/mainboard/google/dedede/variants/dexi/overridetree.cb b/src/mainboard/google/dedede/variants/dexi/overridetree.cb index fc80ba2bdd..2b09088eef 100644 --- a/src/mainboard/google/dedede/variants/dexi/overridetree.cb +++ b/src/mainboard/google/dedede/variants/dexi/overridetree.cb @@ -124,17 +124,17 @@ chip soc/intel/jasperlake register "usb3_ports[5]" = "USB3_PORT_DEFAULT(OC_SKIP)" # USB3/1 Type-A Port A3 # Bitmap for Wake Enable on USB attach/detach - register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ - USB_PORT_WAKE_ENABLE(2) | \ - USB_PORT_WAKE_ENABLE(3) | \ - USB_PORT_WAKE_ENABLE(4) | \ - USB_PORT_WAKE_ENABLE(5) | \ + register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | + USB_PORT_WAKE_ENABLE(2) | + USB_PORT_WAKE_ENABLE(3) | + USB_PORT_WAKE_ENABLE(4) | + USB_PORT_WAKE_ENABLE(5) | USB_PORT_WAKE_ENABLE(7)" - register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ - USB_PORT_WAKE_ENABLE(2) | \ - USB_PORT_WAKE_ENABLE(3) | \ - USB_PORT_WAKE_ENABLE(4) | \ - USB_PORT_WAKE_ENABLE(5) | \ + register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | + USB_PORT_WAKE_ENABLE(2) | + USB_PORT_WAKE_ENABLE(3) | + USB_PORT_WAKE_ENABLE(4) | + USB_PORT_WAKE_ENABLE(5) | USB_PORT_WAKE_ENABLE(6)" device domain 0 on diff --git a/src/mainboard/google/dedede/variants/taranza/overridetree.cb b/src/mainboard/google/dedede/variants/taranza/overridetree.cb index fc80ba2bdd..2b09088eef 100644 --- a/src/mainboard/google/dedede/variants/taranza/overridetree.cb +++ b/src/mainboard/google/dedede/variants/taranza/overridetree.cb @@ -124,17 +124,17 @@ chip soc/intel/jasperlake register "usb3_ports[5]" = "USB3_PORT_DEFAULT(OC_SKIP)" # USB3/1 Type-A Port A3 # Bitmap for Wake Enable on USB attach/detach - register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ - USB_PORT_WAKE_ENABLE(2) | \ - USB_PORT_WAKE_ENABLE(3) | \ - USB_PORT_WAKE_ENABLE(4) | \ - USB_PORT_WAKE_ENABLE(5) | \ + register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | + USB_PORT_WAKE_ENABLE(2) | + USB_PORT_WAKE_ENABLE(3) | + USB_PORT_WAKE_ENABLE(4) | + USB_PORT_WAKE_ENABLE(5) | USB_PORT_WAKE_ENABLE(7)" - register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ - USB_PORT_WAKE_ENABLE(2) | \ - USB_PORT_WAKE_ENABLE(3) | \ - USB_PORT_WAKE_ENABLE(4) | \ - USB_PORT_WAKE_ENABLE(5) | \ + register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | + USB_PORT_WAKE_ENABLE(2) | + USB_PORT_WAKE_ENABLE(3) | + USB_PORT_WAKE_ENABLE(4) | + USB_PORT_WAKE_ENABLE(5) | USB_PORT_WAKE_ENABLE(6)" device domain 0 on diff --git a/src/mainboard/google/fizz/variants/baseboard/devicetree.cb b/src/mainboard/google/fizz/variants/baseboard/devicetree.cb index e19e2386b2..46069ced39 100644 --- a/src/mainboard/google/fizz/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/fizz/variants/baseboard/devicetree.cb @@ -33,15 +33,15 @@ chip soc/intel/skylake #+----------------+-------+-----------------------------------+ # Bitmap for Wake Enable on USB attach/detach - register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(2) | \ - USB_PORT_WAKE_ENABLE(3) | \ - USB_PORT_WAKE_ENABLE(4) | \ - USB_PORT_WAKE_ENABLE(5) | \ + register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(2) | + USB_PORT_WAKE_ENABLE(3) | + USB_PORT_WAKE_ENABLE(4) | + USB_PORT_WAKE_ENABLE(5) | USB_PORT_WAKE_ENABLE(6)" - register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(2) | \ - USB_PORT_WAKE_ENABLE(3) | \ - USB_PORT_WAKE_ENABLE(4) | \ - USB_PORT_WAKE_ENABLE(5) | \ + register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(2) | + USB_PORT_WAKE_ENABLE(3) | + USB_PORT_WAKE_ENABLE(4) | + USB_PORT_WAKE_ENABLE(5) | USB_PORT_WAKE_ENABLE(6)" # GPE configuration diff --git a/src/mainboard/google/kahlee/variants/baseboard/devicetree.cb b/src/mainboard/google/kahlee/variants/baseboard/devicetree.cb index 92c0d14803..a17f5e0dcf 100644 --- a/src/mainboard/google/kahlee/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/kahlee/variants/baseboard/devicetree.cb @@ -10,7 +10,7 @@ chip soc/amd/stoneyridge register "uma_mode" = "UMAMODE_SPECIFIED_SIZE" register "uma_size" = "32 * MiB" - register "i2c_scl_reset" = "GPIO_I2C0_SCL | GPIO_I2C1_SCL | \ + register "i2c_scl_reset" = "GPIO_I2C0_SCL | GPIO_I2C1_SCL | GPIO_I2C2_SCL | GPIO_I2C3_SCL" device domain 0 on diff --git a/src/mainboard/google/puff/variants/ambassador/overridetree.cb b/src/mainboard/google/puff/variants/ambassador/overridetree.cb index a96cd25244..8b6a9ae1b1 100644 --- a/src/mainboard/google/puff/variants/ambassador/overridetree.cb +++ b/src/mainboard/google/puff/variants/ambassador/overridetree.cb @@ -86,15 +86,15 @@ chip soc/intel/cannonlake register "usb3_ports[5]" = "USB3_PORT_DEFAULT(OC_SKIP)" # Type-A Port 4 # Bitmap for Wake Enable on USB attach/detach - register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ - USB_PORT_WAKE_ENABLE(2) | \ - USB_PORT_WAKE_ENABLE(3) | \ - USB_PORT_WAKE_ENABLE(5) | \ + register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | + USB_PORT_WAKE_ENABLE(2) | + USB_PORT_WAKE_ENABLE(3) | + USB_PORT_WAKE_ENABLE(5) | USB_PORT_WAKE_ENABLE(6)" - register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ - USB_PORT_WAKE_ENABLE(2) | \ - USB_PORT_WAKE_ENABLE(3) | \ - USB_PORT_WAKE_ENABLE(5) | \ + register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | + USB_PORT_WAKE_ENABLE(2) | + USB_PORT_WAKE_ENABLE(3) | + USB_PORT_WAKE_ENABLE(5) | USB_PORT_WAKE_ENABLE(6)" # Enable eMMC HS400 diff --git a/src/mainboard/google/puff/variants/dooly/overridetree.cb b/src/mainboard/google/puff/variants/dooly/overridetree.cb index a5cf3baa67..78324ed8af 100644 --- a/src/mainboard/google/puff/variants/dooly/overridetree.cb +++ b/src/mainboard/google/puff/variants/dooly/overridetree.cb @@ -79,9 +79,9 @@ chip soc/intel/cannonlake register "usb3_ports[5]" = "USB3_PORT_EMPTY" # Bitmap for Wake Enable on USB attach/detach - register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ + register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | USB_PORT_WAKE_ENABLE(3)" - register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ + register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | USB_PORT_WAKE_ENABLE(2)" # Enable eMMC HS400 diff --git a/src/mainboard/google/puff/variants/duffy/overridetree.cb b/src/mainboard/google/puff/variants/duffy/overridetree.cb index 0ccac51019..b1c50a2701 100644 --- a/src/mainboard/google/puff/variants/duffy/overridetree.cb +++ b/src/mainboard/google/puff/variants/duffy/overridetree.cb @@ -147,15 +147,15 @@ chip soc/intel/cannonlake }" # Type-A Port 4 # Bitmap for Wake Enable on USB attach/detach - register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ - USB_PORT_WAKE_ENABLE(2) | \ - USB_PORT_WAKE_ENABLE(3) | \ - USB_PORT_WAKE_ENABLE(5) | \ + register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | + USB_PORT_WAKE_ENABLE(2) | + USB_PORT_WAKE_ENABLE(3) | + USB_PORT_WAKE_ENABLE(5) | USB_PORT_WAKE_ENABLE(6)" - register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ - USB_PORT_WAKE_ENABLE(2) | \ - USB_PORT_WAKE_ENABLE(3) | \ - USB_PORT_WAKE_ENABLE(5) | \ + register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | + USB_PORT_WAKE_ENABLE(2) | + USB_PORT_WAKE_ENABLE(3) | + USB_PORT_WAKE_ENABLE(5) | USB_PORT_WAKE_ENABLE(6)" # Enable eMMC HS400 diff --git a/src/mainboard/google/puff/variants/faffy/overridetree.cb b/src/mainboard/google/puff/variants/faffy/overridetree.cb index 1a6838420a..83f0c166e8 100644 --- a/src/mainboard/google/puff/variants/faffy/overridetree.cb +++ b/src/mainboard/google/puff/variants/faffy/overridetree.cb @@ -155,15 +155,15 @@ chip soc/intel/cannonlake }" # Type-A Port 4 # Bitmap for Wake Enable on USB attach/detach - register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ - USB_PORT_WAKE_ENABLE(2) | \ - USB_PORT_WAKE_ENABLE(3) | \ - USB_PORT_WAKE_ENABLE(5) | \ + register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | + USB_PORT_WAKE_ENABLE(2) | + USB_PORT_WAKE_ENABLE(3) | + USB_PORT_WAKE_ENABLE(5) | USB_PORT_WAKE_ENABLE(6)" - register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ - USB_PORT_WAKE_ENABLE(2) | \ - USB_PORT_WAKE_ENABLE(3) | \ - USB_PORT_WAKE_ENABLE(5) | \ + register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | + USB_PORT_WAKE_ENABLE(2) | + USB_PORT_WAKE_ENABLE(3) | + USB_PORT_WAKE_ENABLE(5) | USB_PORT_WAKE_ENABLE(6)" # Enable eMMC HS400 diff --git a/src/mainboard/google/puff/variants/genesis/overridetree.cb b/src/mainboard/google/puff/variants/genesis/overridetree.cb index 45eda87332..6458f9f3f5 100644 --- a/src/mainboard/google/puff/variants/genesis/overridetree.cb +++ b/src/mainboard/google/puff/variants/genesis/overridetree.cb @@ -79,15 +79,15 @@ chip soc/intel/cannonlake register "usb3_ports[5]" = "USB3_PORT_DEFAULT(OC_SKIP)" # Type-A Port 4 # Bitmap for Wake Enable on USB attach/detach - register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ - USB_PORT_WAKE_ENABLE(2) | \ - USB_PORT_WAKE_ENABLE(3) | \ - USB_PORT_WAKE_ENABLE(5) | \ + register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | + USB_PORT_WAKE_ENABLE(2) | + USB_PORT_WAKE_ENABLE(3) | + USB_PORT_WAKE_ENABLE(5) | USB_PORT_WAKE_ENABLE(6)" - register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ - USB_PORT_WAKE_ENABLE(2) | \ - USB_PORT_WAKE_ENABLE(3) | \ - USB_PORT_WAKE_ENABLE(5) | \ + register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | + USB_PORT_WAKE_ENABLE(2) | + USB_PORT_WAKE_ENABLE(3) | + USB_PORT_WAKE_ENABLE(5) | USB_PORT_WAKE_ENABLE(6)" # Enable eMMC HS400 diff --git a/src/mainboard/google/puff/variants/kaisa/overridetree.cb b/src/mainboard/google/puff/variants/kaisa/overridetree.cb index a2af448b58..6a2dd7b3af 100644 --- a/src/mainboard/google/puff/variants/kaisa/overridetree.cb +++ b/src/mainboard/google/puff/variants/kaisa/overridetree.cb @@ -147,15 +147,15 @@ chip soc/intel/cannonlake }" # Type-A Port 4 # Bitmap for Wake Enable on USB attach/detach - register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ - USB_PORT_WAKE_ENABLE(2) | \ - USB_PORT_WAKE_ENABLE(3) | \ - USB_PORT_WAKE_ENABLE(5) | \ + register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | + USB_PORT_WAKE_ENABLE(2) | + USB_PORT_WAKE_ENABLE(3) | + USB_PORT_WAKE_ENABLE(5) | USB_PORT_WAKE_ENABLE(6)" - register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ - USB_PORT_WAKE_ENABLE(2) | \ - USB_PORT_WAKE_ENABLE(3) | \ - USB_PORT_WAKE_ENABLE(5) | \ + register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | + USB_PORT_WAKE_ENABLE(2) | + USB_PORT_WAKE_ENABLE(3) | + USB_PORT_WAKE_ENABLE(5) | USB_PORT_WAKE_ENABLE(6)" # Enable eMMC HS400 diff --git a/src/mainboard/google/puff/variants/moonbuggy/overridetree.cb b/src/mainboard/google/puff/variants/moonbuggy/overridetree.cb index 3c3b01b925..a89c56dde6 100644 --- a/src/mainboard/google/puff/variants/moonbuggy/overridetree.cb +++ b/src/mainboard/google/puff/variants/moonbuggy/overridetree.cb @@ -79,15 +79,15 @@ chip soc/intel/cannonlake register "usb3_ports[5]" = "USB3_PORT_DEFAULT(OC_SKIP)" # Type-A Port 4 # Bitmap for Wake Enable on USB attach/detach - register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ - USB_PORT_WAKE_ENABLE(2) | \ - USB_PORT_WAKE_ENABLE(3) | \ - USB_PORT_WAKE_ENABLE(5) | \ + register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | + USB_PORT_WAKE_ENABLE(2) | + USB_PORT_WAKE_ENABLE(3) | + USB_PORT_WAKE_ENABLE(5) | USB_PORT_WAKE_ENABLE(6)" - register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ - USB_PORT_WAKE_ENABLE(2) | \ - USB_PORT_WAKE_ENABLE(3) | \ - USB_PORT_WAKE_ENABLE(5) | \ + register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | + USB_PORT_WAKE_ENABLE(2) | + USB_PORT_WAKE_ENABLE(3) | + USB_PORT_WAKE_ENABLE(5) | USB_PORT_WAKE_ENABLE(6)" # Enable eMMC HS400 diff --git a/src/mainboard/google/puff/variants/noibat/overridetree.cb b/src/mainboard/google/puff/variants/noibat/overridetree.cb index 29f0fa2b9e..91a193977c 100644 --- a/src/mainboard/google/puff/variants/noibat/overridetree.cb +++ b/src/mainboard/google/puff/variants/noibat/overridetree.cb @@ -72,13 +72,13 @@ chip soc/intel/cannonlake register "usb3_ports[4]" = "USB3_PORT_DEFAULT(OC0)" # Type-A Port 0 # Bitmap for Wake Enable on USB attach/detach - register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ - USB_PORT_WAKE_ENABLE(2) | \ - USB_PORT_WAKE_ENABLE(3) | \ + register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | + USB_PORT_WAKE_ENABLE(2) | + USB_PORT_WAKE_ENABLE(3) | USB_PORT_WAKE_ENABLE(6)" - register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ - USB_PORT_WAKE_ENABLE(2) | \ - USB_PORT_WAKE_ENABLE(3) | \ + register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | + USB_PORT_WAKE_ENABLE(2) | + USB_PORT_WAKE_ENABLE(3) | USB_PORT_WAKE_ENABLE(5)" # Enable eMMC HS400 diff --git a/src/mainboard/google/puff/variants/puff/overridetree.cb b/src/mainboard/google/puff/variants/puff/overridetree.cb index da0001a02b..3cd6a01d21 100644 --- a/src/mainboard/google/puff/variants/puff/overridetree.cb +++ b/src/mainboard/google/puff/variants/puff/overridetree.cb @@ -80,15 +80,15 @@ chip soc/intel/cannonlake register "usb3_ports[5]" = "USB3_PORT_DEFAULT(OC_SKIP)" # Type-A Port 4 # Bitmap for Wake Enable on USB attach/detach - register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ - USB_PORT_WAKE_ENABLE(3) | \ - USB_PORT_WAKE_ENABLE(4) | \ - USB_PORT_WAKE_ENABLE(5) | \ + register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | + USB_PORT_WAKE_ENABLE(3) | + USB_PORT_WAKE_ENABLE(4) | + USB_PORT_WAKE_ENABLE(5) | USB_PORT_WAKE_ENABLE(6)" - register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ - USB_PORT_WAKE_ENABLE(2) | \ - USB_PORT_WAKE_ENABLE(3) | \ - USB_PORT_WAKE_ENABLE(5) | \ + register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | + USB_PORT_WAKE_ENABLE(2) | + USB_PORT_WAKE_ENABLE(3) | + USB_PORT_WAKE_ENABLE(5) | USB_PORT_WAKE_ENABLE(6)" # Enable eMMC HS400 diff --git a/src/mainboard/google/puff/variants/scout/overridetree.cb b/src/mainboard/google/puff/variants/scout/overridetree.cb index 324f9fbac8..5462e9b700 100644 --- a/src/mainboard/google/puff/variants/scout/overridetree.cb +++ b/src/mainboard/google/puff/variants/scout/overridetree.cb @@ -86,15 +86,15 @@ chip soc/intel/cannonlake register "usb3_ports[5]" = "USB3_PORT_DEFAULT(OC_SKIP)" # Type-A Port 4 # Bitmap for Wake Enable on USB attach/detach - register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ - USB_PORT_WAKE_ENABLE(2) | \ - USB_PORT_WAKE_ENABLE(3) | \ - USB_PORT_WAKE_ENABLE(5) | \ + register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | + USB_PORT_WAKE_ENABLE(2) | + USB_PORT_WAKE_ENABLE(3) | + USB_PORT_WAKE_ENABLE(5) | USB_PORT_WAKE_ENABLE(6)" - register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ - USB_PORT_WAKE_ENABLE(2) | \ - USB_PORT_WAKE_ENABLE(3) | \ - USB_PORT_WAKE_ENABLE(5) | \ + register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | + USB_PORT_WAKE_ENABLE(2) | + USB_PORT_WAKE_ENABLE(3) | + USB_PORT_WAKE_ENABLE(5) | USB_PORT_WAKE_ENABLE(6)" # Enable eMMC HS400 diff --git a/src/mainboard/google/puff/variants/wyvern/overridetree.cb b/src/mainboard/google/puff/variants/wyvern/overridetree.cb index 0aac160cc7..60ba0bcf51 100644 --- a/src/mainboard/google/puff/variants/wyvern/overridetree.cb +++ b/src/mainboard/google/puff/variants/wyvern/overridetree.cb @@ -83,13 +83,13 @@ chip soc/intel/cannonlake register "usb3_ports[5]" = "USB3_PORT_DEFAULT(OC_SKIP)" # Type-A Port 4 # Bitmap for Wake Enable on USB attach/detach - register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ - USB_PORT_WAKE_ENABLE(2) | \ - USB_PORT_WAKE_ENABLE(3) | \ + register "usb2_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | + USB_PORT_WAKE_ENABLE(2) | + USB_PORT_WAKE_ENABLE(3) | USB_PORT_WAKE_ENABLE(6)" - register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | \ - USB_PORT_WAKE_ENABLE(2) | \ - USB_PORT_WAKE_ENABLE(3) | \ + register "usb3_wake_enable_bitmap" = "USB_PORT_WAKE_ENABLE(1) | + USB_PORT_WAKE_ENABLE(2) | + USB_PORT_WAKE_ENABLE(3) | USB_PORT_WAKE_ENABLE(5)" # Enable eMMC HS400 diff --git a/src/mainboard/google/sarien/variants/arcada/devicetree.cb b/src/mainboard/google/sarien/variants/arcada/devicetree.cb index 14df721320..93ec7cf9ca 100644 --- a/src/mainboard/google/sarien/variants/arcada/devicetree.cb +++ b/src/mainboard/google/sarien/variants/arcada/devicetree.cb @@ -131,13 +131,13 @@ chip soc/intel/cannonlake register "usb2_ports[2]" = "USB2_PORT_LONG(OC1)" # Right Type-A Port register "usb2_ports[5]" = "USB2_PORT_LONG(OC_SKIP)" # Camera register "usb2_ports[6]" = "{ - .enable = 1, \ - .ocpin = OC_SKIP, \ - .tx_bias = USB2_BIAS_0MV, \ - .tx_emp_enable = USB2_DE_EMP_ON_PRE_EMP_ON, \ - .pre_emp_bias = USB2_BIAS_28P15MV, \ - .pre_emp_bit = USB2_HALF_BIT_PRE_EMP, \ - }" # WWAN + .enable = 1, + .ocpin = OC_SKIP, + .tx_bias = USB2_BIAS_0MV, + .tx_emp_enable = USB2_DE_EMP_ON_PRE_EMP_ON, + .pre_emp_bias = USB2_BIAS_28P15MV, + .pre_emp_bit = USB2_HALF_BIT_PRE_EMP, + }" # WWAN register "usb2_ports[7]" = "USB2_PORT_MID(OC_SKIP)" # USH register "usb2_ports[8]" = "USB2_PORT_MID(OC_SKIP)" # Fingerprint register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)" # Bluetooth |