Keith Hui has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/85940?usp=email )
Change subject: mb/hp/snb_ivb_laptops: Remove old USB configurations ......................................................................
mb/hp/snb_ivb_laptops: 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.
Change-Id: Idc9e7892f978e52cfb30eb0239fcfd394c9f484e Signed-off-by: Keith Hui buurin@gmail.com --- M src/mainboard/hp/snb_ivb_laptops/variants/2170p/early_init.c M src/mainboard/hp/snb_ivb_laptops/variants/2560p/early_init.c M src/mainboard/hp/snb_ivb_laptops/variants/2570p/early_init.c M src/mainboard/hp/snb_ivb_laptops/variants/2760p/early_init.c M src/mainboard/hp/snb_ivb_laptops/variants/8460p/early_init.c M src/mainboard/hp/snb_ivb_laptops/variants/8470p/early_init.c M src/mainboard/hp/snb_ivb_laptops/variants/8770w/early_init.c M src/mainboard/hp/snb_ivb_laptops/variants/folio_9470m/early_init.c M src/mainboard/hp/snb_ivb_laptops/variants/probook_6360b/early_init.c M src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/early_init.c 10 files changed, 0 insertions(+), 180 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/40/85940/1
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/2170p/early_init.c b/src/mainboard/hp/snb_ivb_laptops/variants/2170p/early_init.c index e5a9da7..7de38ed 100644 --- a/src/mainboard/hp/snb_ivb_laptops/variants/2170p/early_init.c +++ b/src/mainboard/hp/snb_ivb_laptops/variants/2170p/early_init.c @@ -1,29 +1,11 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <bootblock_common.h> -#include <southbridge/intel/bd82x6x/pch.h> #include <superio/smsc/lpc47n217/lpc47n217.h> #include <ec/hp/kbc1126/ec.h>
#define SERIAL_DEV PNP_DEV(0x4e, LPC47N217_SP1)
-const struct southbridge_usb_port mainboard_usb_ports[] = { - { 1, 1, 0 }, /* SSP1: dock */ - { 1, 1, 0 }, /* SSP2: left, EHCI Debug */ - { 0, 1, 1 }, /* SSP3 */ - { 1, 1, 1 }, /* SSP4: right */ - { 0, 0, 2 }, /* B0P5 */ - { 0, 0, 2 }, /* B0P6 */ - { 0, 0, 3 }, /* B0P7 */ - { 1, 0, 3 }, /* B0P8: smart card reader */ - { 1, 0, 4 }, /* B1P1: fingerprint reader */ - { 1, 0, 4 }, /* B1P2: (EHCI Debug) wlan usb */ - { 1, 1, 5 }, /* B1P3: Camera */ - { 1, 0, 5 }, /* B1P4 */ - { 1, 0, 6 }, /* B1P5: wwan USB */ - { 0, 0, 6 }, /* B1P6 */ -}; - void bootblock_mainboard_early_init(void) { lpc47n217_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/2560p/early_init.c b/src/mainboard/hp/snb_ivb_laptops/variants/2560p/early_init.c index 9be2036..a3627bf 100644 --- a/src/mainboard/hp/snb_ivb_laptops/variants/2560p/early_init.c +++ b/src/mainboard/hp/snb_ivb_laptops/variants/2560p/early_init.c @@ -1,26 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */
#include <bootblock_common.h> -#include <southbridge/intel/bd82x6x/pch.h> #include <ec/hp/kbc1126/ec.h>
-const struct southbridge_usb_port mainboard_usb_ports[] = { - { 1, 1, 0 }, /* back bottom USB port, USB debug */ - { 1, 1, 0 }, /* back upper USB port */ - { 1, 1, 1 }, /* eSATA */ - { 1, 1, 1 }, /* webcam */ - { 1, 0, 2 }, - { 1, 0, 2 }, /* bluetooth */ - { 1, 0, 3 }, - { 1, 0, 3 }, /* smartcard */ - { 1, 1, 4 }, /* fingerprint reader */ - { 1, 1, 4 }, /* WWAN */ - { 0, 0, 5 }, - { 1, 0, 5 }, /* docking */ - { 0, 0, 6 }, - { 0, 0, 6 }, -}; - void bootblock_mainboard_early_init(void) { kbc1126_enter_conf(); diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/2570p/early_init.c b/src/mainboard/hp/snb_ivb_laptops/variants/2570p/early_init.c index aa4e9da..16c8d55 100644 --- a/src/mainboard/hp/snb_ivb_laptops/variants/2570p/early_init.c +++ b/src/mainboard/hp/snb_ivb_laptops/variants/2570p/early_init.c @@ -1,26 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <bootblock_common.h> -#include <southbridge/intel/bd82x6x/pch.h> #include <ec/hp/kbc1126/ec.h>
-const struct southbridge_usb_port mainboard_usb_ports[] = { - { 1, 1, 0 }, - { 0, 1, 0 }, - { 1, 1, 1 }, - { 1, 1, 1 }, - { 1, 0, 2 }, - { 1, 0, 2 }, /* bluetooth */ - { 0, 0, 3 }, - { 1, 0, 3 }, /* smartcard */ - { 1, 1, 4 }, - { 1, 1, 4 }, /* mainboard USB 2.0 */ - { 1, 0, 5 }, /* camera */ - { 0, 0, 5 }, - { 1, 0, 6 }, /* WWAN */ - { 0, 0, 6 }, -}; - void bootblock_mainboard_early_init(void) { kbc1126_enter_conf(); diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/2760p/early_init.c b/src/mainboard/hp/snb_ivb_laptops/variants/2760p/early_init.c index ed40b31..56f40bd 100644 --- a/src/mainboard/hp/snb_ivb_laptops/variants/2760p/early_init.c +++ b/src/mainboard/hp/snb_ivb_laptops/variants/2760p/early_init.c @@ -1,26 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <bootblock_common.h> -#include <southbridge/intel/bd82x6x/pch.h> #include <ec/hp/kbc1126/ec.h>
-const struct southbridge_usb_port mainboard_usb_ports[] = { - { 1, 1, 0 }, - { 1, 1, 0 }, - { 1, 1, 1 }, - { 1, 1, 1 }, - { 1, 0, 2 }, - { 1, 1, 2 }, - { 0, 0, 3 }, - { 1, 0, 3 }, - { 1, 1, 4 }, - { 1, 0, 4 }, - { 0, 0, 5 }, - { 1, 1, 5 }, - { 0, 0, 6 }, - { 1, 1, 6 }, -}; - void bootblock_mainboard_early_init(void) { kbc1126_enter_conf(); diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/8460p/early_init.c b/src/mainboard/hp/snb_ivb_laptops/variants/8460p/early_init.c index e930e6b..7de38ed 100644 --- a/src/mainboard/hp/snb_ivb_laptops/variants/8460p/early_init.c +++ b/src/mainboard/hp/snb_ivb_laptops/variants/8460p/early_init.c @@ -1,29 +1,11 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <bootblock_common.h> -#include <southbridge/intel/bd82x6x/pch.h> #include <superio/smsc/lpc47n217/lpc47n217.h> #include <ec/hp/kbc1126/ec.h>
#define SERIAL_DEV PNP_DEV(0x4e, LPC47N217_SP1)
-const struct southbridge_usb_port mainboard_usb_ports[] = { - { 1, 1, 0 }, /* USB0, eSATA */ - { 1, 0, 0 }, /* USB charger */ - { 0, 1, 1 }, - { 1, 1, 1 }, /* camera */ - { 1, 0, 2 }, /* USB4 expresscard */ - { 1, 0, 2 }, /* bluetooth */ - { 0, 0, 3 }, - { 1, 0, 3 }, /* smartcard */ - { 1, 1, 4 }, /* fingerprint */ - { 1, 1, 4 }, /* WWAN */ - { 1, 0, 5 }, /* CONN */ - { 1, 0, 5 }, /* docking */ - { 1, 0, 6 }, /* CONN */ - { 1, 0, 6 }, /* docking */ -}; - void bootblock_mainboard_early_init(void) { lpc47n217_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/8470p/early_init.c b/src/mainboard/hp/snb_ivb_laptops/variants/8470p/early_init.c index 87e46ff..7de38ed 100644 --- a/src/mainboard/hp/snb_ivb_laptops/variants/8470p/early_init.c +++ b/src/mainboard/hp/snb_ivb_laptops/variants/8470p/early_init.c @@ -1,29 +1,11 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <bootblock_common.h> -#include <southbridge/intel/bd82x6x/pch.h> #include <superio/smsc/lpc47n217/lpc47n217.h> #include <ec/hp/kbc1126/ec.h>
#define SERIAL_DEV PNP_DEV(0x4e, LPC47N217_SP1)
-const struct southbridge_usb_port mainboard_usb_ports[] = { - { 1, 1, 0 }, - { 1, 1, 0 }, - { 1, 1, 1 }, - { 1, 1, 1 }, - { 1, 0, 2 }, - { 0, 0, 2 }, - { 0, 0, 3 }, - { 1, 0, 3 }, - { 1, 1, 4 }, - { 1, 1, 4 }, - { 1, 0, 5 }, - { 1, 0, 5 }, - { 1, 0, 6 }, - { 1, 0, 6 }, -}; - void bootblock_mainboard_early_init(void) { lpc47n217_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/8770w/early_init.c b/src/mainboard/hp/snb_ivb_laptops/variants/8770w/early_init.c index 32b03da..7de38ed 100644 --- a/src/mainboard/hp/snb_ivb_laptops/variants/8770w/early_init.c +++ b/src/mainboard/hp/snb_ivb_laptops/variants/8770w/early_init.c @@ -1,29 +1,11 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <bootblock_common.h> -#include <southbridge/intel/bd82x6x/pch.h> #include <superio/smsc/lpc47n217/lpc47n217.h> #include <ec/hp/kbc1126/ec.h>
#define SERIAL_DEV PNP_DEV(0x4e, LPC47N217_SP1)
-const struct southbridge_usb_port mainboard_usb_ports[] = { - { 1, 1, 0 }, /* Dock USB3.0 */ - { 1, 1, 0 }, /* Conn */ - { 1, 1, 1 }, /* USB 3.0 */ - { 1, 1, 1 }, /* USB 3.0 */ - { 1, 0, 2 }, /* Express Card */ - { 1, 0, 2 }, /* Bluetooth */ - { 0, 0, 3 }, - { 1, 0, 3 }, /* Smart Card */ - { 1, 1, 4 }, /* Fingerprint Reader */ - { 1, 1, 4 }, /* Conn (Charger) */ - { 1, 0, 5 }, /* Camera */ - { 1, 0, 5 }, /* Dock */ - { 1, 0, 6 }, /* WWAN */ - { 1, 0, 6 }, /* Conn (eSATA Combo) */ -}; - void bootblock_mainboard_early_init(void) { lpc47n217_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/folio_9470m/early_init.c b/src/mainboard/hp/snb_ivb_laptops/variants/folio_9470m/early_init.c index 24100be..dd90d0d 100644 --- a/src/mainboard/hp/snb_ivb_laptops/variants/folio_9470m/early_init.c +++ b/src/mainboard/hp/snb_ivb_laptops/variants/folio_9470m/early_init.c @@ -1,26 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <bootblock_common.h> -#include <southbridge/intel/bd82x6x/pch.h> #include <ec/hp/kbc1126/ec.h>
-const struct southbridge_usb_port mainboard_usb_ports[] = { - { 1, 1, 0 }, /* SSP1: dock */ - { 1, 1, 0 }, /* SSP2: left, EHCI Debug */ - { 1, 1, 1 }, /* SSP3: right back side */ - { 1, 1, 1 }, /* SSP4: right front side */ - { 1, 0, 2 }, /* B0P5 */ - { 1, 0, 2 }, /* B0P6: wlan USB */ - { 0, 0, 3 }, /* B0P7 */ - { 1, 1, 3 }, /* B0P8: smart card reader */ - { 1, 1, 4 }, /* B1P1: fingerprint reader */ - { 0, 0, 4 }, /* B1P2: (EHCI Debug, not connected) */ - { 1, 1, 5 }, /* B1P3: Camera */ - { 0, 0, 5 }, /* B1P4 */ - { 1, 1, 6 }, /* B1P5: wwan USB */ - { 0, 0, 6 }, /* B1P6 */ -}; - void bootblock_mainboard_early_init(void) { kbc1126_enter_conf(); diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/probook_6360b/early_init.c b/src/mainboard/hp/snb_ivb_laptops/variants/probook_6360b/early_init.c index 623aaf1..9502867 100644 --- a/src/mainboard/hp/snb_ivb_laptops/variants/probook_6360b/early_init.c +++ b/src/mainboard/hp/snb_ivb_laptops/variants/probook_6360b/early_init.c @@ -1,29 +1,11 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */
#include <bootblock_common.h> -#include <southbridge/intel/bd82x6x/pch.h> #include <superio/smsc/lpc47n217/lpc47n217.h> #include <ec/hp/kbc1126/ec.h>
#define SERIAL_DEV PNP_DEV(0x4e, LPC47N217_SP1)
-const struct southbridge_usb_port mainboard_usb_ports[] = { - { 1, 1, 0 }, /* left front */ - { 1, 1, 0 }, /* left rear, debug */ - { 1, 1, 1 }, /* eSATA */ - { 1, 1, 1 }, /* webcam */ - { 1, 0, 2 }, - { 1, 0, 2 }, /* bluetooth */ - { 0, 0, 3 }, - { 0, 0, 3 }, - { 1, 1, 4 }, /* fingerprint reader */ - { 1, 1, 4 }, /* WWAN */ - { 1, 0, 5 }, /* right */ - { 1, 0, 5 }, - { 1, 0, 6 }, - { 1, 0, 6 }, -}; - void bootblock_mainboard_early_init(void) { lpc47n217_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/early_init.c b/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/early_init.c index 2799a85..646759e 100644 --- a/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/early_init.c +++ b/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/early_init.c @@ -2,26 +2,8 @@
#include <bootblock_common.h> #include <northbridge/intel/sandybridge/raminit.h> -#include <southbridge/intel/bd82x6x/pch.h> #include <ec/hp/kbc1126/ec.h>
-const struct southbridge_usb_port mainboard_usb_ports[] = { - { 1, 1, 0 }, - { 1, 0, 0 }, - { 1, 1, 1 }, - { 0, 1, 1 }, - { 0, 0, 2 }, - { 1, 0, 2 }, - { 0, 0, 3 }, - { 0, 0, 3 }, - { 1, 0, 4 }, /* B1P1: Digitizer */ - { 1, 0, 4 }, /* B1P2: wlan USB, EHCI debug */ - { 1, 1, 5 }, /* B1P3: Camera */ - { 0, 0, 5 }, /* B1P4 */ - { 1, 0, 6 }, /* B1P5: wwan USB */ - { 0, 0, 6 }, /* B1P6 */ -}; - void bootblock_mainboard_early_init(void) { kbc1126_enter_conf();