Václav Straka has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/85831?usp=email )
Change subject: mb/hp/pro_3500_series: Move usb configuration ......................................................................
mb/hp/pro_3500_series: Move usb configuration
Since commit 943b5409147 USB configurations are read from the southbridge devicetree
This change only moves the USB configuration from early_init.c to the devicetree
Change-Id: I69f1f800e4e2de5367795400d619bf9c000ff184 Signed-off-by: Vesek venda.straka@gmail.com --- M src/mainboard/hp/pro_3500_series/devicetree.cb M src/mainboard/hp/pro_3500_series/early_init.c 2 files changed, 16 insertions(+), 17 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/31/85831/1
diff --git a/src/mainboard/hp/pro_3500_series/devicetree.cb b/src/mainboard/hp/pro_3500_series/devicetree.cb index cf75313..3d9cf61 100644 --- a/src/mainboard/hp/pro_3500_series/devicetree.cb +++ b/src/mainboard/hp/pro_3500_series/devicetree.cb @@ -22,6 +22,22 @@ register "sata_port_map" = "0x33" register "spi_lvscc" = "0x2005" register "spi_uvscc" = "0x2005" + register "usb_port_config" = "{ + { 1, 6, 0 }, + { 1, 6, 0 }, + { 1, 6, 1 }, + { 1, 9, 1 }, + { 1, 10, 2 }, + { 1, 11, 2 }, + { 1, 6, 3 }, + { 1, 6, 3 }, + { 1, 6, 4 }, + { 1, 12, 4 }, + { 1, 6, 6 }, + { 1, 11, 5 }, + { 1, 6, 5 }, + { 1, 6, 6 }, + }" device ref ehci2 on end device ref hda on end device ref pcie_rp2 on end # MINI_PCIE diff --git a/src/mainboard/hp/pro_3500_series/early_init.c b/src/mainboard/hp/pro_3500_series/early_init.c index fbf73cfb..1e149b5 100644 --- a/src/mainboard/hp/pro_3500_series/early_init.c +++ b/src/mainboard/hp/pro_3500_series/early_init.c @@ -8,23 +8,6 @@ #include "common_defines.h" #include "led.h"
-const struct southbridge_usb_port mainboard_usb_ports[] = { - { 1, 6, 0 }, - { 1, 6, 0 }, - { 1, 6, 1 }, - { 1, 9, 1 }, - { 1, 10, 2 }, - { 1, 11, 2 }, - { 1, 6, 3 }, - { 1, 6, 3 }, - { 1, 6, 4 }, - { 1, 12, 4 }, - { 1, 6, 6 }, - { 1, 11, 5 }, - { 1, 6, 5 }, - { 1, 6, 6 }, -}; - void bootblock_mainboard_early_init(void) { pci_write_config16(PCH_LPC_DEV, LPC_EN, CNF1_LPC_EN | KBC_LPC_EN);