Commit 5bdb080f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "usb: Link the ports to the connectors they are attached to" 



This reverts commit 63cd7861 as it
causes a build error:
	depmod: ERROR: Cycle detected: usbcore -> typec -> usbcore
	depmod: ERROR: Found 2 modules in dependency cycles!

Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Link: https://lore.kernel.org/r/20210412213655.3776e15e@canb.auug.org.au


Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1d08ed58

Documentation/ABI/testing/sysfs-bus-usb

+0 −9
Original line number Diff line number Diff line
@@ -255,15 +255,6 @@ Description: 
		is permitted, "u2" if only u2 is permitted, "u1_u2" if both u1 and

		u2 are permitted.



What:		/sys/bus/usb/devices/.../(hub interface)/portX/connector

Date:		April 2021

Contact:	Heikki Krogerus <heikki.krogerus@linux.intel.com>

Description:

		Link to the USB Type-C connector when available. This link is

		only created when USB Type-C Connector Class is enabled, and

		only if the system firmware is capable of describing the

		connection between a port and its connector.



What:		/sys/bus/usb/devices/.../power/usb2_lpm_l1_timeout

Date:		May 2013

Contact:	Mathias Nyman <mathias.nyman@linux.intel.com>

drivers/usb/core/port.c

+0 −3
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 


#include <linux/slab.h>

#include <linux/pm_qos.h>

#include <linux/usb/typec.h>



#include "hub.h"
@@ -577,7 +576,6 @@ int usb_hub_create_port_device(struct usb_hub *hub, int port1) 
	}



	find_and_link_peer(hub, port1);

	typec_link_port(&port_dev->dev);



	/*

	 * Enable runtime pm and hold a refernce that hub_configure()
@@ -621,6 +619,5 @@ void usb_hub_remove_port_device(struct usb_hub *hub, int port1) 
	peer = port_dev->peer;

	if (peer)

		unlink_peers(port_dev, peer);

	typec_unlink_port(&port_dev->dev);

	device_unregister(&port_dev->dev);

}