Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c29a476 authored by Michael Hennerich's avatar Michael Hennerich Committed by Samuel Ortiz
Browse files

gpio: adp5520: rename common defines and typos 



The common adp5520 mfd defines were namespaced to avoid collisions, so
update the define used in this driver accordingly.  The structs were also
renamed to fix a spelling typo.

Signed-off-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent c24b6b6a

drivers/gpio/adp5520-gpio.c

+20 −16
Original line number Original line Diff line number Diff line
@@ -34,9 +34,9 @@ static int adp5520_gpio_get_value(struct gpio_chip *chip, unsigned off) 
	 */

	 */





	if (test_bit(off, &dev->output))

	if (test_bit(off, &dev->output))

		adp5520_read(dev->master, GPIO_OUT, &reg_val);

		adp5520_read(dev->master, ADP5520_GPIO_OUT, &reg_val);

	else

	else

		adp5520_read(dev->master, GPIO_IN, &reg_val);

		adp5520_read(dev->master, ADP5520_GPIO_IN, &reg_val);





	return !!(reg_val & dev->lut[off]);

	return !!(reg_val & dev->lut[off]);

}

}
@@ -48,9 +48,9 @@ static void adp5520_gpio_set_value(struct gpio_chip *chip, 
	dev = container_of(chip, struct adp5520_gpio, gpio_chip);

	dev = container_of(chip, struct adp5520_gpio, gpio_chip);





	if (val)

	if (val)

		adp5520_set_bits(dev->master, GPIO_OUT, dev->lut[off]);

		adp5520_set_bits(dev->master, ADP5520_GPIO_OUT, dev->lut[off]);

	else

	else

		adp5520_clr_bits(dev->master, GPIO_OUT, dev->lut[off]);

		adp5520_clr_bits(dev->master, ADP5520_GPIO_OUT, dev->lut[off]);

}

}





static int adp5520_gpio_direction_input(struct gpio_chip *chip, unsigned off)

static int adp5520_gpio_direction_input(struct gpio_chip *chip, unsigned off)
@@ -60,7 +60,8 @@ static int adp5520_gpio_direction_input(struct gpio_chip *chip, unsigned off) 




	clear_bit(off, &dev->output);

	clear_bit(off, &dev->output);





	return adp5520_clr_bits(dev->master, GPIO_CFG_2, dev->lut[off]);

	return adp5520_clr_bits(dev->master, ADP5520_GPIO_CFG_2,

				dev->lut[off]);

}

}





static int adp5520_gpio_direction_output(struct gpio_chip *chip,

static int adp5520_gpio_direction_output(struct gpio_chip *chip,
@@ -73,18 +74,21 @@ static int adp5520_gpio_direction_output(struct gpio_chip *chip, 
	set_bit(off, &dev->output);

	set_bit(off, &dev->output);





	if (val)

	if (val)

		ret |= adp5520_set_bits(dev->master, GPIO_OUT, dev->lut[off]);

		ret |= adp5520_set_bits(dev->master, ADP5520_GPIO_OUT,

					dev->lut[off]);

	else

	else

		ret |= adp5520_clr_bits(dev->master, GPIO_OUT, dev->lut[off]);

		ret |= adp5520_clr_bits(dev->master, ADP5520_GPIO_OUT,

					dev->lut[off]);





	ret |= adp5520_set_bits(dev->master, GPIO_CFG_2, dev->lut[off]);

	ret |= adp5520_set_bits(dev->master, ADP5520_GPIO_CFG_2,

					dev->lut[off]);





	return ret;

	return ret;

}

}





static int __devinit adp5520_gpio_probe(struct platform_device *pdev)

static int __devinit adp5520_gpio_probe(struct platform_device *pdev)

{

{

	struct adp5520_gpio_platfrom_data *pdata = pdev->dev.platform_data;

	struct adp5520_gpio_platform_data *pdata = pdev->dev.platform_data;

	struct adp5520_gpio *dev;

	struct adp5520_gpio *dev;

	struct gpio_chip *gc;

	struct gpio_chip *gc;

	int ret, i, gpios;

	int ret, i, gpios;
@@ -129,20 +133,20 @@ static int __devinit adp5520_gpio_probe(struct platform_device *pdev) 
	gc->label = pdev->name;

	gc->label = pdev->name;

	gc->owner = THIS_MODULE;

	gc->owner = THIS_MODULE;





	ret = adp5520_clr_bits(dev->master, GPIO_CFG_1,

	ret = adp5520_clr_bits(dev->master, ADP5520_GPIO_CFG_1,

		pdata->gpio_en_mask);

		pdata->gpio_en_mask);





	if (pdata->gpio_en_mask & GPIO_C3)

	if (pdata->gpio_en_mask & ADP5520_GPIO_C3)

		ctl_mask |= C3_MODE;

		ctl_mask |= ADP5520_C3_MODE;





	if (pdata->gpio_en_mask & GPIO_R3)

	if (pdata->gpio_en_mask & ADP5520_GPIO_R3)

		ctl_mask |= R3_MODE;

		ctl_mask |= ADP5520_R3_MODE;





	if (ctl_mask)

	if (ctl_mask)

		ret = adp5520_set_bits(dev->master, LED_CONTROL,

		ret = adp5520_set_bits(dev->master, ADP5520_LED_CONTROL,

			ctl_mask);

			ctl_mask);





	ret |= adp5520_set_bits(dev->master, GPIO_PULLUP,

	ret |= adp5520_set_bits(dev->master, ADP5520_GPIO_PULLUP,

		pdata->gpio_pullup_mask);

		pdata->gpio_pullup_mask);





	if (ret) {

	if (ret) {