Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/44064 )
Change subject: mb/google/zork: use defines for all DXIO port numbers ......................................................................
mb/google/zork: use defines for all DXIO port numbers
Change-Id: I83c8b3a4c5d70ffbf9f2f19975cbf3a021db4ec9 Signed-off-by: Felix Held felix-coreboot@felixheld.de --- M src/mainboard/google/zork/variants/baseboard/fsps_baseboard_trembyle.c M src/mainboard/google/zork/variants/baseboard/include/baseboard/gpio.h 2 files changed, 10 insertions(+), 9 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/64/44064/1
diff --git a/src/mainboard/google/zork/variants/baseboard/fsps_baseboard_trembyle.c b/src/mainboard/google/zork/variants/baseboard/fsps_baseboard_trembyle.c index 75c2211..5734df8 100644 --- a/src/mainboard/google/zork/variants/baseboard/fsps_baseboard_trembyle.c +++ b/src/mainboard/google/zork/variants/baseboard/fsps_baseboard_trembyle.c @@ -23,8 +23,8 @@ // NVME SSD .port_present = true, .engine_type = PCIE_ENGINE, - .start_logical_lane = 0, - .end_logical_lane = 3, + .start_logical_lane = NVME_START_LANE, + .end_logical_lane = NVME_END_LANE_PICASSO, .device_number = 1, .function_number = 7, .link_aspm = ASPM_L1, @@ -37,8 +37,8 @@ // WLAN .port_present = true, .engine_type = PCIE_ENGINE, - .start_logical_lane = 4, - .end_logical_lane = 4, + .start_logical_lane = WLAN_START_LANE, + .end_logical_lane = WLAN_END_LANE, .device_number = 1, .function_number = 2, .link_aspm = ASPM_L1, @@ -52,8 +52,8 @@ // SD Reader .port_present = true, .engine_type = PCIE_ENGINE, - .start_logical_lane = 5, - .end_logical_lane = 5, + .start_logical_lane = SD_START_LANE, + .end_logical_lane = SD_END_LANE, .device_number = 1, .function_number = 3, .link_aspm = ASPM_L1, @@ -70,7 +70,7 @@ .port_present = true, .engine_type = PCIE_ENGINE, .start_logical_lane = NVME_START_LANE, - .end_logical_lane = NVME_END_LANE, + .end_logical_lane = NVME_END_LANE_DALI, .device_number = 1, .function_number = 7, .link_aspm = ASPM_L1, diff --git a/src/mainboard/google/zork/variants/baseboard/include/baseboard/gpio.h b/src/mainboard/google/zork/variants/baseboard/include/baseboard/gpio.h index 84433e0..f92a755 100644 --- a/src/mainboard/google/zork/variants/baseboard/include/baseboard/gpio.h +++ b/src/mainboard/google/zork/variants/baseboard/include/baseboard/gpio.h @@ -17,9 +17,10 @@ #define WLAN_END_LANE 0 #define SD_START_LANE 1 #define SD_END_LANE 1 -#else +#else /* BOARD_GOOGLE_BASEBOARD_TREMBYLE */ #define NVME_START_LANE 0 -#define NVME_END_LANE 1 +#define NVME_END_LANE_DALI 1 +#define NVME_END_LANE_PICASSO 3 #define WLAN_START_LANE 4 #define WLAN_END_LANE 4 #define SD_START_LANE 5