Attention is currently required from: Alexander Couzens.
Keith Hui has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/85944?usp=email )
Change subject: mb/lenovo/x131e: Remove old USB configurations ......................................................................
mb/lenovo/x131e: Remove old USB configurations
As of commit a911b7584820 ("mb/*: Remove old USB configurations from SNB/IVB boards") USB configurations are drawn exclusively from devicetree. These stuff should have been removed then.
Drop early_init.c that only carries the old USB port config.
Drop xhci_overcurrent_mapping devicetree setting that is now derived from usb_port_config. This devicetree setting does NOT match, so the value programmed into XOCM register will change and requires testing.
Change-Id: I6bdc9a188b2baa2207aaccb46821b58f97ff7da6 Signed-off-by: Keith Hui buurin@gmail.com --- M src/mainboard/lenovo/x131e/Makefile.mk M src/mainboard/lenovo/x131e/devicetree.cb D src/mainboard/lenovo/x131e/early_init.c 3 files changed, 0 insertions(+), 23 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/44/85944/1
diff --git a/src/mainboard/lenovo/x131e/Makefile.mk b/src/mainboard/lenovo/x131e/Makefile.mk index e4b6fbf..7611194 100644 --- a/src/mainboard/lenovo/x131e/Makefile.mk +++ b/src/mainboard/lenovo/x131e/Makefile.mk @@ -4,5 +4,3 @@ romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads -bootblock-y += early_init.c -romstage-y += early_init.c diff --git a/src/mainboard/lenovo/x131e/devicetree.cb b/src/mainboard/lenovo/x131e/devicetree.cb index b74e78f..aa2350f 100644 --- a/src/mainboard/lenovo/x131e/devicetree.cb +++ b/src/mainboard/lenovo/x131e/devicetree.cb @@ -42,7 +42,6 @@
register "xhci_switchable_ports" = "0xf" register "superspeed_capable_ports" = "0xf" - register "xhci_overcurrent_mapping" = "0x00000c03" register "usb_port_config" = "{ {1, 1, 0}, /* P0: USB 3.0 1 (OC0) */ {1, 1, 0}, /* P1: USB 3.0 2 (OC0) */ diff --git a/src/mainboard/lenovo/x131e/early_init.c b/src/mainboard/lenovo/x131e/early_init.c deleted file mode 100644 index 410dea6..0000000 --- a/src/mainboard/lenovo/x131e/early_init.c +++ /dev/null @@ -1,20 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <southbridge/intel/bd82x6x/pch.h> - -const struct southbridge_usb_port mainboard_usb_ports[] = { - {1, 1, 0}, /* P0: USB 3.0 1 (OC0) */ - {1, 1, 0}, /* P1: USB 3.0 2 (OC0) */ - {0, 0, 0}, - {1, 1, -1}, /* P3: Camera (no OC) */ - {1, 0, -1}, /* P4: WLAN (no OC) */ - {1, 0, -1}, /* P5: WWAN (no OC) */ - {0, 0, 0}, - {0, 0, 0}, - {0, 0, 0}, - {1, 1, 4}, /* P9: USB 2.0 (AUO4) (OC4) */ - {0, 0, 0}, - {0, 0, 0}, - {0, 0, 0}, - {1, 0, -1}, /* P13: Bluetooth (no OC) */ -};