mb/google/taniks,vell;mb/intel/adlrvp_n_ext_ec: fix build error

Commit d448f8ce0f (drivers/intel/pmc_mux/
conn: Change usb{23}_port_number fields to device pointers) changed the
way the pmc_mux/conn driver gets the corresponding USB ports from the
devicetree. This change didn't include the corresponding change for the
Taniks and Vell variants of the Google Brya project and the Intel
adlrvp_n_ext_ec board which probably weren't in the tree at the time the
patch referenced above was created. This patch ports the needed change
forward to those boards to fix the build of the upstream tree.

TEST=None

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: Id295cd11fbbfe038534b154215a6de7c1ac13e0e
Reviewed-on: https://review.coreboot.org/c/coreboot/+/60329
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Felix Held 2021-12-24 02:09:45 +01:00 committed by Nico Huber
parent 112fde01ab
commit 30f4c531ac
3 changed files with 14 additions and 14 deletions

View File

@ -365,13 +365,13 @@ chip soc/intel/alderlake
chip drivers/intel/pmc_mux chip drivers/intel/pmc_mux
device generic 0 on device generic 0 on
chip drivers/intel/pmc_mux/conn chip drivers/intel/pmc_mux/conn
register "usb2_port_number" = "1" use usb2_port1 as usb2_port
register "usb3_port_number" = "1" use tcss_usb3_port1 as usb3_port
device generic 0 alias conn0 on end device generic 0 alias conn0 on end
end end
chip drivers/intel/pmc_mux/conn chip drivers/intel/pmc_mux/conn
register "usb2_port_number" = "3" use usb2_port3 as usb2_port
register "usb3_port_number" = "3" use tcss_usb3_port3 as usb3_port
device generic 2 alias conn1 on end device generic 2 alias conn1 on end
end end
end end

View File

@ -253,13 +253,13 @@ chip soc/intel/alderlake
chip drivers/intel/pmc_mux chip drivers/intel/pmc_mux
device generic 0 on device generic 0 on
chip drivers/intel/pmc_mux/conn chip drivers/intel/pmc_mux/conn
register "usb2_port_number" = "1" use usb2_port1 as usb2_port
register "usb3_port_number" = "1" use tcss_usb3_port1 as usb3_port
device generic 0 alias conn0 on end device generic 0 alias conn0 on end
end end
chip drivers/intel/pmc_mux/conn chip drivers/intel/pmc_mux/conn
register "usb2_port_number" = "3" use usb2_port3 as usb2_port
register "usb3_port_number" = "3" use tcss_usb3_port3 as usb3_port
device generic 1 alias conn1 on end device generic 1 alias conn1 on end
end end
end end

View File

@ -34,22 +34,22 @@ chip soc/intel/alderlake
chip drivers/intel/pmc_mux chip drivers/intel/pmc_mux
device generic 0 on device generic 0 on
chip drivers/intel/pmc_mux/conn chip drivers/intel/pmc_mux/conn
register "usb2_port_number" = "1" use usb2_port1 as usb2_port
register "usb3_port_number" = "1" use tcss_usb3_port1 as usb3_port
# SBU is fixed, HSL follows CC # SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL" register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 0 alias conn0 on end device generic 0 alias conn0 on end
end end
chip drivers/intel/pmc_mux/conn chip drivers/intel/pmc_mux/conn
register "usb2_port_number" = "2" use usb2_port2 as usb2_port
register "usb3_port_number" = "2" use tcss_usb3_port2 as usb3_port
# SBU is fixed, HSL follows CC # SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL" register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 1 alias conn1 on end device generic 1 alias conn1 on end
end end
chip drivers/intel/pmc_mux/conn chip drivers/intel/pmc_mux/conn
register "usb2_port_number" = "3" use usb2_port3 as usb2_port
register "usb3_port_number" = "3" use tcss_usb3_port3 as usb3_port
# SBU is fixed, HSL follows CC # SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL" register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 2 alias conn2 on end device generic 2 alias conn2 on end