summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaulik V Vaghela <maulik.v.vaghela@intel.com>2021-06-29 18:07:55 +0530
committerPatrick Georgi <pgeorgi@google.com>2021-07-12 07:29:39 +0000
commit91c38c8c8dc541e86e8f3d20bcc501caeea8c1df (patch)
tree3e33d1e454591bf2848fef7ce8bc827bea6eb51e
parent0f7e08622984f9c749b4d4327e22bdaa25cd0f0c (diff)
mb/google/brya,primus,voxel: Update controller field for tbt_dma entries
We need to reference correct USB port number for driver to identify type-C port number correctly. BUG=b:189476816 BRANCH=None TEST=Check the transactions are happening on correct port. Also checked retimer firmware update on both the ports. Change-Id: I20c088ee81610155067abad086eba8d72f73ad60 Signed-off-by: Maulik V Vaghela <maulik.v.vaghela@intel.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/55946 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
-rw-r--r--src/mainboard/google/brya/variants/brya0/overridetree.cb10
-rw-r--r--src/mainboard/google/brya/variants/primus/overridetree.cb10
-rw-r--r--src/mainboard/google/volteer/variants/voxel/overridetree.cb9
3 files changed, 12 insertions, 17 deletions
diff --git a/src/mainboard/google/brya/variants/brya0/overridetree.cb b/src/mainboard/google/brya/variants/brya0/overridetree.cb
index 9584b277b1..eb0af9981d 100644
--- a/src/mainboard/google/brya/variants/brya0/overridetree.cb
+++ b/src/mainboard/google/brya/variants/brya0/overridetree.cb
@@ -165,17 +165,15 @@ chip soc/intel/alderlake
end
device ref tcss_dma0 on
chip drivers/intel/usb4/retimer
- register "dfp" = "{
- [0] = {.power_gpio = ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E4),
- .group = ACPI_PLD_GROUP(1, 1),}}"
+ register "dfp[0].power_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E4)"
+ use tcss_usb3_port1 as dfp[0].typec_port
device generic 0 on end
end
end
device ref tcss_dma1 on
chip drivers/intel/usb4/retimer
- register "dfp" = "{
- [0] = {.power_gpio = ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E4),
- .group = ACPI_PLD_GROUP(3, 1)}}"
+ register "dfp[0].power_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E4)"
+ use tcss_usb3_port3 as dfp[0].typec_port
device generic 0 on end
end
end
diff --git a/src/mainboard/google/brya/variants/primus/overridetree.cb b/src/mainboard/google/brya/variants/primus/overridetree.cb
index 36d015da6a..2d68c367c3 100644
--- a/src/mainboard/google/brya/variants/primus/overridetree.cb
+++ b/src/mainboard/google/brya/variants/primus/overridetree.cb
@@ -158,17 +158,15 @@ chip soc/intel/alderlake
end #PCIE3 BH799BB
device ref tcss_dma0 on
chip drivers/intel/usb4/retimer
- register "dfp" = "{
- [0] = {.power_gpio = ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E4),
- .group = ACPI_PLD_GROUP(1, 1),}}"
+ register "dfp[0].power_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E4)"
+ use tcss_usb3_port1 as dfp[0].typec_port
device generic 0 on end
end
end
device ref tcss_dma1 on
chip drivers/intel/usb4/retimer
- register "dfp" = "{
- [0] = {.power_gpio = ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E4),
- .group = ACPI_PLD_GROUP(3, 1)}}"
+ register "dfp[0].power_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E4)"
+ use tcss_usb3_port3 as dfp[0].typec_port
device generic 0 on end
end
end
diff --git a/src/mainboard/google/volteer/variants/voxel/overridetree.cb b/src/mainboard/google/volteer/variants/voxel/overridetree.cb
index b3619b2697..7eabfa4d4a 100644
--- a/src/mainboard/google/volteer/variants/voxel/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/voxel/overridetree.cb
@@ -220,11 +220,10 @@ chip soc/intel/tigerlake
probe DB_USB USB4_GEN2
probe DB_USB USB4_GEN3
chip drivers/intel/usb4/retimer
- register "dfp" = "{
- [0] = {.power_gpio = ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_H10),
- .group = ACPI_PLD_GROUP(3, 2),},
- [1] = {.power_gpio = ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_H10),
- .group = ACPI_PLD_GROUP(2, 2),}}"
+ register "dfp[0].power_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_H10)"
+ register "dfp[1].power_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_H10)"
+ use tcss_usb3_port3 as dfp[0].typec_port
+ use tcss_usb3_port2 as dfp[1].typec_port
device generic 0 on end
end
end