[PATCHv2,4/8] gpio: altera-a10sr: Add A10 System Resource Chip GPIO support.
diff mbox

Message ID 1464889948-28793-5-git-send-email-tthayer@opensource.altera.com
State New
Headers show

Commit Message

tthayer@opensource.altera.com June 2, 2016, 5:52 p.m. UTC
From: Thor Thayer <tthayer@opensource.altera.com>

Add the GPIO functionality for the Altera Arria10 MAX5 System Resource
Chip. The A10 MAX5 has 12 bits of GPIO assigned to switches, buttons,
and LEDs as a GPIO extender on the SPI bus.

Signed-off-by: Thor Thayer <tthayer@opensource.altera.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>i
---
v2	Change Altera to Intel in copyright header
---
 drivers/gpio/Kconfig             |    8 +++
 drivers/gpio/Makefile            |    1 +
 drivers/gpio/gpio-altera-a10sr.c |  140 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 149 insertions(+)
 create mode 100644 drivers/gpio/gpio-altera-a10sr.c

Comments

tthayer@opensource.altera.com Oct. 10, 2016, 4:50 p.m. UTC | #1
Hi Linus,

On 06/02/2016 12:52 PM, tthayer@opensource.altera.com wrote:
> From: Thor Thayer <tthayer@opensource.altera.com>
>
> Add the GPIO functionality for the Altera Arria10 MAX5 System Resource
> Chip. The A10 MAX5 has 12 bits of GPIO assigned to switches, buttons,
> and LEDs as a GPIO extender on the SPI bus.
>
> Signed-off-by: Thor Thayer <tthayer@opensource.altera.com>
> Acked-by: Linus Walleij <linus.walleij@linaro.org>i
> ---
> v2	Change Altera to Intel in copyright header
> ---

It appears this patch was not included in the changes upstreamed. You 
had added a note when you ACKed version 1 that Lee could queue this (see 
https://patchwork.kernel.org/patch/8912831/) but I didn't include that 
note in this series.

Can this be added to the GPIO queue now?

Thanks,

Thor
>  drivers/gpio/Kconfig             |    8 +++
>  drivers/gpio/Makefile            |    1 +
>  drivers/gpio/gpio-altera-a10sr.c |  140 ++++++++++++++++++++++++++++++++++++++
>  3 files changed, 149 insertions(+)
>  create mode 100644 drivers/gpio/gpio-altera-a10sr.c
>
> diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
> index 9244381..c41c74a 100644
> --- a/drivers/gpio/Kconfig
> +++ b/drivers/gpio/Kconfig
> @@ -786,6 +786,14 @@ config GPIO_ADP5520
>  	  This option enables support for on-chip GPIO found
>  	  on Analog Devices ADP5520 PMICs.
>
> +config GPIO_ALTERA_A10SR
> +	tristate "Altera Arria10 System Resource GPIO"
> +	depends on MFD_ALTERA_A10SR
> +	help
> +	  Driver for Arria10 Development Kit GPIO expansion which
> +	  includes reads of pushbuttons and DIP switches as well
> +	  as writes to LEDs.
> +
>  config GPIO_ARIZONA
>  	tristate "Wolfson Microelectronics Arizona class devices"
>  	depends on MFD_ARIZONA
> diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
> index 6e111fc..ac4b09b 100644
> --- a/drivers/gpio/Makefile
> +++ b/drivers/gpio/Makefile
> @@ -24,6 +24,7 @@ obj-$(CONFIG_GPIO_ADNP)		+= gpio-adnp.o
>  obj-$(CONFIG_GPIO_ADP5520)	+= gpio-adp5520.o
>  obj-$(CONFIG_GPIO_ADP5588)	+= gpio-adp5588.o
>  obj-$(CONFIG_GPIO_ALTERA)  	+= gpio-altera.o
> +obj-$(CONFIG_GPIO_ALTERA_A10SR)	+= gpio-altera-a10sr.o
>  obj-$(CONFIG_GPIO_AMD8111)	+= gpio-amd8111.o
>  obj-$(CONFIG_GPIO_AMDPT)	+= gpio-amdpt.o
>  obj-$(CONFIG_GPIO_ARIZONA)	+= gpio-arizona.o
> diff --git a/drivers/gpio/gpio-altera-a10sr.c b/drivers/gpio/gpio-altera-a10sr.c
> new file mode 100644
> index 0000000..8274f98
> --- /dev/null
> +++ b/drivers/gpio/gpio-altera-a10sr.c
> @@ -0,0 +1,140 @@
> +/*
> + *  Copyright Intel Corporation (C) 2014-2016. All Rights Reserved
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms and conditions of the GNU General Public License,
> + * version 2, as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope it will be useful, but WITHOUT
> + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
> + * more details.
> + *
> + * You should have received a copy of the GNU General Public License along with
> + * this program.  If not, see <http://www.gnu.org/licenses/>.
> + *
> + * GPIO driver for  Altera Arria10 MAX5 System Resource Chip
> + *
> + * Adapted from gpio-tps65910.c
> + */
> +
> +#include <linux/gpio/driver.h>
> +#include <linux/mfd/altera-a10sr.h>
> +#include <linux/module.h>
> +
> +/**
> + * struct altr_a10sr_gpio - Altera Max5 GPIO device private data structure
> + * @gp:   : instance of the gpio_chip
> + * @regmap: the regmap from the parent device.
> + */
> +struct altr_a10sr_gpio {
> +	struct gpio_chip gp;
> +	struct regmap *regmap;
> +};
> +
> +static int altr_a10sr_gpio_get(struct gpio_chip *chip, unsigned int offset)
> +{
> +	struct altr_a10sr_gpio *gpio = gpiochip_get_data(chip);
> +	int ret, val;
> +
> +	ret = regmap_read(gpio->regmap, ALTR_A10SR_PBDSW_REG, &val);
> +	if (ret < 0)
> +		return ret;
> +
> +	return !!(val & BIT(offset - ALTR_A10SR_LED_VALID_SHIFT));
> +}
> +
> +static void altr_a10sr_gpio_set(struct gpio_chip *chip, unsigned int offset,
> +				int value)
> +{
> +	struct altr_a10sr_gpio *gpio = gpiochip_get_data(chip);
> +
> +	regmap_update_bits(gpio->regmap, ALTR_A10SR_LED_REG,
> +			   BIT(ALTR_A10SR_LED_VALID_SHIFT + offset),
> +			   value ? BIT(ALTR_A10SR_LED_VALID_SHIFT + offset)
> +			   : 0);
> +}
> +
> +static int altr_a10sr_gpio_direction_input(struct gpio_chip *gc,
> +					   unsigned int nr)
> +{
> +	if (nr >= (ALTR_A10SR_IN_VALID_RANGE_LO - ALTR_A10SR_LED_VALID_SHIFT))
> +		return 0;
> +	return -EINVAL;
> +}
> +
> +static int altr_a10sr_gpio_direction_output(struct gpio_chip *gc,
> +					    unsigned int nr, int value)
> +{
> +	if (nr <= (ALTR_A10SR_OUT_VALID_RANGE_HI - ALTR_A10SR_LED_VALID_SHIFT))
> +		return 0;
> +	return -EINVAL;
> +}
> +
> +static struct gpio_chip altr_a10sr_gc = {
> +	.label = "altr_a10sr_gpio",
> +	.owner = THIS_MODULE,
> +	.get = altr_a10sr_gpio_get,
> +	.set = altr_a10sr_gpio_set,
> +	.direction_input = altr_a10sr_gpio_direction_input,
> +	.direction_output = altr_a10sr_gpio_direction_output,
> +	.can_sleep = true,
> +	.ngpio = 12,
> +	.base = -1,
> +};
> +
> +static int altr_a10sr_gpio_probe(struct platform_device *pdev)
> +{
> +	struct altr_a10sr_gpio *gpio;
> +	int ret;
> +	struct altr_a10sr *a10sr = dev_get_drvdata(pdev->dev.parent);
> +
> +	gpio = devm_kzalloc(&pdev->dev, sizeof(*gpio), GFP_KERNEL);
> +	if (!gpio)
> +		return -ENOMEM;
> +
> +	gpio->regmap = a10sr->regmap;
> +
> +	gpio->gp = altr_a10sr_gc;
> +
> +	gpio->gp.of_node = pdev->dev.of_node;
> +
> +	ret = devm_gpiochip_add_data(&pdev->dev, &gpio->gp, gpio);
> +	if (ret < 0) {
> +		dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
> +		return ret;
> +	}
> +
> +	platform_set_drvdata(pdev, gpio);
> +
> +	return 0;
> +}
> +
> +static int altr_a10sr_gpio_remove(struct platform_device *pdev)
> +{
> +	struct altr_a10sr_gpio *gpio = platform_get_drvdata(pdev);
> +
> +	gpiochip_remove(&gpio->gp);
> +
> +	return 0;
> +}
> +
> +static const struct of_device_id altr_a10sr_gpio_of_match[] = {
> +	{ .compatible = "altr,a10sr-gpio" },
> +	{ },
> +};
> +MODULE_DEVICE_TABLE(of, altr_a10sr_gpio_of_match);
> +
> +static struct platform_driver altr_a10sr_gpio_driver = {
> +	.probe = altr_a10sr_gpio_probe,
> +	.remove = altr_a10sr_gpio_remove,
> +	.driver = {
> +		.name	= "altr_a10sr_gpio",
> +		.of_match_table = of_match_ptr(altr_a10sr_gpio_of_match),
> +	},
> +};
> +module_platform_driver(altr_a10sr_gpio_driver);
> +
> +MODULE_LICENSE("GPL v2");
> +MODULE_AUTHOR("Thor Thayer <tthayer@opensource.altera.com>");
> +MODULE_DESCRIPTION("Altera Arria10 System Resource Chip GPIO");
>
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Linus Walleij Oct. 21, 2016, 9:08 a.m. UTC | #2
On Thu, Jun 2, 2016 at 7:52 PM,  <tthayer@opensource.altera.com> wrote:

> From: Thor Thayer <tthayer@opensource.altera.com>
>
> Add the GPIO functionality for the Altera Arria10 MAX5 System Resource
> Chip. The A10 MAX5 has 12 bits of GPIO assigned to switches, buttons,
> and LEDs as a GPIO extender on the SPI bus.
>
> Signed-off-by: Thor Thayer <tthayer@opensource.altera.com>
> Acked-by: Linus Walleij <linus.walleij@linaro.org>i
> ---
> v2      Change Altera to Intel in copyright header

Patch applied!

Hey it just worked despite being months old.

Let's see if it builds fine & all.

Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
tthayer@opensource.altera.com Oct. 24, 2016, 10:29 p.m. UTC | #3
Hi Linus,

On 10/21/2016 04:08 AM, Linus Walleij wrote:
> On Thu, Jun 2, 2016 at 7:52 PM,  <tthayer@opensource.altera.com> wrote:
>
>> From: Thor Thayer <tthayer@opensource.altera.com>
>>
>> Add the GPIO functionality for the Altera Arria10 MAX5 System Resource
>> Chip. The A10 MAX5 has 12 bits of GPIO assigned to switches, buttons,
>> and LEDs as a GPIO extender on the SPI bus.
>>
>> Signed-off-by: Thor Thayer <tthayer@opensource.altera.com>
>> Acked-by: Linus Walleij <linus.walleij@linaro.org>i
>> ---
>> v2      Change Altera to Intel in copyright header
>
> Patch applied!
>
> Hey it just worked despite being months old.
>
> Let's see if it builds fine & all.
>

Thanks! Yes, it builds properly but to get past a NULL pointer kernel 
panic, I had to revert the recent devprop_gpiochip_set_names() change 
(9427ecbe). Once I did that it worked perfectly.

I'll investigate further and update you.

I apologize for missing this patch earlier. Thank you for your patience.

Thor

> Yours,
> Linus Walleij
>
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 9244381..c41c74a 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -786,6 +786,14 @@  config GPIO_ADP5520
 	  This option enables support for on-chip GPIO found
 	  on Analog Devices ADP5520 PMICs.
 
+config GPIO_ALTERA_A10SR
+	tristate "Altera Arria10 System Resource GPIO"
+	depends on MFD_ALTERA_A10SR
+	help
+	  Driver for Arria10 Development Kit GPIO expansion which
+	  includes reads of pushbuttons and DIP switches as well
+	  as writes to LEDs.
+
 config GPIO_ARIZONA
 	tristate "Wolfson Microelectronics Arizona class devices"
 	depends on MFD_ARIZONA
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 6e111fc..ac4b09b 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -24,6 +24,7 @@  obj-$(CONFIG_GPIO_ADNP)		+= gpio-adnp.o
 obj-$(CONFIG_GPIO_ADP5520)	+= gpio-adp5520.o
 obj-$(CONFIG_GPIO_ADP5588)	+= gpio-adp5588.o
 obj-$(CONFIG_GPIO_ALTERA)  	+= gpio-altera.o
+obj-$(CONFIG_GPIO_ALTERA_A10SR)	+= gpio-altera-a10sr.o
 obj-$(CONFIG_GPIO_AMD8111)	+= gpio-amd8111.o
 obj-$(CONFIG_GPIO_AMDPT)	+= gpio-amdpt.o
 obj-$(CONFIG_GPIO_ARIZONA)	+= gpio-arizona.o
diff --git a/drivers/gpio/gpio-altera-a10sr.c b/drivers/gpio/gpio-altera-a10sr.c
new file mode 100644
index 0000000..8274f98
--- /dev/null
+++ b/drivers/gpio/gpio-altera-a10sr.c
@@ -0,0 +1,140 @@ 
+/*
+ *  Copyright Intel Corporation (C) 2014-2016. All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * GPIO driver for  Altera Arria10 MAX5 System Resource Chip
+ *
+ * Adapted from gpio-tps65910.c
+ */
+
+#include <linux/gpio/driver.h>
+#include <linux/mfd/altera-a10sr.h>
+#include <linux/module.h>
+
+/**
+ * struct altr_a10sr_gpio - Altera Max5 GPIO device private data structure
+ * @gp:   : instance of the gpio_chip
+ * @regmap: the regmap from the parent device.
+ */
+struct altr_a10sr_gpio {
+	struct gpio_chip gp;
+	struct regmap *regmap;
+};
+
+static int altr_a10sr_gpio_get(struct gpio_chip *chip, unsigned int offset)
+{
+	struct altr_a10sr_gpio *gpio = gpiochip_get_data(chip);
+	int ret, val;
+
+	ret = regmap_read(gpio->regmap, ALTR_A10SR_PBDSW_REG, &val);
+	if (ret < 0)
+		return ret;
+
+	return !!(val & BIT(offset - ALTR_A10SR_LED_VALID_SHIFT));
+}
+
+static void altr_a10sr_gpio_set(struct gpio_chip *chip, unsigned int offset,
+				int value)
+{
+	struct altr_a10sr_gpio *gpio = gpiochip_get_data(chip);
+
+	regmap_update_bits(gpio->regmap, ALTR_A10SR_LED_REG,
+			   BIT(ALTR_A10SR_LED_VALID_SHIFT + offset),
+			   value ? BIT(ALTR_A10SR_LED_VALID_SHIFT + offset)
+			   : 0);
+}
+
+static int altr_a10sr_gpio_direction_input(struct gpio_chip *gc,
+					   unsigned int nr)
+{
+	if (nr >= (ALTR_A10SR_IN_VALID_RANGE_LO - ALTR_A10SR_LED_VALID_SHIFT))
+		return 0;
+	return -EINVAL;
+}
+
+static int altr_a10sr_gpio_direction_output(struct gpio_chip *gc,
+					    unsigned int nr, int value)
+{
+	if (nr <= (ALTR_A10SR_OUT_VALID_RANGE_HI - ALTR_A10SR_LED_VALID_SHIFT))
+		return 0;
+	return -EINVAL;
+}
+
+static struct gpio_chip altr_a10sr_gc = {
+	.label = "altr_a10sr_gpio",
+	.owner = THIS_MODULE,
+	.get = altr_a10sr_gpio_get,
+	.set = altr_a10sr_gpio_set,
+	.direction_input = altr_a10sr_gpio_direction_input,
+	.direction_output = altr_a10sr_gpio_direction_output,
+	.can_sleep = true,
+	.ngpio = 12,
+	.base = -1,
+};
+
+static int altr_a10sr_gpio_probe(struct platform_device *pdev)
+{
+	struct altr_a10sr_gpio *gpio;
+	int ret;
+	struct altr_a10sr *a10sr = dev_get_drvdata(pdev->dev.parent);
+
+	gpio = devm_kzalloc(&pdev->dev, sizeof(*gpio), GFP_KERNEL);
+	if (!gpio)
+		return -ENOMEM;
+
+	gpio->regmap = a10sr->regmap;
+
+	gpio->gp = altr_a10sr_gc;
+
+	gpio->gp.of_node = pdev->dev.of_node;
+
+	ret = devm_gpiochip_add_data(&pdev->dev, &gpio->gp, gpio);
+	if (ret < 0) {
+		dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
+		return ret;
+	}
+
+	platform_set_drvdata(pdev, gpio);
+
+	return 0;
+}
+
+static int altr_a10sr_gpio_remove(struct platform_device *pdev)
+{
+	struct altr_a10sr_gpio *gpio = platform_get_drvdata(pdev);
+
+	gpiochip_remove(&gpio->gp);
+
+	return 0;
+}
+
+static const struct of_device_id altr_a10sr_gpio_of_match[] = {
+	{ .compatible = "altr,a10sr-gpio" },
+	{ },
+};
+MODULE_DEVICE_TABLE(of, altr_a10sr_gpio_of_match);
+
+static struct platform_driver altr_a10sr_gpio_driver = {
+	.probe = altr_a10sr_gpio_probe,
+	.remove = altr_a10sr_gpio_remove,
+	.driver = {
+		.name	= "altr_a10sr_gpio",
+		.of_match_table = of_match_ptr(altr_a10sr_gpio_of_match),
+	},
+};
+module_platform_driver(altr_a10sr_gpio_driver);
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Thor Thayer <tthayer@opensource.altera.com>");
+MODULE_DESCRIPTION("Altera Arria10 System Resource Chip GPIO");