提交 77fda29f 编写于 作者: G Greg Kroah-Hartman

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

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

Chanwoo writes:

Update extcon for 5.4

Detailed description for this pull request:
1. Clean up the and fix the minor issue of extcon provider driver
- extcon-arizona/max77843 replace the helper function
  with more correct helper function without operation changes.
- extcon-fsa9480 supports the FSA880 variant by adding the compatible name.
- extcon-arizona updates the dt-binding file for the readability.
- extcon-gpio initializes the interrupt flags according to active-low state.
- Clean up extcon-sm5502/axp288/adc-jack

* tag 'extcon-next-for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon:
  extcon: adc-jack: Remove dev_err() usage after platform_get_irq()
  extcon: axp288: Use for_each_set_bit() in axp288_extcon_log_rsi()
  extcon: axp288: Add missed error check
  extcon: sm5502: Add IRQ_ONESHOT
  extcon: gpio: Request reasonable interrupts
  extcon: arizona: Update binding example to use available defines
  extcon: fsa9480: Support the FSA880 variant
  extcon: extcon-max77843: convert to i2c_new_dummy_device
  extcon: arizona: Switch to use device_property_count_u32()
...@@ -72,5 +72,5 @@ codec: wm8280@0 { ...@@ -72,5 +72,5 @@ codec: wm8280@0 {
1 2 1 /* MICDET2 MICBIAS2 GPIO=high */ 1 2 1 /* MICDET2 MICBIAS2 GPIO=high */
>; >;
wlf,gpsw = <0>; wlf,gpsw = <ARIZONA_GPSW_OPEN>;
}; };
...@@ -5,7 +5,9 @@ controlled using I2C and enables USB data, stereo and mono audio, video, ...@@ -5,7 +5,9 @@ controlled using I2C and enables USB data, stereo and mono audio, video,
microphone, and UART data to use a common connector port. microphone, and UART data to use a common connector port.
Required properties: Required properties:
- compatible : Must be "fcs,fsa9480" - compatible : Must be one of
"fcs,fsa9480"
"fcs,fsa880"
- reg : Specifies i2c slave address. Must be 0x25. - reg : Specifies i2c slave address. Must be 0x25.
- interrupts : Should contain one entry specifying interrupt signal of - interrupts : Should contain one entry specifying interrupt signal of
interrupt parent to which interrupt pin of the chip is connected. interrupt parent to which interrupt pin of the chip is connected.
......
...@@ -140,10 +140,8 @@ static int adc_jack_probe(struct platform_device *pdev) ...@@ -140,10 +140,8 @@ static int adc_jack_probe(struct platform_device *pdev)
return err; return err;
data->irq = platform_get_irq(pdev, 0); data->irq = platform_get_irq(pdev, 0);
if (data->irq < 0) { if (data->irq < 0)
dev_err(&pdev->dev, "platform_get_irq failed\n");
return -ENODEV; return -ENODEV;
}
err = request_any_context_irq(data->irq, adc_jack_irq_thread, err = request_any_context_irq(data->irq, adc_jack_irq_thread,
pdata->irq_flags, pdata->name, data); pdata->irq_flags, pdata->name, data);
......
...@@ -1253,7 +1253,7 @@ static int arizona_extcon_get_micd_configs(struct device *dev, ...@@ -1253,7 +1253,7 @@ static int arizona_extcon_get_micd_configs(struct device *dev,
int i, j; int i, j;
u32 *vals; u32 *vals;
nconfs = device_property_read_u32_array(arizona->dev, prop, NULL, 0); nconfs = device_property_count_u32(arizona->dev, prop);
if (nconfs <= 0) if (nconfs <= 0)
return 0; return 0;
......
...@@ -121,7 +121,6 @@ static const char * const axp288_pwr_up_down_info[] = { ...@@ -121,7 +121,6 @@ static const char * const axp288_pwr_up_down_info[] = {
"Last shutdown caused by PMIC UVLO threshold", "Last shutdown caused by PMIC UVLO threshold",
"Last shutdown caused by SOC initiated cold off", "Last shutdown caused by SOC initiated cold off",
"Last shutdown caused by user pressing the power button", "Last shutdown caused by user pressing the power button",
NULL,
}; };
/* /*
...@@ -130,18 +129,21 @@ static const char * const axp288_pwr_up_down_info[] = { ...@@ -130,18 +129,21 @@ static const char * const axp288_pwr_up_down_info[] = {
*/ */
static void axp288_extcon_log_rsi(struct axp288_extcon_info *info) static void axp288_extcon_log_rsi(struct axp288_extcon_info *info)
{ {
const char * const *rsi;
unsigned int val, i, clear_mask = 0; unsigned int val, i, clear_mask = 0;
unsigned long bits;
int ret; int ret;
ret = regmap_read(info->regmap, AXP288_PS_BOOT_REASON_REG, &val); ret = regmap_read(info->regmap, AXP288_PS_BOOT_REASON_REG, &val);
for (i = 0, rsi = axp288_pwr_up_down_info; *rsi; rsi++, i++) { if (ret < 0) {
if (val & BIT(i)) { dev_err(info->dev, "failed to read reset source indicator\n");
dev_dbg(info->dev, "%s\n", *rsi); return;
clear_mask |= BIT(i);
}
} }
bits = val & GENMASK(ARRAY_SIZE(axp288_pwr_up_down_info) - 1, 0);
for_each_set_bit(i, &bits, ARRAY_SIZE(axp288_pwr_up_down_info))
dev_dbg(info->dev, "%s\n", axp288_pwr_up_down_info[i]);
clear_mask = bits;
/* Clear the register value for next reboot (write 1 to clear bit) */ /* Clear the register value for next reboot (write 1 to clear bit) */
regmap_write(info->regmap, AXP288_PS_BOOT_REASON_REG, clear_mask); regmap_write(info->regmap, AXP288_PS_BOOT_REASON_REG, clear_mask);
} }
......
...@@ -363,6 +363,7 @@ MODULE_DEVICE_TABLE(i2c, fsa9480_id); ...@@ -363,6 +363,7 @@ MODULE_DEVICE_TABLE(i2c, fsa9480_id);
static const struct of_device_id fsa9480_of_match[] = { static const struct of_device_id fsa9480_of_match[] = {
{ .compatible = "fcs,fsa9480", }, { .compatible = "fcs,fsa9480", },
{ .compatible = "fcs,fsa880", },
{ }, { },
}; };
MODULE_DEVICE_TABLE(of, fsa9480_of_match); MODULE_DEVICE_TABLE(of, fsa9480_of_match);
......
...@@ -22,26 +22,22 @@ ...@@ -22,26 +22,22 @@
/** /**
* struct gpio_extcon_data - A simple GPIO-controlled extcon device state container. * struct gpio_extcon_data - A simple GPIO-controlled extcon device state container.
* @edev: Extcon device. * @edev: Extcon device.
* @irq: Interrupt line for the external connector.
* @work: Work fired by the interrupt. * @work: Work fired by the interrupt.
* @debounce_jiffies: Number of jiffies to wait for the GPIO to stabilize, from the debounce * @debounce_jiffies: Number of jiffies to wait for the GPIO to stabilize, from the debounce
* value. * value.
* @gpiod: GPIO descriptor for this external connector. * @gpiod: GPIO descriptor for this external connector.
* @extcon_id: The unique id of specific external connector. * @extcon_id: The unique id of specific external connector.
* @debounce: Debounce time for GPIO IRQ in ms. * @debounce: Debounce time for GPIO IRQ in ms.
* @irq_flags: IRQ Flags (e.g., IRQF_TRIGGER_LOW).
* @check_on_resume: Boolean describing whether to check the state of gpio * @check_on_resume: Boolean describing whether to check the state of gpio
* while resuming from sleep. * while resuming from sleep.
*/ */
struct gpio_extcon_data { struct gpio_extcon_data {
struct extcon_dev *edev; struct extcon_dev *edev;
int irq;
struct delayed_work work; struct delayed_work work;
unsigned long debounce_jiffies; unsigned long debounce_jiffies;
struct gpio_desc *gpiod; struct gpio_desc *gpiod;
unsigned int extcon_id; unsigned int extcon_id;
unsigned long debounce; unsigned long debounce;
unsigned long irq_flags;
bool check_on_resume; bool check_on_resume;
}; };
...@@ -69,6 +65,8 @@ static int gpio_extcon_probe(struct platform_device *pdev) ...@@ -69,6 +65,8 @@ static int gpio_extcon_probe(struct platform_device *pdev)
{ {
struct gpio_extcon_data *data; struct gpio_extcon_data *data;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
unsigned long irq_flags;
int irq;
int ret; int ret;
data = devm_kzalloc(dev, sizeof(struct gpio_extcon_data), GFP_KERNEL); data = devm_kzalloc(dev, sizeof(struct gpio_extcon_data), GFP_KERNEL);
...@@ -82,15 +80,26 @@ static int gpio_extcon_probe(struct platform_device *pdev) ...@@ -82,15 +80,26 @@ static int gpio_extcon_probe(struct platform_device *pdev)
* developed to get the extcon id from device-tree or others. * developed to get the extcon id from device-tree or others.
* On later, it have to be solved. * On later, it have to be solved.
*/ */
if (!data->irq_flags || data->extcon_id > EXTCON_NONE) if (data->extcon_id > EXTCON_NONE)
return -EINVAL; return -EINVAL;
data->gpiod = devm_gpiod_get(dev, "extcon", GPIOD_IN); data->gpiod = devm_gpiod_get(dev, "extcon", GPIOD_IN);
if (IS_ERR(data->gpiod)) if (IS_ERR(data->gpiod))
return PTR_ERR(data->gpiod); return PTR_ERR(data->gpiod);
data->irq = gpiod_to_irq(data->gpiod); irq = gpiod_to_irq(data->gpiod);
if (data->irq <= 0) if (irq <= 0)
return data->irq; return irq;
/*
* It is unlikely that this is an acknowledged interrupt that goes
* away after handling, what we are looking for are falling edges
* if the signal is active low, and rising edges if the signal is
* active high.
*/
if (gpiod_is_active_low(data->gpiod))
irq_flags = IRQF_TRIGGER_FALLING;
else
irq_flags = IRQF_TRIGGER_RISING;
/* Allocate the memory of extcon devie and register extcon device */ /* Allocate the memory of extcon devie and register extcon device */
data->edev = devm_extcon_dev_allocate(dev, &data->extcon_id); data->edev = devm_extcon_dev_allocate(dev, &data->extcon_id);
...@@ -109,8 +118,8 @@ static int gpio_extcon_probe(struct platform_device *pdev) ...@@ -109,8 +118,8 @@ static int gpio_extcon_probe(struct platform_device *pdev)
* Request the interrupt of gpio to detect whether external connector * Request the interrupt of gpio to detect whether external connector
* is attached or detached. * is attached or detached.
*/ */
ret = devm_request_any_context_irq(dev, data->irq, ret = devm_request_any_context_irq(dev, irq,
gpio_irq_handler, data->irq_flags, gpio_irq_handler, irq_flags,
pdev->name, data); pdev->name, data);
if (ret < 0) if (ret < 0)
return ret; return ret;
......
...@@ -774,12 +774,12 @@ static int max77843_init_muic_regmap(struct max77693_dev *max77843) ...@@ -774,12 +774,12 @@ static int max77843_init_muic_regmap(struct max77693_dev *max77843)
{ {
int ret; int ret;
max77843->i2c_muic = i2c_new_dummy(max77843->i2c->adapter, max77843->i2c_muic = i2c_new_dummy_device(max77843->i2c->adapter,
I2C_ADDR_MUIC); I2C_ADDR_MUIC);
if (!max77843->i2c_muic) { if (IS_ERR(max77843->i2c_muic)) {
dev_err(&max77843->i2c->dev, dev_err(&max77843->i2c->dev,
"Cannot allocate I2C device for MUIC\n"); "Cannot allocate I2C device for MUIC\n");
return -ENOMEM; return PTR_ERR(max77843->i2c_muic);
} }
i2c_set_clientdata(max77843->i2c_muic, max77843); i2c_set_clientdata(max77843->i2c_muic, max77843);
......
...@@ -597,7 +597,7 @@ static int sm5022_muic_i2c_probe(struct i2c_client *i2c, ...@@ -597,7 +597,7 @@ static int sm5022_muic_i2c_probe(struct i2c_client *i2c,
ret = devm_request_threaded_irq(info->dev, virq, NULL, ret = devm_request_threaded_irq(info->dev, virq, NULL,
sm5502_muic_irq_handler, sm5502_muic_irq_handler,
IRQF_NO_SUSPEND, IRQF_NO_SUSPEND | IRQF_ONESHOT,
muic_irq->name, info); muic_irq->name, info);
if (ret) { if (ret) {
dev_err(info->dev, dev_err(info->dev,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册