redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

Update extcon for 3.13

Browse source 
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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJSRNuGAAoJEJzN3yze689TcaQP/0jyJEFTkB0EsutUsK5K4Ul9
 Hv6G07ccCQZOR8Bk5VR3a/ldX2nMlc8uZkhCrcvxbPM9NDuUNt5Q18EFrMCYomwz
 bipFPds6Q2UuGxnaSgqBQKJ6PH/IYXTfS1Y2nbaOivKK18L62WBWw4wCz59WWyS8
 B4ROjn0OjfzHlbp3uPjjCAqY9PpVsxFfTxszR0+Xt4hbapet/7UTgyMO6fJRZ0JF
 gzWCKcXghRvv5ZEravX5sUc4SW6bNYKq3CgPBPIEmo33W0obk5bKOY5qDVdc7e03
 WhYCPhm/gYsEfHq/Ah9k9xz3Q5ObrNdDep5nAFrS4PpoyJfalYwpRmcExTTuCEXj
 CXmR/NpSK2BPlxgrQ32/bTve2bMtT16ZAMXKAIxHGwAUG/RAuQIZx0trjTSERNi1
 A0juMZG3a2o9q+heCIeUp/bjhMGqCgfmlSwGrinU6hZMEj8DL4KtgiZrozOp4RlF
 SX+LOvNA40EK+S2FljY30G3NkTCLksJimjQ6v37b1vhSnXBNh5R+lhzXUY6cBBHB
 b5oo+6P4A9CCcmoUg8XOb5/NEjJX8JxpUKGpF/saBgHOQl5xXAfYBYVi5HVpgrJ1
 Soqlv2s/wUxmGGjG9meC+AEvTu/DtKGNUMtGDZM8TUULAxwFsvdStSeJ5JHqyXuE
 iaAj5pGTNkFsXnwPISZT
 =8Hr2
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Greg Kroah-Hartman 2013-09-26 20:47:25 -07:00
parent 33b06938cf 42d7d7539a
commit 2424a7339b
11 changed files with 170 additions and 148 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Documentation/extcon/porting-android-switch-class
View file

@ -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
drivers/extcon/extcon-adc-jack.c
View file

@ -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)
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)
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)
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)
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;

20
drivers/extcon/extcon-arizona.c
View file

@ -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)
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)
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)
>> 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)
} }
/* 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,
} }
/* /*
* 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)
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)
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)
} }
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);

95
drivers/extcon/extcon-class.c
View file

@ -74,7 +74,7 @@ static DEFINE_MUTEX(extcon_dev_list_lock);
/** /**
* check_mutually_exclusive - Check if new_state violates mutually_exclusive * check_mutually_exclusive - Check if new_state violates mutually_exclusive
* condition. * condition.
* @edev: the extcon device * @edev: the extcon device
* @new_state: new cable attach status for @edev * @new_state: new cable attach status for @edev
* *
@ -105,7 +105,7 @@ static ssize_t state_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
int i, count = 0; int i, count = 0;
struct extcon_dev *edev = (struct extcon_dev *) dev_get_drvdata(dev); struct extcon_dev *edev = dev_get_drvdata(dev);
if (edev->print_state) { if (edev->print_state) {
int ret = edev->print_state(edev, buf); int ret = edev->print_state(edev, buf);
@ -134,7 +134,7 @@ static ssize_t state_store(struct device *dev, struct device_attribute *attr,
{ {
u32 state; u32 state;
ssize_t ret = 0; ssize_t ret = 0;
struct extcon_dev *edev = (struct extcon_dev *) dev_get_drvdata(dev); struct extcon_dev *edev = dev_get_drvdata(dev);
ret = sscanf(buf, "0x%x", &state); ret = sscanf(buf, "0x%x", &state);
if (ret == 0) if (ret == 0)
@ -152,7 +152,7 @@ static DEVICE_ATTR_RW(state);
static ssize_t name_show(struct device *dev, struct device_attribute *attr, static ssize_t name_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct extcon_dev *edev = (struct extcon_dev *) dev_get_drvdata(dev); struct extcon_dev *edev = dev_get_drvdata(dev);
/* Optional callback given by the user */ /* Optional callback given by the user */
if (edev->print_name) { if (edev->print_name) {
@ -161,7 +161,7 @@ static ssize_t name_show(struct device *dev, struct device_attribute *attr,
return ret; return ret;
} }
return sprintf(buf, "%s\n", dev_name(edev->dev)); return sprintf(buf, "%s\n", dev_name(&edev->dev));
} }
static DEVICE_ATTR_RO(name); static DEVICE_ATTR_RO(name);
@ -188,7 +188,7 @@ static ssize_t cable_state_show(struct device *dev,
/** /**
* extcon_update_state() - Update the cable attach states of the extcon device * extcon_update_state() - Update the cable attach states of the extcon device
* only for the masked bits. * only for the masked bits.
* @edev: the extcon device * @edev: the extcon device
* @mask: the bit mask to designate updated bits. * @mask: the bit mask to designate updated bits.
* @state: new cable attach status for @edev * @state: new cable attach status for @edev
@ -226,11 +226,10 @@ int extcon_update_state(struct extcon_dev *edev, u32 mask, u32 state)
edev->state |= state & mask; edev->state |= state & mask;
raw_notifier_call_chain(&edev->nh, old_state, edev); raw_notifier_call_chain(&edev->nh, old_state, edev);
/* This could be in interrupt handler */ /* This could be in interrupt handler */
prop_buf = (char *)get_zeroed_page(GFP_ATOMIC); prop_buf = (char *)get_zeroed_page(GFP_ATOMIC);
if (prop_buf) { if (prop_buf) {
length = name_show(edev->dev, NULL, prop_buf); length = name_show(&edev->dev, NULL, prop_buf);
if (length > 0) { if (length > 0) {
if (prop_buf[length - 1] == '\n') if (prop_buf[length - 1] == '\n')
prop_buf[length - 1] = 0; prop_buf[length - 1] = 0;
@ -238,7 +237,7 @@ int extcon_update_state(struct extcon_dev *edev, u32 mask, u32 state)
"NAME=%s", prop_buf); "NAME=%s", prop_buf);
envp[env_offset++] = name_buf; envp[env_offset++] = name_buf;
} }
length = state_show(edev->dev, NULL, prop_buf); length = state_show(&edev->dev, NULL, prop_buf);
if (length > 0) { if (length > 0) {
if (prop_buf[length - 1] == '\n') if (prop_buf[length - 1] == '\n')
prop_buf[length - 1] = 0; prop_buf[length - 1] = 0;
@ -250,14 +249,14 @@ int extcon_update_state(struct extcon_dev *edev, u32 mask, u32 state)
/* Unlock early before uevent */ /* Unlock early before uevent */
spin_unlock_irqrestore(&edev->lock, flags); spin_unlock_irqrestore(&edev->lock, flags);
kobject_uevent_env(&edev->dev->kobj, KOBJ_CHANGE, envp); kobject_uevent_env(&edev->dev.kobj, KOBJ_CHANGE, envp);
free_page((unsigned long)prop_buf); free_page((unsigned long)prop_buf);
} else { } else {
/* Unlock early before uevent */ /* Unlock early before uevent */
spin_unlock_irqrestore(&edev->lock, flags); spin_unlock_irqrestore(&edev->lock, flags);
dev_err(edev->dev, "out of memory in extcon_set_state\n"); dev_err(&edev->dev, "out of memory in extcon_set_state\n");
kobject_uevent(&edev->dev->kobj, KOBJ_CHANGE); kobject_uevent(&edev->dev.kobj, KOBJ_CHANGE);
} }
} else { } else {
/* No changes */ /* No changes */
@ -338,8 +337,9 @@ EXPORT_SYMBOL_GPL(extcon_get_cable_state);
/** /**
* extcon_set_cable_state_() - Set the status of a specific cable. * extcon_set_cable_state_() - Set the status of a specific cable.
* @edev: the extcon device that has the cable. * @edev: the extcon device that has the cable.
* @index: cable index that can be retrieved by extcon_find_cable_index(). * @index: cable index that can be retrieved by
* extcon_find_cable_index().
* @cable_state: the new cable status. The default semantics is * @cable_state: the new cable status. The default semantics is
* true: attached / false: detached. * true: attached / false: detached.
*/ */
@ -358,8 +358,8 @@ EXPORT_SYMBOL_GPL(extcon_set_cable_state_);
/** /**
* extcon_set_cable_state() - Set the status of a specific cable. * extcon_set_cable_state() - Set the status of a specific cable.
* @edev: the extcon device that has the cable. * @edev: the extcon device that has the cable.
* @cable_name: cable name. * @cable_name: cable name.
* @cable_state: the new cable status. The default semantics is * @cable_state: the new cable status. The default semantics is
* true: attached / false: detached. * true: attached / false: detached.
* *
@ -418,14 +418,14 @@ static int _call_per_cable(struct notifier_block *nb, unsigned long val,
/** /**
* extcon_register_interest() - Register a notifier for a state change of a * extcon_register_interest() - Register a notifier for a state change of a
* specific cable, not an entier set of cables of a * specific cable, not an entier set of cables of a
* extcon device. * extcon device.
* @obj: an empty extcon_specific_cable_nb object to be returned. * @obj: an empty extcon_specific_cable_nb object to be returned.
* @extcon_name: the name of extcon device. * @extcon_name: the name of extcon device.
* if NULL, extcon_register_interest will register * if NULL, extcon_register_interest will register
* every cable with the target cable_name given. * every cable with the target cable_name given.
* @cable_name: the target cable name. * @cable_name: the target cable name.
* @nb: the notifier block to get notified. * @nb: the notifier block to get notified.
* *
* Provide an empty extcon_specific_cable_nb. extcon_register_interest() sets * Provide an empty extcon_specific_cable_nb. extcon_register_interest() sets
* the struct for you. * the struct for you.
@ -471,7 +471,7 @@ int extcon_register_interest(struct extcon_specific_cable_nb *obj,
return -ENODEV; return -ENODEV;
class_dev_iter_init(&iter, extcon_class, NULL, NULL); class_dev_iter_init(&iter, extcon_class, NULL, NULL);
while ((dev = class_dev_iter_next(&iter))) { while ((dev = class_dev_iter_next(&iter))) {
extd = (struct extcon_dev *)dev_get_drvdata(dev); extd = dev_get_drvdata(dev);
if (extcon_find_cable_index(extd, cable_name) < 0) if (extcon_find_cable_index(extd, cable_name) < 0)
continue; continue;
@ -488,7 +488,7 @@ EXPORT_SYMBOL_GPL(extcon_register_interest);
/** /**
* extcon_unregister_interest() - Unregister the notifier registered by * extcon_unregister_interest() - Unregister the notifier registered by
* extcon_register_interest(). * extcon_register_interest().
* @obj: the extcon_specific_cable_nb object returned by * @obj: the extcon_specific_cable_nb object returned by
* extcon_register_interest(). * extcon_register_interest().
*/ */
@ -503,7 +503,7 @@ EXPORT_SYMBOL_GPL(extcon_unregister_interest);
/** /**
* extcon_register_notifier() - Register a notifiee to get notified by * extcon_register_notifier() - Register a notifiee to get notified by
* any attach status changes from the extcon. * any attach status changes from the extcon.
* @edev: the extcon device. * @edev: the extcon device.
* @nb: a notifier block to be registered. * @nb: a notifier block to be registered.
* *
@ -557,7 +557,6 @@ static int create_extcon_class(void)
static void extcon_dev_release(struct device *dev) static void extcon_dev_release(struct device *dev)
{ {
kfree(dev);
} }
static const char *muex_name = "mutually_exclusive"; static const char *muex_name = "mutually_exclusive";
@ -568,14 +567,13 @@ static void dummy_sysfs_dev_release(struct device *dev)
/** /**
* extcon_dev_register() - Register a new extcon device * extcon_dev_register() - Register a new extcon device
* @edev : the new extcon device (should be allocated before calling) * @edev : the new extcon device (should be allocated before calling)
* @dev : the parent device for this extcon device.
* *
* Among the members of edev struct, please set the "user initializing data" * Among the members of edev struct, please set the "user initializing data"
* in any case and set the "optional callbacks" if required. However, please * in any case and set the "optional callbacks" if required. However, please
* do not set the values of "internal data", which are initialized by * do not set the values of "internal data", which are initialized by
* this function. * this function.
*/ */
int extcon_dev_register(struct extcon_dev *edev, struct device *dev) int extcon_dev_register(struct extcon_dev *edev)
{ {
int ret, index = 0; int ret, index = 0;
@ -595,19 +593,20 @@ int extcon_dev_register(struct extcon_dev *edev, struct device *dev)
} }
if (index > SUPPORTED_CABLE_MAX) { if (index > SUPPORTED_CABLE_MAX) {
dev_err(edev->dev, "extcon: maximum number of supported cables exceeded.\n"); dev_err(&edev->dev, "extcon: maximum number of supported cables exceeded.\n");
return -EINVAL; return -EINVAL;
} }
edev->dev = kzalloc(sizeof(struct device), GFP_KERNEL); edev->dev.class = extcon_class;
if (!edev->dev) edev->dev.release = extcon_dev_release;
return -ENOMEM;
edev->dev->parent = dev;
edev->dev->class = extcon_class;
edev->dev->release = extcon_dev_release;
edev->name = edev->name ? edev->name : dev_name(dev); edev->name = edev->name ? edev->name : dev_name(edev->dev.parent);
dev_set_name(edev->dev, "%s", edev->name); if (IS_ERR_OR_NULL(edev->name)) {
dev_err(&edev->dev,
"extcon device name is null\n");
return -EINVAL;
}
dev_set_name(&edev->dev, "%s", edev->name);
if (edev->max_supported) { if (edev->max_supported) {
char buf[10]; char buf[10];
@ -715,7 +714,7 @@ int extcon_dev_register(struct extcon_dev *edev, struct device *dev)
goto err_alloc_groups; goto err_alloc_groups;
} }
edev->extcon_dev_type.name = dev_name(edev->dev); edev->extcon_dev_type.name = dev_name(&edev->dev);
edev->extcon_dev_type.release = dummy_sysfs_dev_release; edev->extcon_dev_type.release = dummy_sysfs_dev_release;
for (index = 0; index < edev->max_supported; index++) for (index = 0; index < edev->max_supported; index++)
@ -725,25 +724,24 @@ int extcon_dev_register(struct extcon_dev *edev, struct device *dev)
edev->extcon_dev_type.groups[index] = edev->extcon_dev_type.groups[index] =
&edev->attr_g_muex; &edev->attr_g_muex;
edev->dev->type = &edev->extcon_dev_type; edev->dev.type = &edev->extcon_dev_type;
} }
ret = device_register(edev->dev); ret = device_register(&edev->dev);
if (ret) { if (ret) {
put_device(edev->dev); put_device(&edev->dev);
goto err_dev; goto err_dev;
} }
#if defined(CONFIG_ANDROID) #if defined(CONFIG_ANDROID)
if (switch_class) if (switch_class)
ret = class_compat_create_link(switch_class, edev->dev, ret = class_compat_create_link(switch_class, &edev->dev, NULL);
NULL);
#endif /* CONFIG_ANDROID */ #endif /* CONFIG_ANDROID */
spin_lock_init(&edev->lock); spin_lock_init(&edev->lock);
RAW_INIT_NOTIFIER_HEAD(&edev->nh); RAW_INIT_NOTIFIER_HEAD(&edev->nh);
dev_set_drvdata(edev->dev, edev); dev_set_drvdata(&edev->dev, edev);
edev->state = 0; edev->state = 0;
mutex_lock(&extcon_dev_list_lock); mutex_lock(&extcon_dev_list_lock);
@ -769,7 +767,6 @@ err_alloc_cables:
if (edev->max_supported) if (edev->max_supported)
kfree(edev->cables); kfree(edev->cables);
err_sysfs_alloc: err_sysfs_alloc:
kfree(edev->dev);
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(extcon_dev_register); EXPORT_SYMBOL_GPL(extcon_dev_register);
@ -789,9 +786,9 @@ void extcon_dev_unregister(struct extcon_dev *edev)
list_del(&edev->entry); list_del(&edev->entry);
mutex_unlock(&extcon_dev_list_lock); mutex_unlock(&extcon_dev_list_lock);
if (IS_ERR_OR_NULL(get_device(edev->dev))) { if (IS_ERR_OR_NULL(get_device(&edev->dev))) {
dev_err(edev->dev, "Failed to unregister extcon_dev (%s)\n", dev_err(&edev->dev, "Failed to unregister extcon_dev (%s)\n",
dev_name(edev->dev)); dev_name(&edev->dev));
return; return;
} }
@ -813,10 +810,10 @@ void extcon_dev_unregister(struct extcon_dev *edev)
#if defined(CONFIG_ANDROID) #if defined(CONFIG_ANDROID)
if (switch_class) if (switch_class)
class_compat_remove_link(switch_class, edev->dev, NULL); class_compat_remove_link(switch_class, &edev->dev, NULL);
#endif #endif
device_unregister(edev->dev); device_unregister(&edev->dev);
put_device(edev->dev); put_device(&edev->dev);
} }
EXPORT_SYMBOL_GPL(extcon_dev_unregister); EXPORT_SYMBOL_GPL(extcon_dev_unregister);

19
drivers/extcon/extcon-gpio.c
View file

@ -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)
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)
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)
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;

7
drivers/extcon/extcon-max77693.c
View file

@ -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)
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)
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;

5
drivers/extcon/extcon-max8997.c
View file

@ -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)
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;

5
drivers/extcon/extcon-palmas.c
View file

@ -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)
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;

72
include/linux/extcon.h
View file

@ -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;
/** /**
* 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;
* 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;
* 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 {
}; };
/** /**
* 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 {
/** /**
* 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 {
* 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,
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;
} }

42
include/linux/extcon/extcon-adc-jack.h
View file

@ -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 @@
* 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;

20
include/linux/extcon/extcon-gpio.h
View file

@ -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 @@
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;