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

Merge branch 'staging_typec_move' into staging-next 



Move the typec code out of staging into the USB tree.  This is on a
separate branch so that we can share it with the USB git tree and not
cause merge issues later on.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 802d7d0b 76f0c53d

drivers/staging/typec/Kconfig

+0 −10
Original line number Diff line number Diff line 
menu "USB Power Delivery and Type-C drivers"



config TYPEC_TCPM

	tristate "USB Type-C Port Controller Manager"

	depends on USB

	select TYPEC

	help

	  The Type-C Port Controller Manager provides a USB PD and USB Type-C

	  state machine for use with Type-C Port Controllers.



if TYPEC_TCPM



config TYPEC_TCPCI
@@ -17,8 +9,6 @@ config TYPEC_TCPCI 
	help

	  Type-C Port Controller driver for TCPCI-compliant controller.



source "drivers/staging/typec/fusb302/Kconfig"



endif



endmenu

drivers/staging/typec/Makefile

+0 −2
Original line number Diff line number Diff line 
obj-$(CONFIG_TYPEC_TCPM)	+= tcpm.o

obj-$(CONFIG_TYPEC_TCPCI)	+= tcpci.o
 
obj-y				+= fusb302/

drivers/staging/typec/TODO

+0 −10
Original line number Diff line number Diff line 
tcpm:

- Add documentation (at the very least for the API to low level drivers)

- Split PD code into separate file

- Check if it makes sense to use tracepoints instead of debugfs for debug logs

- Implement Alternate Mode handling

- Address "#if 0" code if not addressed with the above

- Validate all comments marked with "XXX"; either address or remove comments

- Add support for USB PD 3.0. While not mandatory, at least fast role swap

  as well as authentication support would be very desirable.



tcpci:

- Test with real hardware

drivers/staging/typec/fusb302/TODO

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
fusb302:

- Find a better logging scheme, at least not having the same debugging/logging

  code replicated here and in tcpm

- Find a non-hacky way to coordinate between PM and I2C access

- Documentation? The FUSB302 datasheet provides information on the chip to help

  understand the code. But it may still be helpful to have a documentation.

- We may want to replace the  "fcs,max-snk-microvolt", "fcs,max-snk-microamp",

  "fcs,max-snk-microwatt" and "fcs,operating-snk-microwatt" device(tree)

  properties with properties which are part of a generic type-c controller

  devicetree binding.

drivers/staging/typec/tcpci.c

+2 −2
Original line number Diff line number Diff line
@@ -20,11 +20,11 @@ 
#include <linux/i2c.h>

#include <linux/interrupt.h>

#include <linux/regmap.h>

#include <linux/usb/pd.h>

#include <linux/usb/tcpm.h>

#include <linux/usb/typec.h>



#include "pd.h"

#include "tcpci.h"

#include "tcpm.h"



#define PD_RETRY_COUNT 3