usb: typec: Organize the private headers properly
Adding a header file for each subsystem - the connector class, alt mode bus and the class for the muxes. Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Link: https://lore.kernel.org/r/20210401105847.13026-2-heikki.krogerus@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Heikki Krogerus
Greg Kroah-Hartman
parent
de800f290d
commit
1e2ed7b222
|
|
@ -9,6 +9,8 @@
|
|||
#include <linux/usb/pd_vdo.h>
|
||||
|
||||
#include "bus.h"
|
||||
#include "class.h"
|
||||
#include "mux.h"
|
||||
|
||||
static inline int
|
||||
typec_altmode_set_mux(struct altmode *alt, unsigned long conf, void *data)
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
#define __USB_TYPEC_ALTMODE_H__
|
||||
|
||||
#include <linux/usb/typec_altmode.h>
|
||||
#include <linux/usb/typec_mux.h>
|
||||
|
||||
struct bus_type;
|
||||
struct typec_mux;
|
||||
|
||||
struct altmode {
|
||||
unsigned int id;
|
||||
|
|
@ -28,24 +28,7 @@ struct altmode {
|
|||
|
||||
extern struct bus_type typec_bus;
|
||||
extern const struct device_type typec_altmode_dev_type;
|
||||
extern const struct device_type typec_port_dev_type;
|
||||
|
||||
#define is_typec_altmode(_dev_) (_dev_->type == &typec_altmode_dev_type)
|
||||
#define is_typec_port(_dev_) (_dev_->type == &typec_port_dev_type)
|
||||
|
||||
extern struct class typec_mux_class;
|
||||
|
||||
struct typec_switch {
|
||||
struct device dev;
|
||||
typec_switch_set_fn_t set;
|
||||
};
|
||||
|
||||
struct typec_mux {
|
||||
struct device dev;
|
||||
typec_mux_set_fn_t set;
|
||||
};
|
||||
|
||||
#define to_typec_switch(_dev_) container_of(_dev_, struct typec_switch, dev)
|
||||
#define to_typec_mux(_dev_) container_of(_dev_, struct typec_mux, dev)
|
||||
|
||||
#endif /* __USB_TYPEC_ALTMODE_H__ */
|
||||
|
|
|
|||
|
|
@ -6,74 +6,15 @@
|
|||
* Author: Heikki Krogerus <heikki.krogerus@linux.intel.com>
|
||||
*/
|
||||
|
||||
#include <linux/device.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/property.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/usb/pd_vdo.h>
|
||||
#include <linux/usb/typec_mux.h>
|
||||
|
||||
#include "bus.h"
|
||||
|
||||
struct typec_plug {
|
||||
struct device dev;
|
||||
enum typec_plug_index index;
|
||||
struct ida mode_ids;
|
||||
int num_altmodes;
|
||||
};
|
||||
|
||||
struct typec_cable {
|
||||
struct device dev;
|
||||
enum typec_plug_type type;
|
||||
struct usb_pd_identity *identity;
|
||||
unsigned int active:1;
|
||||
u16 pd_revision; /* 0300H = "3.0" */
|
||||
};
|
||||
|
||||
struct typec_partner {
|
||||
struct device dev;
|
||||
unsigned int usb_pd:1;
|
||||
struct usb_pd_identity *identity;
|
||||
enum typec_accessory accessory;
|
||||
struct ida mode_ids;
|
||||
int num_altmodes;
|
||||
u16 pd_revision; /* 0300H = "3.0" */
|
||||
enum usb_pd_svdm_ver svdm_version;
|
||||
};
|
||||
|
||||
struct typec_port {
|
||||
unsigned int id;
|
||||
struct device dev;
|
||||
struct ida mode_ids;
|
||||
|
||||
int prefer_role;
|
||||
enum typec_data_role data_role;
|
||||
enum typec_role pwr_role;
|
||||
enum typec_role vconn_role;
|
||||
enum typec_pwr_opmode pwr_opmode;
|
||||
enum typec_port_type port_type;
|
||||
struct mutex port_type_lock;
|
||||
|
||||
enum typec_orientation orientation;
|
||||
struct typec_switch *sw;
|
||||
struct typec_mux *mux;
|
||||
|
||||
const struct typec_capability *cap;
|
||||
const struct typec_operations *ops;
|
||||
};
|
||||
|
||||
#define to_typec_port(_dev_) container_of(_dev_, struct typec_port, dev)
|
||||
#define to_typec_plug(_dev_) container_of(_dev_, struct typec_plug, dev)
|
||||
#define to_typec_cable(_dev_) container_of(_dev_, struct typec_cable, dev)
|
||||
#define to_typec_partner(_dev_) container_of(_dev_, struct typec_partner, dev)
|
||||
|
||||
static const struct device_type typec_partner_dev_type;
|
||||
static const struct device_type typec_cable_dev_type;
|
||||
static const struct device_type typec_plug_dev_type;
|
||||
|
||||
#define is_typec_partner(_dev_) (_dev_->type == &typec_partner_dev_type)
|
||||
#define is_typec_cable(_dev_) (_dev_->type == &typec_cable_dev_type)
|
||||
#define is_typec_plug(_dev_) (_dev_->type == &typec_plug_dev_type)
|
||||
#include "class.h"
|
||||
|
||||
static DEFINE_IDA(typec_index_ida);
|
||||
static struct class *typec_class;
|
||||
|
|
@ -726,7 +667,7 @@ static void typec_partner_release(struct device *dev)
|
|||
kfree(partner);
|
||||
}
|
||||
|
||||
static const struct device_type typec_partner_dev_type = {
|
||||
const struct device_type typec_partner_dev_type = {
|
||||
.name = "typec_partner",
|
||||
.groups = typec_partner_groups,
|
||||
.release = typec_partner_release,
|
||||
|
|
@ -941,7 +882,7 @@ static const struct attribute_group *typec_plug_groups[] = {
|
|||
NULL
|
||||
};
|
||||
|
||||
static const struct device_type typec_plug_dev_type = {
|
||||
const struct device_type typec_plug_dev_type = {
|
||||
.name = "typec_plug",
|
||||
.groups = typec_plug_groups,
|
||||
.release = typec_plug_release,
|
||||
|
|
@ -1089,7 +1030,7 @@ static void typec_cable_release(struct device *dev)
|
|||
kfree(cable);
|
||||
}
|
||||
|
||||
static const struct device_type typec_cable_dev_type = {
|
||||
const struct device_type typec_cable_dev_type = {
|
||||
.name = "typec_cable",
|
||||
.groups = typec_cable_groups,
|
||||
.release = typec_cable_release,
|
||||
|
|
|
|||
|
|
@ -0,0 +1,76 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
|
||||
#ifndef __USB_TYPEC_CLASS__
|
||||
#define __USB_TYPEC_CLASS__
|
||||
|
||||
#include <linux/device.h>
|
||||
#include <linux/usb/typec.h>
|
||||
|
||||
struct typec_mux;
|
||||
struct typec_switch;
|
||||
|
||||
struct typec_plug {
|
||||
struct device dev;
|
||||
enum typec_plug_index index;
|
||||
struct ida mode_ids;
|
||||
int num_altmodes;
|
||||
};
|
||||
|
||||
struct typec_cable {
|
||||
struct device dev;
|
||||
enum typec_plug_type type;
|
||||
struct usb_pd_identity *identity;
|
||||
unsigned int active:1;
|
||||
u16 pd_revision; /* 0300H = "3.0" */
|
||||
};
|
||||
|
||||
struct typec_partner {
|
||||
struct device dev;
|
||||
unsigned int usb_pd:1;
|
||||
struct usb_pd_identity *identity;
|
||||
enum typec_accessory accessory;
|
||||
struct ida mode_ids;
|
||||
int num_altmodes;
|
||||
u16 pd_revision; /* 0300H = "3.0" */
|
||||
enum usb_pd_svdm_ver svdm_version;
|
||||
};
|
||||
|
||||
struct typec_port {
|
||||
unsigned int id;
|
||||
struct device dev;
|
||||
struct ida mode_ids;
|
||||
|
||||
int prefer_role;
|
||||
enum typec_data_role data_role;
|
||||
enum typec_role pwr_role;
|
||||
enum typec_role vconn_role;
|
||||
enum typec_pwr_opmode pwr_opmode;
|
||||
enum typec_port_type port_type;
|
||||
struct mutex port_type_lock;
|
||||
|
||||
enum typec_orientation orientation;
|
||||
struct typec_switch *sw;
|
||||
struct typec_mux *mux;
|
||||
|
||||
const struct typec_capability *cap;
|
||||
const struct typec_operations *ops;
|
||||
};
|
||||
|
||||
#define to_typec_port(_dev_) container_of(_dev_, struct typec_port, dev)
|
||||
#define to_typec_plug(_dev_) container_of(_dev_, struct typec_plug, dev)
|
||||
#define to_typec_cable(_dev_) container_of(_dev_, struct typec_cable, dev)
|
||||
#define to_typec_partner(_dev_) container_of(_dev_, struct typec_partner, dev)
|
||||
|
||||
extern const struct device_type typec_partner_dev_type;
|
||||
extern const struct device_type typec_cable_dev_type;
|
||||
extern const struct device_type typec_plug_dev_type;
|
||||
extern const struct device_type typec_port_dev_type;
|
||||
|
||||
#define is_typec_partner(dev) ((dev)->type == &typec_partner_dev_type)
|
||||
#define is_typec_cable(dev) ((dev)->type == &typec_cable_dev_type)
|
||||
#define is_typec_plug(dev) ((dev)->type == &typec_plug_dev_type)
|
||||
#define is_typec_port(dev) ((dev)->type == &typec_port_dev_type)
|
||||
|
||||
extern struct class typec_mux_class;
|
||||
|
||||
#endif /* __USB_TYPEC_CLASS__ */
|
||||
|
|
@ -13,9 +13,9 @@
|
|||
#include <linux/mutex.h>
|
||||
#include <linux/property.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/usb/typec_mux.h>
|
||||
|
||||
#include "bus.h"
|
||||
#include "class.h"
|
||||
#include "mux.h"
|
||||
|
||||
static bool dev_name_ends_with(struct device *dev, const char *suffix)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -0,0 +1,21 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
|
||||
#ifndef __USB_TYPEC_MUX__
|
||||
#define __USB_TYPEC_MUX__
|
||||
|
||||
#include <linux/usb/typec_mux.h>
|
||||
|
||||
struct typec_switch {
|
||||
struct device dev;
|
||||
typec_switch_set_fn_t set;
|
||||
};
|
||||
|
||||
struct typec_mux {
|
||||
struct device dev;
|
||||
typec_mux_set_fn_t set;
|
||||
};
|
||||
|
||||
#define to_typec_switch(_dev_) container_of(_dev_, struct typec_switch, dev)
|
||||
#define to_typec_mux(_dev_) container_of(_dev_, struct typec_mux, dev)
|
||||
|
||||
#endif /* __USB_TYPEC_MUX__ */
|
||||
Loading…
Reference in New Issue