mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 05:29:04 -04:00
Char/Misc patches for 3.13-rc1
Here's the big char/misc driver patchset for 3.13-rc1. Lots of stuff in here, including some new drivers for Intel's "MIC" co-processor devices, and a new eeprom driver. Other things include the driver attribute cleanups, extcon driver updates, hyperv updates, and a raft of other miscellaneous driver fixes. All of these have been in linux-next for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iEUEABECAAYFAlJ6v9kACgkQMUfUDdst+ykPzACXdwm/1DryfqnyhVPyITNAKcma WACg1Yu5mtIvJg3NsN/7Ff0Qfj6GzYY= =MIEe -----END PGP SIGNATURE----- Merge tag 'char-misc-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc Pull char/misc patches from Greg KH: "Here's the big char/misc driver patchset for 3.13-rc1. Lots of stuff in here, including some new drivers for Intel's "MIC" co-processor devices, and a new eeprom driver. Other things include the driver attribute cleanups, extcon driver updates, hyperv updates, and a raft of other miscellaneous driver fixes. All of these have been in linux-next for a while" * tag 'char-misc-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (121 commits) misc: mic: Fixes for randconfig build errors and warnings. tifm: fix error return code in tifm_7xx1_probe() w1-gpio: Use devm_* functions w1-gpio: Detect of_gpio_error for first gpio uio: Pass pointers to virt_to_page(), not integers uio: fix memory leak misc/at24: avoid infinite loop on write() misc/93xx46: avoid infinite loop on write() misc: atmel_pwm: add deferred-probing support mei: wd: host_init propagate error codes from called functions mei: replace stray pr_debug with dev_dbg mei: bus: propagate error code returned by mei_me_cl_by_id mei: mei_cl_link remove duplicated check for open_handle_count mei: print correct device state during unexpected reset mei: nfc: fix memory leak in error path lkdtm: add tests for additional page permissions lkdtm: adjust recursion size to avoid warnings lkdtm: isolate stack corruption test mei: move host_clients_map cleanup to device init mei: me: downgrade two errors to debug level ...
This commit is contained in:
Linus Torvalds
commit
1071ec7bc2
118 changed files with 10904 additions and 830 deletions
|
|
@ -51,10 +51,10 @@
|
|||
enum extcon_cable_name {
|
||||
EXTCON_USB = 0,
|
||||
EXTCON_USB_HOST,
|
||||
EXTCON_TA, /* Travel Adaptor */
|
||||
EXTCON_TA, /* Travel Adaptor */
|
||||
EXTCON_FAST_CHARGER,
|
||||
EXTCON_SLOW_CHARGER,
|
||||
EXTCON_CHARGE_DOWNSTREAM, /* Charging an external device */
|
||||
EXTCON_CHARGE_DOWNSTREAM, /* Charging an external device */
|
||||
EXTCON_HDMI,
|
||||
EXTCON_MHL,
|
||||
EXTCON_DVI,
|
||||
|
|
@ -76,8 +76,8 @@ struct extcon_cable;
|
|||
|
||||
/**
|
||||
* struct extcon_dev - An extcon device represents one external connector.
|
||||
* @name: The name of this extcon device. Parent device name is used
|
||||
* if NULL.
|
||||
* @name: The name of this extcon device. Parent device name is
|
||||
* used if NULL.
|
||||
* @supported_cable: Array of supported cable names ending with NULL.
|
||||
* If supported_cable is NULL, cable name related APIs
|
||||
* are disabled.
|
||||
|
|
@ -89,21 +89,21 @@ struct extcon_cable;
|
|||
* be attached simulataneously. {0x7, 0} is equivalent to
|
||||
* {0x3, 0x6, 0x5, 0}. If it is {0xFFFFFFFF, 0}, there
|
||||
* can be no simultaneous connections.
|
||||
* @print_name: An optional callback to override the method to print the
|
||||
* name of the extcon device.
|
||||
* @print_name: An optional callback to override the method to print the
|
||||
* name of the extcon device.
|
||||
* @print_state: An optional callback to override the method to print the
|
||||
* status of the extcon device.
|
||||
* @dev: Device of this extcon. Do not provide at register-time.
|
||||
* @state: Attach/detach state of this extcon. Do not provide at
|
||||
* register-time
|
||||
* @nh: Notifier for the state change events from this extcon
|
||||
* @entry: To support list of extcon devices so that users can search
|
||||
* for extcon devices based on the extcon name.
|
||||
* status of the extcon device.
|
||||
* @dev: Device of this extcon.
|
||||
* @state: Attach/detach state of this extcon. Do not provide at
|
||||
* register-time.
|
||||
* @nh: Notifier for the state change events from this extcon
|
||||
* @entry: To support list of extcon devices so that users can search
|
||||
* for extcon devices based on the extcon name.
|
||||
* @lock:
|
||||
* @max_supported: Internal value to store the number of cables.
|
||||
* @extcon_dev_type: Device_type struct to provide attribute_groups
|
||||
* customized for each extcon device.
|
||||
* @cables: Sysfs subdirectories. Each represents one cable.
|
||||
* @cables: Sysfs subdirectories. Each represents one cable.
|
||||
*
|
||||
* In most cases, users only need to provide "User initializing data" of
|
||||
* this struct when registering an extcon. In some exceptional cases,
|
||||
|
|
@ -111,26 +111,27 @@ struct extcon_cable;
|
|||
* are overwritten by register function.
|
||||
*/
|
||||
struct extcon_dev {
|
||||
/* --- Optional user initializing data --- */
|
||||
const char *name;
|
||||
/* Optional user initializing data */
|
||||
const char *name;
|
||||
const char **supported_cable;
|
||||
const u32 *mutually_exclusive;
|
||||
const u32 *mutually_exclusive;
|
||||
|
||||
/* --- Optional callbacks to override class functions --- */
|
||||
/* Optional callbacks to override class functions */
|
||||
ssize_t (*print_name)(struct extcon_dev *edev, char *buf);
|
||||
ssize_t (*print_state)(struct extcon_dev *edev, char *buf);
|
||||
|
||||
/* --- Internal data. Please do not set. --- */
|
||||
struct device *dev;
|
||||
u32 state;
|
||||
/* Internal data. Please do not set. */
|
||||
struct device dev;
|
||||
struct raw_notifier_head nh;
|
||||
struct list_head entry;
|
||||
spinlock_t lock; /* could be called by irq handler */
|
||||
int max_supported;
|
||||
spinlock_t lock; /* could be called by irq handler */
|
||||
u32 state;
|
||||
|
||||
/* /sys/class/extcon/.../cable.n/... */
|
||||
struct device_type extcon_dev_type;
|
||||
struct extcon_cable *cables;
|
||||
|
||||
/* /sys/class/extcon/.../mutually_exclusive/... */
|
||||
struct attribute_group attr_g_muex;
|
||||
struct attribute **attrs_muex;
|
||||
|
|
@ -138,13 +139,13 @@ struct extcon_dev {
|
|||
};
|
||||
|
||||
/**
|
||||
* struct extcon_cable - An internal data for each cable of extcon device.
|
||||
* @edev: The extcon device
|
||||
* struct extcon_cable - An internal data for each cable of extcon device.
|
||||
* @edev: The extcon device
|
||||
* @cable_index: Index of this cable in the edev
|
||||
* @attr_g: Attribute group for the cable
|
||||
* @attr_name: "name" sysfs entry
|
||||
* @attr_state: "state" sysfs entry
|
||||
* @attrs: Array pointing to attr_name and attr_state for attr_g
|
||||
* @attr_g: Attribute group for the cable
|
||||
* @attr_name: "name" sysfs entry
|
||||
* @attr_state: "state" sysfs entry
|
||||
* @attrs: Array pointing to attr_name and attr_state for attr_g
|
||||
*/
|
||||
struct extcon_cable {
|
||||
struct extcon_dev *edev;
|
||||
|
|
@ -159,11 +160,13 @@ struct extcon_cable {
|
|||
|
||||
/**
|
||||
* struct extcon_specific_cable_nb - An internal data for
|
||||
* extcon_register_interest().
|
||||
* @internal_nb: a notifier block bridging extcon notifier and cable notifier.
|
||||
* @user_nb: user provided notifier block for events from a specific cable.
|
||||
* extcon_register_interest().
|
||||
* @internal_nb: A notifier block bridging extcon notifier
|
||||
* and cable notifier.
|
||||
* @user_nb: user provided notifier block for events from
|
||||
* a specific cable.
|
||||
* @cable_index: the target cable.
|
||||
* @edev: the target extcon device.
|
||||
* @edev: the target extcon device.
|
||||
* @previous_value: the saved previous event value.
|
||||
*/
|
||||
struct extcon_specific_cable_nb {
|
||||
|
|
@ -180,7 +183,7 @@ struct extcon_specific_cable_nb {
|
|||
* Following APIs are for notifiers or configurations.
|
||||
* Notifiers are the external port and connection devices.
|
||||
*/
|
||||
extern int extcon_dev_register(struct extcon_dev *edev, struct device *dev);
|
||||
extern int extcon_dev_register(struct extcon_dev *edev);
|
||||
extern void extcon_dev_unregister(struct extcon_dev *edev);
|
||||
extern struct extcon_dev *extcon_get_extcon_dev(const char *extcon_name);
|
||||
|
||||
|
|
@ -238,8 +241,7 @@ extern int extcon_register_notifier(struct extcon_dev *edev,
|
|||
extern int extcon_unregister_notifier(struct extcon_dev *edev,
|
||||
struct notifier_block *nb);
|
||||
#else /* CONFIG_EXTCON */
|
||||
static inline int extcon_dev_register(struct extcon_dev *edev,
|
||||
struct device *dev)
|
||||
static inline int extcon_dev_register(struct extcon_dev *edev)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,10 +20,10 @@
|
|||
|
||||
/**
|
||||
* struct adc_jack_cond - condition to use an extcon state
|
||||
* @state - the corresponding extcon state (if 0, this struct denotes
|
||||
* the last adc_jack_cond element among the array)
|
||||
* @min_adc - min adc value for this condition
|
||||
* @max_adc - max adc value for this condition
|
||||
* @state: the corresponding extcon state (if 0, this struct
|
||||
* denotes the last adc_jack_cond element among the array)
|
||||
* @min_adc: min adc value for this condition
|
||||
* @max_adc: max adc value for this condition
|
||||
*
|
||||
* For example, if { .state = 0x3, .min_adc = 100, .max_adc = 200}, it means
|
||||
* that if ADC value is between (inclusive) 100 and 200, than the cable 0 and
|
||||
|
|
@ -33,34 +33,34 @@
|
|||
* because when no adc_jack_cond is met, state = 0 is automatically chosen.
|
||||
*/
|
||||
struct adc_jack_cond {
|
||||
u32 state; /* extcon state value. 0 if invalid */
|
||||
u32 state; /* extcon state value. 0 if invalid */
|
||||
u32 min_adc;
|
||||
u32 max_adc;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct adc_jack_pdata - platform data for adc jack device.
|
||||
* @name - name of the extcon device. If null, "adc-jack" is used.
|
||||
* @consumer_channel - Unique name to identify the channel on the consumer
|
||||
* side. This typically describes the channels used within
|
||||
* the consumer. E.g. 'battery_voltage'
|
||||
* @cable_names - array of cable names ending with null.
|
||||
* @adc_contitions - array of struct adc_jack_cond conditions ending
|
||||
* with .state = 0 entry. This describes how to decode
|
||||
* adc values into extcon state.
|
||||
* @irq_flags - irq flags used for the @irq
|
||||
* @handling_delay_ms - in some devices, we need to read ADC value some
|
||||
* milli-seconds after the interrupt occurs. You may
|
||||
* describe such delays with @handling_delay_ms, which
|
||||
* is rounded-off by jiffies.
|
||||
* @name: name of the extcon device. If null, "adc-jack" is used.
|
||||
* @consumer_channel: Unique name to identify the channel on the consumer
|
||||
* side. This typically describes the channels used within
|
||||
* the consumer. E.g. 'battery_voltage'
|
||||
* @cable_names: array of cable names ending with null.
|
||||
* @adc_contitions: array of struct adc_jack_cond conditions ending
|
||||
* with .state = 0 entry. This describes how to decode
|
||||
* adc values into extcon state.
|
||||
* @irq_flags: irq flags used for the @irq
|
||||
* @handling_delay_ms: in some devices, we need to read ADC value some
|
||||
* milli-seconds after the interrupt occurs. You may
|
||||
* describe such delays with @handling_delay_ms, which
|
||||
* is rounded-off by jiffies.
|
||||
*/
|
||||
struct adc_jack_pdata {
|
||||
const char *name;
|
||||
const char *consumer_channel;
|
||||
/*
|
||||
* The last entry should be NULL
|
||||
*/
|
||||
|
||||
/* The last entry should be NULL */
|
||||
const char **cable_names;
|
||||
|
||||
/* The last entry's state should be 0 */
|
||||
struct adc_jack_cond *adc_conditions;
|
||||
|
||||
|
|
|
|||
|
|
@ -25,14 +25,17 @@
|
|||
|
||||
/**
|
||||
* struct gpio_extcon_platform_data - A simple GPIO-controlled extcon device.
|
||||
* @name The name of this GPIO extcon device.
|
||||
* @gpio Corresponding GPIO.
|
||||
* @debounce Debounce time for GPIO IRQ in ms.
|
||||
* @irq_flags IRQ Flags (e.g., IRQF_TRIGGER_LOW).
|
||||
* @state_on print_state is overriden with state_on if attached. If Null,
|
||||
* default method of extcon class is used.
|
||||
* @state_off print_state is overriden with state_on if detached. If Null,
|
||||
* default method of extcon class is used.
|
||||
* @name: The name of this GPIO extcon device.
|
||||
* @gpio: Corresponding GPIO.
|
||||
* @gpio_active_low: Boolean describing whether gpio active state is 1 or 0
|
||||
* If true, low state of gpio means active.
|
||||
* If false, high state of gpio means active.
|
||||
* @debounce: Debounce time for GPIO IRQ in ms.
|
||||
* @irq_flags: IRQ Flags (e.g., IRQF_TRIGGER_LOW).
|
||||
* @state_on: print_state is overriden with state_on if attached.
|
||||
* If NULL, default method of extcon class is used.
|
||||
* @state_off: print_state is overriden with state_on if detached.
|
||||
* If NUll, default method of extcon class is used.
|
||||
*
|
||||
* Note that in order for state_on or state_off to be valid, both state_on
|
||||
* and state_off should be not NULL. If at least one of them is NULL,
|
||||
|
|
@ -41,6 +44,7 @@
|
|||
struct gpio_extcon_platform_data {
|
||||
const char *name;
|
||||
unsigned gpio;
|
||||
bool gpio_active_low;
|
||||
unsigned long debounce;
|
||||
unsigned long irq_flags;
|
||||
|
||||
|
|
|
|||
|
|
@ -432,15 +432,6 @@ struct hv_ring_buffer_info {
|
|||
u32 ring_data_startoffset;
|
||||
};
|
||||
|
||||
struct hv_ring_buffer_debug_info {
|
||||
u32 current_interrupt_mask;
|
||||
u32 current_read_index;
|
||||
u32 current_write_index;
|
||||
u32 bytes_avail_toread;
|
||||
u32 bytes_avail_towrite;
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
*
|
||||
* hv_get_ringbuffer_availbytes()
|
||||
|
|
@ -902,23 +893,6 @@ enum vmbus_channel_state {
|
|||
CHANNEL_OPENED_STATE,
|
||||
};
|
||||
|
||||
struct vmbus_channel_debug_info {
|
||||
u32 relid;
|
||||
enum vmbus_channel_state state;
|
||||
uuid_le interfacetype;
|
||||
uuid_le interface_instance;
|
||||
u32 monitorid;
|
||||
u32 servermonitor_pending;
|
||||
u32 servermonitor_latency;
|
||||
u32 servermonitor_connectionid;
|
||||
u32 clientmonitor_pending;
|
||||
u32 clientmonitor_latency;
|
||||
u32 clientmonitor_connectionid;
|
||||
|
||||
struct hv_ring_buffer_debug_info inbound;
|
||||
struct hv_ring_buffer_debug_info outbound;
|
||||
};
|
||||
|
||||
/*
|
||||
* Represents each channel msg on the vmbus connection This is a
|
||||
* variable-size data structure depending on the msg type itself
|
||||
|
|
@ -1184,19 +1158,8 @@ extern int vmbus_recvpacket_raw(struct vmbus_channel *channel,
|
|||
u64 *requestid);
|
||||
|
||||
|
||||
extern void vmbus_get_debug_info(struct vmbus_channel *channel,
|
||||
struct vmbus_channel_debug_info *debug);
|
||||
|
||||
extern void vmbus_ontimer(unsigned long data);
|
||||
|
||||
struct hv_dev_port_info {
|
||||
u32 int_mask;
|
||||
u32 read_idx;
|
||||
u32 write_idx;
|
||||
u32 bytes_avail_toread;
|
||||
u32 bytes_avail_towrite;
|
||||
};
|
||||
|
||||
/* Base driver object */
|
||||
struct hv_driver {
|
||||
const char *name;
|
||||
|
|
|
|||
Loading…
Reference in a new issue