c2a89871c2
The driver expected data then dir, but both dts and legacy code passed dir then data. Fix this by making the driver expect the registers in ascending order, i.e. dir then data. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 44574
161 lines
4.4 KiB
Diff
161 lines
4.4 KiB
Diff
From dbe94a8daaa63ef81b7414f2a17bca8e36dd6daa Mon Sep 17 00:00:00 2001
|
|
From: Jonas Gorski <jogo@openwrt.org>
|
|
Date: Fri, 20 Feb 2015 19:55:32 +0100
|
|
Subject: [PATCH 1/6] gpio: add a simple GPIO driver for bcm63xx
|
|
|
|
|
|
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|
---
|
|
drivers/gpio/Kconfig | 8 +++
|
|
drivers/gpio/Makefile | 1 +
|
|
drivers/gpio/gpio-bcm63xx.c | 117 +++++++++++++++++++++++++++++++++++++++++++
|
|
3 files changed, 126 insertions(+)
|
|
create mode 100644 drivers/gpio/gpio-bcm63xx.c
|
|
|
|
--- a/drivers/gpio/Kconfig
|
|
+++ b/drivers/gpio/Kconfig
|
|
@@ -821,6 +821,14 @@ config GPIO_BCM_KONA
|
|
help
|
|
Turn on GPIO support for Broadcom "Kona" chips.
|
|
|
|
+config GPIO_BCM63XX
|
|
+ bool "Broadcom BCM63XX GPIO"
|
|
+ depends on MIPS || COMPILE_TEST
|
|
+ select GPIO_GENERIC
|
|
+ help
|
|
+ Turn on GPIO support for Broadcom BCM63XX xDSL chips.
|
|
+
|
|
+
|
|
comment "USB GPIO expanders:"
|
|
|
|
config GPIO_VIPERBOARD
|
|
--- a/drivers/gpio/Makefile
|
|
+++ b/drivers/gpio/Makefile
|
|
@@ -17,6 +17,7 @@ obj-$(CONFIG_GPIO_ADP5588) += gpio-adp55
|
|
obj-$(CONFIG_GPIO_AMD8111) += gpio-amd8111.o
|
|
obj-$(CONFIG_GPIO_ARIZONA) += gpio-arizona.o
|
|
obj-$(CONFIG_GPIO_BCM_KONA) += gpio-bcm-kona.o
|
|
+obj-$(CONFIG_GPIO_BCM63XX) += gpio-bcm63xx.o
|
|
obj-$(CONFIG_GPIO_BT8XX) += gpio-bt8xx.o
|
|
obj-$(CONFIG_GPIO_CLPS711X) += gpio-clps711x.o
|
|
obj-$(CONFIG_GPIO_CS5535) += gpio-cs5535.o
|
|
--- /dev/null
|
|
+++ b/drivers/gpio/gpio-bcm63xx.c
|
|
@@ -0,0 +1,117 @@
|
|
+/*
|
|
+ * Driver for BCM63XX memory-mapped GPIO controllers, based on
|
|
+ * Generic driver for memory-mapped GPIO controllers.
|
|
+ *
|
|
+ * Copyright 2008 MontaVista Software, Inc.
|
|
+ * Copyright 2008,2010 Anton Vorontsov <cbouatmailru@gmail.com>
|
|
+ * Copyright 2015 Jonas Gorski <jogo@openwrt.org>
|
|
+ *
|
|
+ * This program is free software; you can redistribute it and/or modify it
|
|
+ * under the terms of the GNU General Public License as published by the
|
|
+ * Free Software Foundation; either version 2 of the License, or (at your
|
|
+ * option) any later version.
|
|
+ */
|
|
+
|
|
+#include <linux/init.h>
|
|
+#include <linux/err.h>
|
|
+#include <linux/bug.h>
|
|
+#include <linux/kernel.h>
|
|
+#include <linux/module.h>
|
|
+#include <linux/spinlock.h>
|
|
+#include <linux/compiler.h>
|
|
+#include <linux/types.h>
|
|
+#include <linux/errno.h>
|
|
+#include <linux/log2.h>
|
|
+#include <linux/ioport.h>
|
|
+#include <linux/io.h>
|
|
+#include <linux/gpio.h>
|
|
+#include <linux/slab.h>
|
|
+#include <linux/platform_device.h>
|
|
+#include <linux/mod_devicetable.h>
|
|
+#include <linux/basic_mmio_gpio.h>
|
|
+#include <linux/of.h>
|
|
+#include <linux/of_gpio.h>
|
|
+
|
|
+static int bcm63xx_gpio_probe(struct platform_device *pdev)
|
|
+{
|
|
+ struct device *dev = &pdev->dev;
|
|
+ struct resource *dat_r, *dirout_r;
|
|
+ void __iomem *dat;
|
|
+ void __iomem *dirout;
|
|
+ unsigned long sz;
|
|
+ int err;
|
|
+ struct bgpio_chip *bgc;
|
|
+ struct bgpio_pdata *pdata = dev_get_platdata(dev);
|
|
+
|
|
+ dirout_r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
+ dat_r = platform_get_resource(pdev, IORESOURCE_MEM, 1);
|
|
+ if (!dat_r || !dirout_r)
|
|
+ return -EINVAL;
|
|
+
|
|
+ if (resource_size(dat_r) != resource_size(dirout_r))
|
|
+ return -EINVAL;
|
|
+
|
|
+ sz = resource_size(dat_r);
|
|
+
|
|
+ dat = devm_ioremap_resource(dev, dat_r);
|
|
+ if (IS_ERR(dat))
|
|
+ return PTR_ERR(dat);
|
|
+
|
|
+ dirout = devm_ioremap_resource(dev, dirout_r);
|
|
+ if (IS_ERR(dirout))
|
|
+ return PTR_ERR(dirout);
|
|
+
|
|
+ bgc = devm_kzalloc(&pdev->dev, sizeof(*bgc), GFP_KERNEL);
|
|
+ if (!bgc)
|
|
+ return -ENOMEM;
|
|
+
|
|
+ err = bgpio_init(bgc, dev, sz, dat, NULL, NULL, dirout, NULL,
|
|
+ BGPIOF_BIG_ENDIAN_BYTE_ORDER);
|
|
+ if (err)
|
|
+ return err;
|
|
+
|
|
+ platform_set_drvdata(pdev, bgc);
|
|
+
|
|
+ if (dev->of_node) {
|
|
+ u32 ngpios;
|
|
+
|
|
+ if (!of_property_read_u32(dev->of_node, "ngpios", &ngpios))
|
|
+ bgc->gc.ngpio = ngpios;
|
|
+
|
|
+ } else if (pdata) {
|
|
+ bgc->gc.base = pdata->base;
|
|
+ if (pdata->ngpio > 0)
|
|
+ bgc->gc.ngpio = pdata->ngpio;
|
|
+ }
|
|
+
|
|
+ return gpiochip_add(&bgc->gc);
|
|
+}
|
|
+
|
|
+static int bcm63xx_gpio_remove(struct platform_device *pdev)
|
|
+{
|
|
+ struct bgpio_chip *bgc = platform_get_drvdata(pdev);
|
|
+
|
|
+ return bgpio_remove(bgc);
|
|
+}
|
|
+
|
|
+#ifdef CONFIG_OF
|
|
+static struct of_device_id bcm63xx_gpio_of_match[] = {
|
|
+ { .compatible = "brcm,bcm6345-gpio" },
|
|
+ { },
|
|
+};
|
|
+#endif
|
|
+
|
|
+static struct platform_driver bcm63xx_gpio_driver = {
|
|
+ .probe = bcm63xx_gpio_probe,
|
|
+ .remove = bcm63xx_gpio_remove,
|
|
+ .driver = {
|
|
+ .name = "bcm63xx-gpio",
|
|
+ .of_match_table = of_match_ptr(bcm63xx_gpio_of_match),
|
|
+ },
|
|
+};
|
|
+
|
|
+module_platform_driver(bcm63xx_gpio_driver);
|
|
+
|
|
+MODULE_DESCRIPTION("Driver for BCM63XX memory-mapped GPIO controllers");
|
|
+MODULE_AUTHOR("Jonas Gorski <jogo@openwrt.org>");
|
|
+MODULE_LICENSE("GPL");
|