Commit 2424a733 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Merge tag 'extcon-next-for-3.13' of...

Merge tag 'extcon-next-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next

Chanwoo writes:

Update extcon for 3.13

This patchset modify extcon core to remove unnecessary allocation sequence for
'dev' instance and change extcon_dev_register() interface. extcon-gpio use
gpiolib API to get debounce time and include small fix of extcon core/device
driver.

Detailed description for patchset:
1. Modify extcon core driver
- The extcon-gpio driver use gpio_set_debounce() API provided from gpiolib
if gpio driver for SoC support gpio_set_debounce() function and support 'gpio_
activ_low' filed to check whether gpio active state is 1(high) or 0(low).
- Change field type of 'dev' in structure extcon_dev and remove the sequence
of allocating memory of 'struct dev' on extcon_dev_register() function because
extcon device must need 'struct device.
- Change extcon_dev_register() prototype to simplify it and remove unnecessary
parameter as below:

2. Fix coding style and typo
- extcon core     : Fix indentation coding style and remove unnecessary casting
- extcon-max8997  : Fix checkpatch warning
- extcon-max77693 : Fix checkpatch warning
- extcon-arizona  : Fix typo of comment and modify minor issue
- extcon-palmas   : Use dev_get_platdata()

3. Modify extcon-arizona driver
- Modify minor issue about micbias and comparision statement
parents 33b06938 42d7d753
...@@ -25,8 +25,10 @@ MyungJoo Ham <myungjoo.ham@samsung.com> ...@@ -25,8 +25,10 @@ MyungJoo Ham <myungjoo.ham@samsung.com>
@print_state: no change but type change (switch_dev->extcon_dev) @print_state: no change but type change (switch_dev->extcon_dev)
- switch_dev_register(sdev, dev) - switch_dev_register(sdev, dev)
=> extcon_dev_register(edev, dev) => extcon_dev_register(edev)
: no change but type change (sdev->edev) : type change (sdev->edev)
: remove second param('dev'). if edev has parent device, should store
'dev' to 'edev.dev.parent' before registering extcon device
- switch_dev_unregister(sdev) - switch_dev_unregister(sdev)
=> extcon_dev_unregister(edev) => extcon_dev_unregister(edev)
: no change but type change (sdev->edev) : no change but type change (sdev->edev)
......
...@@ -27,16 +27,16 @@ ...@@ -27,16 +27,16 @@
/** /**
* struct adc_jack_data - internal data for adc_jack device driver * struct adc_jack_data - internal data for adc_jack device driver
* @edev - extcon device. * @edev: extcon device.
* @cable_names - list of supported cables. * @cable_names: list of supported cables.
* @num_cables - size of cable_names. * @num_cables: size of cable_names.
* @adc_conditions - list of adc value conditions. * @adc_conditions: list of adc value conditions.
* @num_conditions - size of adc_conditions. * @num_conditions: size of adc_conditions.
* @irq - irq number of attach/detach event (0 if not exist). * @irq: irq number of attach/detach event (0 if not exist).
* @handling_delay - interrupt handler will schedule extcon event * @handling_delay: interrupt handler will schedule extcon event
* handling at handling_delay jiffies. * handling at handling_delay jiffies.
* @handler - extcon event handler called by interrupt handler. * @handler: extcon event handler called by interrupt handler.
* @chan - iio channel being queried. * @chan: iio channel being queried.
*/ */
struct adc_jack_data { struct adc_jack_data {
struct extcon_dev edev; struct extcon_dev edev;
...@@ -64,7 +64,7 @@ static void adc_jack_handler(struct work_struct *work) ...@@ -64,7 +64,7 @@ static void adc_jack_handler(struct work_struct *work)
ret = iio_read_channel_raw(data->chan, &adc_val); ret = iio_read_channel_raw(data->chan, &adc_val);
if (ret < 0) { if (ret < 0) {
dev_err(data->edev.dev, "read channel() error: %d\n", ret); dev_err(&data->edev.dev, "read channel() error: %d\n", ret);
return; return;
} }
...@@ -95,7 +95,7 @@ static irqreturn_t adc_jack_irq_thread(int irq, void *_data) ...@@ -95,7 +95,7 @@ static irqreturn_t adc_jack_irq_thread(int irq, void *_data)
static int adc_jack_probe(struct platform_device *pdev) static int adc_jack_probe(struct platform_device *pdev)
{ {
struct adc_jack_data *data; struct adc_jack_data *data;
struct adc_jack_pdata *pdata = pdev->dev.platform_data; struct adc_jack_pdata *pdata = dev_get_platdata(&pdev->dev);
int i, err = 0; int i, err = 0;
data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
...@@ -110,6 +110,7 @@ static int adc_jack_probe(struct platform_device *pdev) ...@@ -110,6 +110,7 @@ static int adc_jack_probe(struct platform_device *pdev)
goto out; goto out;
} }
data->edev.dev.parent = &pdev->dev;
data->edev.supported_cable = pdata->cable_names; data->edev.supported_cable = pdata->cable_names;
/* Check the length of array and set num_cables */ /* Check the length of array and set num_cables */
...@@ -148,7 +149,7 @@ static int adc_jack_probe(struct platform_device *pdev) ...@@ -148,7 +149,7 @@ static int adc_jack_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, data); platform_set_drvdata(pdev, data);
err = extcon_dev_register(&data->edev, &pdev->dev); err = extcon_dev_register(&data->edev);
if (err) if (err)
goto out; goto out;
......
...@@ -86,8 +86,8 @@ struct arizona_extcon_info { ...@@ -86,8 +86,8 @@ struct arizona_extcon_info {
}; };
static const struct arizona_micd_config micd_default_modes[] = { static const struct arizona_micd_config micd_default_modes[] = {
{ ARIZONA_ACCDET_SRC, 1 << ARIZONA_MICD_BIAS_SRC_SHIFT, 0 }, { ARIZONA_ACCDET_SRC, 1, 0 },
{ 0, 2 << ARIZONA_MICD_BIAS_SRC_SHIFT, 1 }, { 0, 2, 1 },
}; };
static const struct arizona_micd_range micd_default_ranges[] = { static const struct arizona_micd_range micd_default_ranges[] = {
...@@ -182,7 +182,8 @@ static void arizona_extcon_set_mode(struct arizona_extcon_info *info, int mode) ...@@ -182,7 +182,8 @@ static void arizona_extcon_set_mode(struct arizona_extcon_info *info, int mode)
info->micd_modes[mode].gpio); info->micd_modes[mode].gpio);
regmap_update_bits(arizona->regmap, ARIZONA_MIC_DETECT_1, regmap_update_bits(arizona->regmap, ARIZONA_MIC_DETECT_1,
ARIZONA_MICD_BIAS_SRC_MASK, ARIZONA_MICD_BIAS_SRC_MASK,
info->micd_modes[mode].bias); info->micd_modes[mode].bias <<
ARIZONA_MICD_BIAS_SRC_SHIFT);
regmap_update_bits(arizona->regmap, ARIZONA_ACCESSORY_DETECT_MODE_1, regmap_update_bits(arizona->regmap, ARIZONA_ACCESSORY_DETECT_MODE_1,
ARIZONA_ACCDET_SRC, info->micd_modes[mode].src); ARIZONA_ACCDET_SRC, info->micd_modes[mode].src);
...@@ -193,7 +194,7 @@ static void arizona_extcon_set_mode(struct arizona_extcon_info *info, int mode) ...@@ -193,7 +194,7 @@ static void arizona_extcon_set_mode(struct arizona_extcon_info *info, int mode)
static const char *arizona_extcon_get_micbias(struct arizona_extcon_info *info) static const char *arizona_extcon_get_micbias(struct arizona_extcon_info *info)
{ {
switch (info->micd_modes[0].bias >> ARIZONA_MICD_BIAS_SRC_SHIFT) { switch (info->micd_modes[0].bias) {
case 1: case 1:
return "MICBIAS1"; return "MICBIAS1";
case 2: case 2:
...@@ -388,7 +389,7 @@ static int arizona_hpdet_read(struct arizona_extcon_info *info) ...@@ -388,7 +389,7 @@ static int arizona_hpdet_read(struct arizona_extcon_info *info)
>> ARIZONA_HP_IMPEDANCE_RANGE_SHIFT; >> ARIZONA_HP_IMPEDANCE_RANGE_SHIFT;
if (range < ARRAY_SIZE(arizona_hpdet_b_ranges) - 1 && if (range < ARRAY_SIZE(arizona_hpdet_b_ranges) - 1 &&
(val < 100 || val > 0x3fb)) { (val < 100 || val >= 0x3fb)) {
range++; range++;
dev_dbg(arizona->dev, "Moving to HPDET range %d\n", dev_dbg(arizona->dev, "Moving to HPDET range %d\n",
range); range);
...@@ -401,7 +402,7 @@ static int arizona_hpdet_read(struct arizona_extcon_info *info) ...@@ -401,7 +402,7 @@ static int arizona_hpdet_read(struct arizona_extcon_info *info)
} }
/* If we go out of range report top of range */ /* If we go out of range report top of range */
if (val < 100 || val > 0x3fb) { if (val < 100 || val >= 0x3fb) {
dev_dbg(arizona->dev, "Measurement out of range\n"); dev_dbg(arizona->dev, "Measurement out of range\n");
return ARIZONA_HPDET_MAX; return ARIZONA_HPDET_MAX;
} }
...@@ -514,7 +515,7 @@ static int arizona_hpdet_do_id(struct arizona_extcon_info *info, int *reading, ...@@ -514,7 +515,7 @@ static int arizona_hpdet_do_id(struct arizona_extcon_info *info, int *reading,
} }
/* /*
* If we measure the mic as * If we measure the mic as high impedance
*/ */
if (!id_gpio || info->hpdet_res[1] > 50) { if (!id_gpio || info->hpdet_res[1] > 50) {
dev_dbg(arizona->dev, "Detected mic\n"); dev_dbg(arizona->dev, "Detected mic\n");
...@@ -1042,6 +1043,7 @@ static irqreturn_t arizona_jackdet(int irq, void *data) ...@@ -1042,6 +1043,7 @@ static irqreturn_t arizona_jackdet(int irq, void *data)
else else
info->micd_timeout = DEFAULT_MICD_TIMEOUT; info->micd_timeout = DEFAULT_MICD_TIMEOUT;
out:
/* Clear trig_sts to make sure DCVDD is not forced up */ /* Clear trig_sts to make sure DCVDD is not forced up */
regmap_write(arizona->regmap, ARIZONA_AOD_WKUP_AND_TRIG, regmap_write(arizona->regmap, ARIZONA_AOD_WKUP_AND_TRIG,
ARIZONA_MICD_CLAMP_FALL_TRIG_STS | ARIZONA_MICD_CLAMP_FALL_TRIG_STS |
...@@ -1049,7 +1051,6 @@ static irqreturn_t arizona_jackdet(int irq, void *data) ...@@ -1049,7 +1051,6 @@ static irqreturn_t arizona_jackdet(int irq, void *data)
ARIZONA_JD1_FALL_TRIG_STS | ARIZONA_JD1_FALL_TRIG_STS |
ARIZONA_JD1_RISE_TRIG_STS); ARIZONA_JD1_RISE_TRIG_STS);
out:
mutex_unlock(&info->lock); mutex_unlock(&info->lock);
pm_runtime_mark_last_busy(info->dev); pm_runtime_mark_last_busy(info->dev);
...@@ -1132,9 +1133,10 @@ static int arizona_extcon_probe(struct platform_device *pdev) ...@@ -1132,9 +1133,10 @@ static int arizona_extcon_probe(struct platform_device *pdev)
} }
info->edev.name = "Headset Jack"; info->edev.name = "Headset Jack";
info->edev.dev.parent = arizona->dev;
info->edev.supported_cable = arizona_cable; info->edev.supported_cable = arizona_cable;
ret = extcon_dev_register(&info->edev, arizona->dev); ret = extcon_dev_register(&info->edev);
if (ret < 0) { if (ret < 0) {
dev_err(arizona->dev, "extcon_dev_register() failed: %d\n", dev_err(arizona->dev, "extcon_dev_register() failed: %d\n",
ret); ret);
......
This diff is collapsed.
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
struct gpio_extcon_data { struct gpio_extcon_data {
struct extcon_dev edev; struct extcon_dev edev;
unsigned gpio; unsigned gpio;
bool gpio_active_low;
const char *state_on; const char *state_on;
const char *state_off; const char *state_off;
int irq; int irq;
...@@ -49,6 +50,8 @@ static void gpio_extcon_work(struct work_struct *work) ...@@ -49,6 +50,8 @@ static void gpio_extcon_work(struct work_struct *work)
work); work);
state = gpio_get_value(data->gpio); state = gpio_get_value(data->gpio);
if (data->gpio_active_low)
state = !state;
extcon_set_state(&data->edev, state); extcon_set_state(&data->edev, state);
} }
...@@ -78,9 +81,9 @@ static ssize_t extcon_gpio_print_state(struct extcon_dev *edev, char *buf) ...@@ -78,9 +81,9 @@ static ssize_t extcon_gpio_print_state(struct extcon_dev *edev, char *buf)
static int gpio_extcon_probe(struct platform_device *pdev) static int gpio_extcon_probe(struct platform_device *pdev)
{ {
struct gpio_extcon_platform_data *pdata = pdev->dev.platform_data; struct gpio_extcon_platform_data *pdata = dev_get_platdata(&pdev->dev);
struct gpio_extcon_data *extcon_data; struct gpio_extcon_data *extcon_data;
int ret = 0; int ret;
if (!pdata) if (!pdata)
return -EBUSY; return -EBUSY;
...@@ -95,14 +98,22 @@ static int gpio_extcon_probe(struct platform_device *pdev) ...@@ -95,14 +98,22 @@ static int gpio_extcon_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
extcon_data->edev.name = pdata->name; extcon_data->edev.name = pdata->name;
extcon_data->edev.dev.parent = &pdev->dev;
extcon_data->gpio = pdata->gpio; extcon_data->gpio = pdata->gpio;
extcon_data->gpio_active_low = pdata->gpio_active_low;
extcon_data->state_on = pdata->state_on; extcon_data->state_on = pdata->state_on;
extcon_data->state_off = pdata->state_off; extcon_data->state_off = pdata->state_off;
if (pdata->state_on && pdata->state_off) if (pdata->state_on && pdata->state_off)
extcon_data->edev.print_state = extcon_gpio_print_state; extcon_data->edev.print_state = extcon_gpio_print_state;
extcon_data->debounce_jiffies = msecs_to_jiffies(pdata->debounce); if (pdata->debounce) {
ret = gpio_set_debounce(extcon_data->gpio,
pdata->debounce * 1000);
if (ret < 0)
extcon_data->debounce_jiffies =
msecs_to_jiffies(pdata->debounce);
}
ret = extcon_dev_register(&extcon_data->edev, &pdev->dev); ret = extcon_dev_register(&extcon_data->edev);
if (ret < 0) if (ret < 0)
return ret; return ret;
......
...@@ -965,7 +965,7 @@ static void max77693_muic_irq_work(struct work_struct *work) ...@@ -965,7 +965,7 @@ static void max77693_muic_irq_work(struct work_struct *work)
mutex_lock(&info->mutex); mutex_lock(&info->mutex);
for (i = 0 ; i < ARRAY_SIZE(muic_irqs) ; i++) for (i = 0; i < ARRAY_SIZE(muic_irqs); i++)
if (info->irq == muic_irqs[i].virq) if (info->irq == muic_irqs[i].virq)
irq_type = muic_irqs[i].irq; irq_type = muic_irqs[i].irq;
...@@ -1183,8 +1183,9 @@ static int max77693_muic_probe(struct platform_device *pdev) ...@@ -1183,8 +1183,9 @@ static int max77693_muic_probe(struct platform_device *pdev)
goto err_irq; goto err_irq;
} }
info->edev->name = DEV_NAME; info->edev->name = DEV_NAME;
info->edev->dev.parent = &pdev->dev;
info->edev->supported_cable = max77693_extcon_cable; info->edev->supported_cable = max77693_extcon_cable;
ret = extcon_dev_register(info->edev, NULL); ret = extcon_dev_register(info->edev);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to register extcon device\n"); dev_err(&pdev->dev, "failed to register extcon device\n");
goto err_irq; goto err_irq;
...@@ -1200,7 +1201,7 @@ static int max77693_muic_probe(struct platform_device *pdev) ...@@ -1200,7 +1201,7 @@ static int max77693_muic_probe(struct platform_device *pdev)
num_init_data = ARRAY_SIZE(default_init_data); num_init_data = ARRAY_SIZE(default_init_data);
} }
for (i = 0 ; i < num_init_data ; i++) { for (i = 0; i < num_init_data; i++) {
enum max77693_irq_source irq_src enum max77693_irq_source irq_src
= MAX77693_IRQ_GROUP_NR; = MAX77693_IRQ_GROUP_NR;
......
...@@ -539,7 +539,7 @@ static void max8997_muic_irq_work(struct work_struct *work) ...@@ -539,7 +539,7 @@ static void max8997_muic_irq_work(struct work_struct *work)
mutex_lock(&info->mutex); mutex_lock(&info->mutex);
for (i = 0 ; i < ARRAY_SIZE(muic_irqs) ; i++) for (i = 0; i < ARRAY_SIZE(muic_irqs); i++)
if (info->irq == muic_irqs[i].virq) if (info->irq == muic_irqs[i].virq)
irq_type = muic_irqs[i].irq; irq_type = muic_irqs[i].irq;
...@@ -707,8 +707,9 @@ static int max8997_muic_probe(struct platform_device *pdev) ...@@ -707,8 +707,9 @@ static int max8997_muic_probe(struct platform_device *pdev)
goto err_irq; goto err_irq;
} }
info->edev->name = DEV_NAME; info->edev->name = DEV_NAME;
info->edev->dev.parent = &pdev->dev;
info->edev->supported_cable = max8997_extcon_cable; info->edev->supported_cable = max8997_extcon_cable;
ret = extcon_dev_register(info->edev, NULL); ret = extcon_dev_register(info->edev);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to register extcon device\n"); dev_err(&pdev->dev, "failed to register extcon device\n");
goto err_irq; goto err_irq;
......
...@@ -135,7 +135,7 @@ static void palmas_enable_irq(struct palmas_usb *palmas_usb) ...@@ -135,7 +135,7 @@ static void palmas_enable_irq(struct palmas_usb *palmas_usb)
static int palmas_usb_probe(struct platform_device *pdev) static int palmas_usb_probe(struct platform_device *pdev)
{ {
struct palmas *palmas = dev_get_drvdata(pdev->dev.parent); struct palmas *palmas = dev_get_drvdata(pdev->dev.parent);
struct palmas_usb_platform_data *pdata = pdev->dev.platform_data; struct palmas_usb_platform_data *pdata = dev_get_platdata(&pdev->dev);
struct device_node *node = pdev->dev.of_node; struct device_node *node = pdev->dev.of_node;
struct palmas_usb *palmas_usb; struct palmas_usb *palmas_usb;
int status; int status;
...@@ -178,9 +178,10 @@ static int palmas_usb_probe(struct platform_device *pdev) ...@@ -178,9 +178,10 @@ static int palmas_usb_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, palmas_usb); platform_set_drvdata(pdev, palmas_usb);
palmas_usb->edev.supported_cable = palmas_extcon_cable; palmas_usb->edev.supported_cable = palmas_extcon_cable;
palmas_usb->edev.dev.parent = palmas_usb->dev;
palmas_usb->edev.mutually_exclusive = mutually_exclusive; palmas_usb->edev.mutually_exclusive = mutually_exclusive;
status = extcon_dev_register(&palmas_usb->edev, palmas_usb->dev); status = extcon_dev_register(&palmas_usb->edev);
if (status) { if (status) {
dev_err(&pdev->dev, "failed to register extcon device\n"); dev_err(&pdev->dev, "failed to register extcon device\n");
return status; return status;
......
...@@ -51,10 +51,10 @@ ...@@ -51,10 +51,10 @@
enum extcon_cable_name { enum extcon_cable_name {
EXTCON_USB = 0, EXTCON_USB = 0,
EXTCON_USB_HOST, EXTCON_USB_HOST,
EXTCON_TA, /* Travel Adaptor */ EXTCON_TA, /* Travel Adaptor */
EXTCON_FAST_CHARGER, EXTCON_FAST_CHARGER,
EXTCON_SLOW_CHARGER, EXTCON_SLOW_CHARGER,
EXTCON_CHARGE_DOWNSTREAM, /* Charging an external device */ EXTCON_CHARGE_DOWNSTREAM, /* Charging an external device */
EXTCON_HDMI, EXTCON_HDMI,
EXTCON_MHL, EXTCON_MHL,
EXTCON_DVI, EXTCON_DVI,
...@@ -76,8 +76,8 @@ struct extcon_cable; ...@@ -76,8 +76,8 @@ struct extcon_cable;
/** /**
* struct extcon_dev - An extcon device represents one external connector. * struct extcon_dev - An extcon device represents one external connector.
* @name: The name of this extcon device. Parent device name is used * @name: The name of this extcon device. Parent device name is
* if NULL. * used if NULL.
* @supported_cable: Array of supported cable names ending with NULL. * @supported_cable: Array of supported cable names ending with NULL.
* If supported_cable is NULL, cable name related APIs * If supported_cable is NULL, cable name related APIs
* are disabled. * are disabled.
...@@ -89,21 +89,21 @@ struct extcon_cable; ...@@ -89,21 +89,21 @@ struct extcon_cable;
* be attached simulataneously. {0x7, 0} is equivalent to * be attached simulataneously. {0x7, 0} is equivalent to
* {0x3, 0x6, 0x5, 0}. If it is {0xFFFFFFFF, 0}, there * {0x3, 0x6, 0x5, 0}. If it is {0xFFFFFFFF, 0}, there
* can be no simultaneous connections. * can be no simultaneous connections.
* @print_name: An optional callback to override the method to print the * @print_name: An optional callback to override the method to print the
* name of the extcon device. * name of the extcon device.
* @print_state: An optional callback to override the method to print the * @print_state: An optional callback to override the method to print the
* status of the extcon device. * status of the extcon device.
* @dev: Device of this extcon. Do not provide at register-time. * @dev: Device of this extcon.
* @state: Attach/detach state of this extcon. Do not provide at * @state: Attach/detach state of this extcon. Do not provide at
* register-time * register-time.
* @nh: Notifier for the state change events from this extcon * @nh: Notifier for the state change events from this extcon
* @entry: To support list of extcon devices so that users can search * @entry: To support list of extcon devices so that users can search
* for extcon devices based on the extcon name. * for extcon devices based on the extcon name.
* @lock: * @lock:
* @max_supported: Internal value to store the number of cables. * @max_supported: Internal value to store the number of cables.
* @extcon_dev_type: Device_type struct to provide attribute_groups * @extcon_dev_type: Device_type struct to provide attribute_groups
* customized for each extcon device. * 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 * In most cases, users only need to provide "User initializing data" of
* this struct when registering an extcon. In some exceptional cases, * this struct when registering an extcon. In some exceptional cases,
...@@ -111,26 +111,27 @@ struct extcon_cable; ...@@ -111,26 +111,27 @@ struct extcon_cable;
* are overwritten by register function. * are overwritten by register function.
*/ */
struct extcon_dev { struct extcon_dev {
/* --- Optional user initializing data --- */ /* Optional user initializing data */
const char *name; const char *name;
const char **supported_cable; 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_name)(struct extcon_dev *edev, char *buf);
ssize_t (*print_state)(struct extcon_dev *edev, char *buf); ssize_t (*print_state)(struct extcon_dev *edev, char *buf);
/* --- Internal data. Please do not set. --- */ /* Internal data. Please do not set. */
struct device *dev; struct device dev;
u32 state;
struct raw_notifier_head nh; struct raw_notifier_head nh;
struct list_head entry; struct list_head entry;
spinlock_t lock; /* could be called by irq handler */
int max_supported; int max_supported;
spinlock_t lock; /* could be called by irq handler */
u32 state;
/* /sys/class/extcon/.../cable.n/... */ /* /sys/class/extcon/.../cable.n/... */
struct device_type extcon_dev_type; struct device_type extcon_dev_type;
struct extcon_cable *cables; struct extcon_cable *cables;
/* /sys/class/extcon/.../mutually_exclusive/... */ /* /sys/class/extcon/.../mutually_exclusive/... */
struct attribute_group attr_g_muex; struct attribute_group attr_g_muex;
struct attribute **attrs_muex; struct attribute **attrs_muex;
...@@ -138,13 +139,13 @@ struct extcon_dev { ...@@ -138,13 +139,13 @@ struct extcon_dev {
}; };
/** /**
* struct extcon_cable - An internal data for each cable of extcon device. * struct extcon_cable - An internal data for each cable of extcon device.
* @edev: The extcon device * @edev: The extcon device
* @cable_index: Index of this cable in the edev * @cable_index: Index of this cable in the edev
* @attr_g: Attribute group for the cable * @attr_g: Attribute group for the cable
* @attr_name: "name" sysfs entry * @attr_name: "name" sysfs entry
* @attr_state: "state" sysfs entry * @attr_state: "state" sysfs entry
* @attrs: Array pointing to attr_name and attr_state for attr_g * @attrs: Array pointing to attr_name and attr_state for attr_g
*/ */
struct extcon_cable { struct extcon_cable {
struct extcon_dev *edev; struct extcon_dev *edev;
...@@ -159,11 +160,13 @@ struct extcon_cable { ...@@ -159,11 +160,13 @@ struct extcon_cable {
/** /**
* struct extcon_specific_cable_nb - An internal data for * struct extcon_specific_cable_nb - An internal data for
* extcon_register_interest(). * extcon_register_interest().
* @internal_nb: a notifier block bridging extcon notifier and cable notifier. * @internal_nb: A notifier block bridging extcon notifier
* @user_nb: user provided notifier block for events from a specific cable. * and cable notifier.
* @user_nb: user provided notifier block for events from
* a specific cable.
* @cable_index: the target cable. * @cable_index: the target cable.
* @edev: the target extcon device. * @edev: the target extcon device.
* @previous_value: the saved previous event value. * @previous_value: the saved previous event value.
*/ */
struct extcon_specific_cable_nb { struct extcon_specific_cable_nb {
...@@ -180,7 +183,7 @@ struct extcon_specific_cable_nb { ...@@ -180,7 +183,7 @@ struct extcon_specific_cable_nb {
* Following APIs are for notifiers or configurations. * Following APIs are for notifiers or configurations.
* Notifiers are the external port and connection devices. * 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 void extcon_dev_unregister(struct extcon_dev *edev);
extern struct extcon_dev *extcon_get_extcon_dev(const char *extcon_name); 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, ...@@ -238,8 +241,7 @@ extern int extcon_register_notifier(struct extcon_dev *edev,
extern int extcon_unregister_notifier(struct extcon_dev *edev, extern int extcon_unregister_notifier(struct extcon_dev *edev,
struct notifier_block *nb); struct notifier_block *nb);
#else /* CONFIG_EXTCON */ #else /* CONFIG_EXTCON */
static inline int extcon_dev_register(struct extcon_dev *edev, static inline int extcon_dev_register(struct extcon_dev *edev)
struct device *dev)
{ {
return 0; return 0;
} }
......
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
/** /**
* struct adc_jack_cond - condition to use an extcon state * struct adc_jack_cond - condition to use an extcon state
* @state - the corresponding extcon state (if 0, this struct denotes * @state: the corresponding extcon state (if 0, this struct
* the last adc_jack_cond element among the array) * denotes the last adc_jack_cond element among the array)
* @min_adc - min adc value for this condition * @min_adc: min adc value for this condition
* @max_adc - max 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 * 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 * that if ADC value is between (inclusive) 100 and 200, than the cable 0 and
...@@ -33,34 +33,34 @@ ...@@ -33,34 +33,34 @@
* because when no adc_jack_cond is met, state = 0 is automatically chosen. * because when no adc_jack_cond is met, state = 0 is automatically chosen.
*/ */
struct adc_jack_cond { struct adc_jack_cond {
u32 state; /* extcon state value. 0 if invalid */ u32 state; /* extcon state value. 0 if invalid */
u32 min_adc; u32 min_adc;
u32 max_adc; u32 max_adc;
}; };
/** /**
* struct adc_jack_pdata - platform data for adc jack device. * struct adc_jack_pdata - platform data for adc jack device.
* @name - name of the extcon device. If null, "adc-jack" is used. * @name: name of the extcon device. If null, "adc-jack" is used.
* @consumer_channel - Unique name to identify the channel on the consumer * @consumer_channel: Unique name to identify the channel on the consumer
* side. This typically describes the channels used within * side. This typically describes the channels used within
* the consumer. E.g. 'battery_voltage' * the consumer. E.g. 'battery_voltage'
* @cable_names - array of cable names ending with null. * @cable_names: array of cable names ending with null.
* @adc_contitions - array of struct adc_jack_cond conditions ending * @adc_contitions: array of struct adc_jack_cond conditions ending
* with .state = 0 entry. This describes how to decode * with .state = 0 entry. This describes how to decode
* adc values into extcon state. * adc values into extcon state.
* @irq_flags - irq flags used for the @irq * @irq_flags: irq flags used for the @irq
* @handling_delay_ms - in some devices, we need to read ADC value some * @handling_delay_ms: in some devices, we need to read ADC value some
* milli-seconds after the interrupt occurs. You may * milli-seconds after the interrupt occurs. You may
* describe such delays with @handling_delay_ms, which * describe such delays with @handling_delay_ms, which
* is rounded-off by jiffies. * is rounded-off by jiffies.
*/ */
struct adc_jack_pdata { struct adc_jack_pdata {
const char *name; const char *name;
const char *consumer_channel; const char *consumer_channel;
/*
* The last entry should be NULL /* The last entry should be NULL */
*/
const char **cable_names; const char **cable_names;
/* The last entry's state should be 0 */ /* The last entry's state should be 0 */
struct adc_jack_cond *adc_conditions; struct adc_jack_cond *adc_conditions;
......
...@@ -25,14 +25,17 @@ ...@@ -25,14 +25,17 @@
/** /**
* struct gpio_extcon_platform_data - A simple GPIO-controlled extcon device. * struct gpio_extcon_platform_data - A simple GPIO-controlled extcon device.
* @name The name of this GPIO extcon device. * @name: The name of this GPIO extcon device.
* @gpio Corresponding GPIO. * @gpio: Corresponding GPIO.
* @debounce Debounce time for GPIO IRQ in ms. * @gpio_active_low: Boolean describing whether gpio active state is 1 or 0
* @irq_flags IRQ Flags (e.g., IRQF_TRIGGER_LOW). * If true, low state of gpio means active.
* @state_on print_state is overriden with state_on if attached. If Null, * If false, high state of gpio means active.
* default method of extcon class is used. * @debounce: Debounce time for GPIO IRQ in ms.
* @state_off print_state is overriden with state_on if detached. If Null, * @irq_flags: IRQ Flags (e.g., IRQF_TRIGGER_LOW).
* default method of extcon class is used. * @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 * 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, * and state_off should be not NULL. If at least one of them is NULL,
...@@ -41,6 +44,7 @@ ...@@ -41,6 +44,7 @@
struct gpio_extcon_platform_data { struct gpio_extcon_platform_data {
const char *name; const char *name;
unsigned gpio; unsigned gpio;
bool gpio_active_low;
unsigned long debounce; unsigned long debounce;
unsigned long irq_flags; unsigned long irq_flags;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment