diff --git a/util/autoport/bd82x6x.go b/util/autoport/bd82x6x.go
index d342a79d85..26c8b91b82 100644
--- a/util/autoport/bd82x6x.go
+++ b/util/autoport/bd82x6x.go
@@ -334,14 +334,10 @@ void pch_enable_lpc(void)
 
 	sb.WriteString(`}
 
-void rcba_config(void)
+void mainboard_rcba_config(void)
 {
-	/* Disable devices.  */
 `)
-	RestoreRCBA32(sb, inteltool, 0x3414)
-	RestoreRCBA32(sb, inteltool, 0x3418)
-
-	sb.WriteString("\n}\n")
+	sb.WriteString("}\n\n")
 
 	sb.WriteString("const struct southbridge_usb_port mainboard_usb_ports[] = {\n")