Commit 8bc4810b authored by Linus Walleij's avatar Linus Walleij Committed by Chanwoo Choi
Browse files

extcon: gpio: Request reasonable interrupts 



The only thing that makes sense is to request a falling edge interrupt
if the line is active low and a rising edge interrupt if the line is
active high, so just do that and get rid of the assignment from
platform data. The GPIO descriptor knows if the line is active high
or low.

Also make irq a local variable in probe(), it's not used anywhere else.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
[cw00.choi: Fix build error of data->irq_flags]
Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
parent 7d2b0227

drivers/extcon/extcon-gpio.c

+19 −10
Original line number Diff line number Diff line
@@ -22,26 +22,22 @@ 
/**

 * struct gpio_extcon_data - A simple GPIO-controlled extcon device state container.

 * @edev:		Extcon device.

 * @irq:		Interrupt line for the external connector.

 * @work:		Work fired by the interrupt.

 * @debounce_jiffies:	Number of jiffies to wait for the GPIO to stabilize, from the debounce

 *			value.

 * @gpiod:		GPIO descriptor for this external connector.

 * @extcon_id:		The unique id of specific external connector.

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

 *			while resuming from sleep.

 */

struct gpio_extcon_data {

	struct extcon_dev *edev;

	int irq;

	struct delayed_work work;

	unsigned long debounce_jiffies;

	struct gpio_desc *gpiod;

	unsigned int extcon_id;

	unsigned long debounce;

	unsigned long irq_flags;

	bool check_on_resume;

};
@@ -69,6 +65,8 @@ static int gpio_extcon_probe(struct platform_device *pdev) 
{

	struct gpio_extcon_data *data;

	struct device *dev = &pdev->dev;

	unsigned long irq_flags;

	int irq;

	int ret;



	data = devm_kzalloc(dev, sizeof(struct gpio_extcon_data), GFP_KERNEL);
@@ -82,15 +80,26 @@ static int gpio_extcon_probe(struct platform_device *pdev) 
	 * developed to get the extcon id from device-tree or others.

	 * On later, it have to be solved.

	 */

	if (!data->irq_flags || data->extcon_id > EXTCON_NONE)

	if (data->extcon_id > EXTCON_NONE)

		return -EINVAL;



	data->gpiod = devm_gpiod_get(dev, "extcon", GPIOD_IN);

	if (IS_ERR(data->gpiod))

		return PTR_ERR(data->gpiod);

	data->irq = gpiod_to_irq(data->gpiod);

	if (data->irq <= 0)

		return data->irq;

	irq = gpiod_to_irq(data->gpiod);

	if (irq <= 0)

		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 */

	data->edev = devm_extcon_dev_allocate(dev, &data->extcon_id);
@@ -109,8 +118,8 @@ static int gpio_extcon_probe(struct platform_device *pdev) 
	 * Request the interrupt of gpio to detect whether external connector

	 * is attached or detached.

	 */

	ret = devm_request_any_context_irq(dev, data->irq,

					gpio_irq_handler, data->irq_flags,

	ret = devm_request_any_context_irq(dev, irq,

					gpio_irq_handler, irq_flags,

					pdev->name, data);

	if (ret < 0)

		return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE