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

Commit e3296f19 authored by Nava kishore Manne's avatar Nava kishore Manne Committed by Linus Walleij
Browse files

gpio: Added zynq specific check for special pins on bank zero 



This patch adds zynq specific check for bank 0 pins 7 and 8
are special and cannot be used as inputs

Signed-off-by: default avatarNava kishore Manne <navam@xilinx.com>
Reported-by: default avatarJonas Karlsson <Jonas.d.karlsson@gmail.com>
Acked-by: default avatarSören Brinkmann <soren.brinkmann@xilinx.com>
Acked-by: default avatarMichal Simek <michal.simek@xilinx.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 81d3753d

drivers/gpio/gpio-zynq.c

+13 −2
Original line number Diff line number Diff line
@@ -96,6 +96,9 @@ 
/* GPIO upper 16 bit mask */

#define ZYNQ_GPIO_UPPER_MASK 0xFFFF0000



/* For GPIO quirks */

#define ZYNQ_GPIO_QUIRK_FOO	BIT(0)



/**

 * struct zynq_gpio - gpio device private data structure

 * @chip:	instance of the gpio_chip
@@ -122,6 +125,7 @@ struct zynq_gpio { 
*/

struct zynq_platform_data {

	const char *label;

	u32 quirks;

	u16 ngpio;

	int max_bank;

	int bank_min[ZYNQMP_GPIO_MAX_BANK];
@@ -238,13 +242,19 @@ static void zynq_gpio_set_value(struct gpio_chip *chip, unsigned int pin, 
static int zynq_gpio_dir_in(struct gpio_chip *chip, unsigned int pin)

{

	u32 reg;

	bool is_zynq_gpio;

	unsigned int bank_num, bank_pin_num;

	struct zynq_gpio *gpio = gpiochip_get_data(chip);



	is_zynq_gpio = gpio->p_data->quirks & ZYNQ_GPIO_QUIRK_FOO;

	zynq_gpio_get_bank_pin(pin, &bank_num, &bank_pin_num, gpio);



	/* bank 0 pins 7 and 8 are special and cannot be used as inputs */

	if (bank_num == 0 && (bank_pin_num == 7 || bank_pin_num == 8))

	/*

	 * On zynq bank 0 pins 7 and 8 are special and cannot be used

	 * as inputs.

	 */

	if (is_zynq_gpio && bank_num == 0 &&

		(bank_pin_num == 7 || bank_pin_num == 8))

		return -EINVAL;



	/* clear the bit in direction mode reg to set the pin as input */
@@ -627,6 +637,7 @@ static const struct zynq_platform_data zynqmp_gpio_def = { 


static const struct zynq_platform_data zynq_gpio_def = {

	.label = "zynq_gpio",

	.quirks = ZYNQ_GPIO_QUIRK_FOO,

	.ngpio = ZYNQ_GPIO_NR_GPIOS,

	.max_bank = ZYNQ_GPIO_MAX_BANK,

	.bank_min[0] = ZYNQ_GPIO_BANK0_PIN_MIN(),