mb/*: Copy bd82x6x boards' USB port config into devicetree

For mainboards using southbridge/intel/bd82x6x, copy the contents
of mainboard_usb_ports array into southbridge devicetree. In-line
comments are maintained.

Boards also capable of using MRC raminit are done in a separate
patch.

Change-Id: Ia8a967eb3466106f3a34e024260e13d02f449a25
Signed-off-by: Keith Hui <buurin@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/81879
Reviewed-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

14 files changed, 229 insertions, 0 deletions

diff --git a/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb b/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb
index 993721b473..09ba412ac7 100644
--- a/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb
+++ b/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb
@@ -26,6 +26,23 @@ chip northbridge/intel/sandybridge
 			register "spi_lvscc" = "0x2005"
 			register "spi_uvscc" = "0x0"
 
+			register "usb_port_config" = "{
+				{ 1, 0, -1 },
+				{ 1, 0, -1 },
+				{ 1, 0, -1 },
+				{ 1, 0, -1 },
+				{ 1, 0, -1 },
+				{ 1, 0, -1 },
+				{ 1, 0, -1 },
+				{ 1, 0, -1 },
+				{ 1, 0, -1 },
+				{ 1, 0, -1 },
+				{ 1, 0, -1 },
+				{ 1, 0, -1 },
+				{ 1, 0, -1 },
+				{ 1, 0, -1 }
+			}"
+
 			device ref mei1 on  end	# Management Engine Interface 1
 			device ref mei2 off end	# Management Engine Interface 2
 			device ref me_ide_r off end	# Management Engine IDE-R
diff --git a/src/mainboard/hp/compaq_elite_8300_usdt/devicetree.cb b/src/mainboard/hp/compaq_elite_8300_usdt/devicetree.cb
index 7a62df1001..777ff0071d 100644
--- a/src/mainboard/hp/compaq_elite_8300_usdt/devicetree.cb
+++ b/src/mainboard/hp/compaq_elite_8300_usdt/devicetree.cb
@@ -19,6 +19,22 @@ chip northbridge/intel/sandybridge
 			register "superspeed_capable_ports" = "0x0000000f"
 			register "xhci_overcurrent_mapping" = "0x00000c03"
 			register "xhci_switchable_ports" = "0x0000000f"
+			register "usb_port_config" = "{
+				{ 1, 0, 0 },
+				{ 1, 0, 0 },
+				{ 1, 0, 1 },
+				{ 1, 0, 1 },
+				{ 1, 0, 2 },
+				{ 1, 0, 2 },
+				{ 1, 0, 3 },
+				{ 1, 0, 3 },
+				{ 1, 0, 4 },
+				{ 1, 0, 4 },
+				{ 1, 0, 6 },
+				{ 1, 0, 5 },
+				{ 1, 0, 5 },
+				{ 1, 0, 6 }
+			}"
 			device ref xhci on # USB 3.0 Controller
 				subsystemid 0x103c 0x3398
 			end
diff --git a/src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/overridetree.cb b/src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/overridetree.cb
index 1867d3a535..a8dcb17bb6 100644
--- a/src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/overridetree.cb
+++ b/src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/overridetree.cb
@@ -9,6 +9,22 @@ chip northbridge/intel/sandybridge
 			register "superspeed_capable_ports" = "0x0000000f"
 			register "xhci_switchable_ports"    = "0x0000000f"
 			register "xhci_overcurrent_mapping" = "0x0000000f"
+			register "usb_port_config" = "{
+				{ 1, 0, 0 },
+				{ 1, 0, 0 },
+				{ 1, 0, 0 },
+				{ 1, 0, 0 },
+				{ 1, 0, 3 },
+				{ 1, 0, 3 },
+				{ 1, 0, 3 },
+				{ 1, 0, 3 },
+				{ 1, 1, 5 },
+				{ 1, 0, 5 },
+				{ 1, 0, 5 },
+				{ 1, 0, 5 },
+				{ 1, 0, 7 },
+				{ 1, 0, 7 }
+			}"
 
 			device ref xhci on  end
 			device ref pcie_rp2 on  end
diff --git a/src/mainboard/hp/snb_ivb_desktops/variants/z220_sff_workstation/overridetree.cb b/src/mainboard/hp/snb_ivb_desktops/variants/z220_sff_workstation/overridetree.cb
index 560b407eed..4684b0e7bf 100644
--- a/src/mainboard/hp/snb_ivb_desktops/variants/z220_sff_workstation/overridetree.cb
+++ b/src/mainboard/hp/snb_ivb_desktops/variants/z220_sff_workstation/overridetree.cb
@@ -9,6 +9,22 @@ chip northbridge/intel/sandybridge
 			register "superspeed_capable_ports" = "0x0000000f"
 			register "xhci_switchable_ports"    = "0x0000000f"
 			register "xhci_overcurrent_mapping" = "0x0000000f"
+			register "usb_port_config" = "{
+				{ 1, 0, 0 },
+				{ 1, 0, 0 },
+				{ 1, 0, 0 },
+				{ 1, 0, 0 },
+				{ 1, 0, 3 },
+				{ 1, 0, 3 },
+				{ 1, 0, 3 },
+				{ 1, 0, 3 },
+				{ 1, 1, 5 },
+				{ 1, 0, 5 },
+				{ 1, 0, 5 },
+				{ 1, 0, 5 },
+				{ 1, 0, 7 },
+				{ 1, 0, 7 }
+			}"
 
 			device ref xhci on  end
 		end
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/2170p/overridetree.cb b/src/mainboard/hp/snb_ivb_laptops/variants/2170p/overridetree.cb
index 092049c286..dfd1cce251 100644
--- a/src/mainboard/hp/snb_ivb_laptops/variants/2170p/overridetree.cb
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/2170p/overridetree.cb
@@ -23,6 +23,22 @@ chip northbridge/intel/sandybridge
 			register "superspeed_capable_ports" = "0x0000000f"
 			register "xhci_overcurrent_mapping" = "0x00000c03"
 			register "xhci_switchable_ports"    = "0x0000000f"
+			register "usb_port_config" = "{
+				{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}
+			}"
 
 			device ref xhci on  end
 			device ref mei1 on  end
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/2560p/overridetree.cb b/src/mainboard/hp/snb_ivb_laptops/variants/2560p/overridetree.cb
index c73786ad31..f5db40f802 100644
--- a/src/mainboard/hp/snb_ivb_laptops/variants/2560p/overridetree.cb
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/2560p/overridetree.cb
@@ -21,6 +21,23 @@ chip northbridge/intel/sandybridge
 			# HDD(0), ODD(1), eSATA(4), dock eSATA(5)
 			register "sata_port_map" = "0x33"
 
+			register "usb_port_config" = "{
+				{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}
+			}"
+
 			device ref pcie_rp1 off end
 			device ref pcie_rp2 on
 				smbios_slot_desc "SlotTypePcmcia" "SlotLengthShort"
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/2570p/overridetree.cb b/src/mainboard/hp/snb_ivb_laptops/variants/2570p/overridetree.cb
index af80813ae0..ab6529ea0d 100644
--- a/src/mainboard/hp/snb_ivb_laptops/variants/2570p/overridetree.cb
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/2570p/overridetree.cb
@@ -22,6 +22,22 @@ chip northbridge/intel/sandybridge
 			register "superspeed_capable_ports" = "0x0000000f"
 			register "xhci_overcurrent_mapping" = "0x00000c03"
 			register "xhci_switchable_ports"    = "0x0000000f"
+			register "usb_port_config" = "{
+				{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}
+			}"
 
 			device ref xhci on  end
 			device ref pcie_rp1 on  end
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/2760p/overridetree.cb b/src/mainboard/hp/snb_ivb_laptops/variants/2760p/overridetree.cb
index 9d1890a15a..22f2b84c59 100644
--- a/src/mainboard/hp/snb_ivb_laptops/variants/2760p/overridetree.cb
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/2760p/overridetree.cb
@@ -20,6 +20,23 @@ chip northbridge/intel/sandybridge
 			register "pcie_hotplug_map" = "{ 0, 1, 1, 0, 0, 0, 0, 0 }"
 			register "sata_port_map" = "0x21"
 
+			register "usb_port_config" = "{
+				{ 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 }
+			}"
+
 			device ref pcie_rp1 on  end
 			device ref pcie_rp2 on
 				smbios_slot_desc "SlotTypePcmcia" "SlotLengthShort"
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/8460p/overridetree.cb b/src/mainboard/hp/snb_ivb_laptops/variants/8460p/overridetree.cb
index bf640995e9..b1d03baea0 100644
--- a/src/mainboard/hp/snb_ivb_laptops/variants/8460p/overridetree.cb
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/8460p/overridetree.cb
@@ -21,6 +21,23 @@ chip northbridge/intel/sandybridge
 			# HDD(0), ODD(1), docking(3,5), eSATA(4)
 			register "sata_port_map" = "0x3b"
 
+			register "usb_port_config" = "{
+				{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 */
+			}"
+
 			device ref me_kt on  end
 			device ref pcie_rp1 on  end
 			device ref pcie_rp2 on
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/8470p/overridetree.cb b/src/mainboard/hp/snb_ivb_laptops/variants/8470p/overridetree.cb
index cfc53727e2..b3cc3a9f93 100644
--- a/src/mainboard/hp/snb_ivb_laptops/variants/8470p/overridetree.cb
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/8470p/overridetree.cb
@@ -23,6 +23,22 @@ chip northbridge/intel/sandybridge
 			register "superspeed_capable_ports" = "0x0000000f"
 			register "xhci_overcurrent_mapping" = "0x00000c03"
 			register "xhci_switchable_ports"    = "0x0000000f"
+			register "usb_port_config" = "{
+				{ 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 }
+			}"
 
 			device ref xhci on  end
 			device ref me_kt on  end
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/8770w/overridetree.cb b/src/mainboard/hp/snb_ivb_laptops/variants/8770w/overridetree.cb
index f326c40191..771cda0b24 100644
--- a/src/mainboard/hp/snb_ivb_laptops/variants/8770w/overridetree.cb
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/8770w/overridetree.cb
@@ -24,6 +24,22 @@ chip northbridge/intel/sandybridge
 			register "superspeed_capable_ports" = "0x0000000f"
 			register "xhci_overcurrent_mapping" = "0x00000c03"
 			register "xhci_switchable_ports"    = "0x0000000f"
+			register "usb_port_config" = "{
+				{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) */
+			}"
 
 			device ref xhci on  end
 			device ref pcie_rp1 on  end
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/folio_9470m/overridetree.cb b/src/mainboard/hp/snb_ivb_laptops/variants/folio_9470m/overridetree.cb
index 1e3984d4ba..c16634d97f 100644
--- a/src/mainboard/hp/snb_ivb_laptops/variants/folio_9470m/overridetree.cb
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/folio_9470m/overridetree.cb
@@ -22,6 +22,22 @@ chip northbridge/intel/sandybridge
 			register "superspeed_capable_ports" = "0x0000000f"
 			register "xhci_overcurrent_mapping" = "0x00000c03"
 			register "xhci_switchable_ports"    = "0x0000000f"
+			register "usb_port_config" = "{
+				{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}
+			}"
 
 			device ref xhci on  end
 			device ref pcie_rp1 on  end
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/probook_6360b/overridetree.cb b/src/mainboard/hp/snb_ivb_laptops/variants/probook_6360b/overridetree.cb
index 64653bc015..b3bbe1ce8f 100644
--- a/src/mainboard/hp/snb_ivb_laptops/variants/probook_6360b/overridetree.cb
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/probook_6360b/overridetree.cb
@@ -20,6 +20,23 @@ chip northbridge/intel/sandybridge
 			# FIXME: ports 3, 5 are untested
 			register "sata_port_map" = "0x3b"
 
+			register "usb_port_config" = "{
+				{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}
+			}"
+
 			device ref pcie_rp1 on  end
 			device ref pcie_rp2 on
 				smbios_slot_desc "SlotTypePcmcia" "SlotLengthShort"
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/overridetree.cb b/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/overridetree.cb
index 2e363711e3..45a3c3e319 100644
--- a/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/overridetree.cb
+++ b/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/overridetree.cb
@@ -22,6 +22,22 @@ chip northbridge/intel/sandybridge
 			register "superspeed_capable_ports" = "0x0000000f"
 			register "xhci_overcurrent_mapping" = "0x00000c03"
 			register "xhci_switchable_ports"    = "0x0000000f"
+			register "usb_port_config" = "{
+				{ 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 */
+			}"
 
 			device ref xhci on  end
 			device ref pcie_rp1 on  end