mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH 0/6] MIPS: ath79: add gpio support
@ 2015-09-22 22:34 Antony Pavlov
  2015-09-22 22:34 ` [PATCH 1/6] MIPS: ath79: use gpiolib Antony Pavlov
                   ` (5 more replies)
  0 siblings, 6 replies; 7+ messages in thread
From: Antony Pavlov @ 2015-09-22 22:34 UTC (permalink / raw)
  To: barebox

Antony Pavlov (6):
  MIPS: ath79: use gpiolib
  gpio: add ath79-gpio driver for Atheros MIPS SoCs
  MIPS: dts: ar9331.dtsi: add gpio
  MIPS: dts: tplink-mr3020.dts: move aliases up
  MIPS: dts: tplink-mr3020.dts: enable gpio & leds
  MIPS: tplink-mr3020_defconfig: enable gpio & leds

 arch/mips/Kconfig                               |   1 +
 arch/mips/configs/tplink-mr3020_defconfig       |  38 +++---
 arch/mips/dts/ar9331.dtsi                       |  10 ++
 arch/mips/dts/tplink-mr3020.dts                 |  43 ++++++-
 arch/mips/mach-ath79/include/mach/ar71xx_regs.h |  17 +++
 drivers/gpio/Makefile                           |   1 +
 drivers/gpio/gpio-ath79.c                       | 156 ++++++++++++++++++++++++
 7 files changed, 244 insertions(+), 22 deletions(-)
 create mode 100644 drivers/gpio/gpio-ath79.c

-- 
2.5.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 1/6] MIPS: ath79: use gpiolib
  2015-09-22 22:34 [PATCH 0/6] MIPS: ath79: add gpio support Antony Pavlov
@ 2015-09-22 22:34 ` Antony Pavlov
  2015-09-22 22:34 ` [PATCH 2/6] gpio: add ath79-gpio driver for Atheros MIPS SoCs Antony Pavlov
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: Antony Pavlov @ 2015-09-22 22:34 UTC (permalink / raw)
  To: barebox

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
 arch/mips/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index aeb5c04..a2d443f 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -68,6 +68,7 @@ config MACH_MIPS_ATH79
 	select COMMON_CLK_OF_PROVIDER
 	select CLKDEV_LOOKUP
 	select OFTREE
+	select GPIOLIB
 
 config MACH_MIPS_BCM47XX
 	bool "Broadcom BCM47xx-based boards"
-- 
2.5.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 2/6] gpio: add ath79-gpio driver for Atheros MIPS SoCs
  2015-09-22 22:34 [PATCH 0/6] MIPS: ath79: add gpio support Antony Pavlov
  2015-09-22 22:34 ` [PATCH 1/6] MIPS: ath79: use gpiolib Antony Pavlov
@ 2015-09-22 22:34 ` Antony Pavlov
  2015-09-22 22:34 ` [PATCH 3/6] MIPS: dts: ar9331.dtsi: add gpio Antony Pavlov
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: Antony Pavlov @ 2015-09-22 22:34 UTC (permalink / raw)
  To: barebox

This driver is based on linux-4.2 driver.

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
 arch/mips/mach-ath79/include/mach/ar71xx_regs.h |  17 +++
 drivers/gpio/Makefile                           |   1 +
 drivers/gpio/gpio-ath79.c                       | 156 ++++++++++++++++++++++++
 3 files changed, 174 insertions(+)

diff --git a/arch/mips/mach-ath79/include/mach/ar71xx_regs.h b/arch/mips/mach-ath79/include/mach/ar71xx_regs.h
index 77138ab..b82a8c3 100644
--- a/arch/mips/mach-ath79/include/mach/ar71xx_regs.h
+++ b/arch/mips/mach-ath79/include/mach/ar71xx_regs.h
@@ -23,6 +23,8 @@
 
 #define AR71XX_APB_BASE		0x18000000
 
+#define AR71XX_GPIO_BASE	(AR71XX_APB_BASE + 0x00040000)
+#define AR71XX_GPIO_SIZE	0x100
 #define AR71XX_PLL_BASE		(AR71XX_APB_BASE + 0x00050000)
 #define AR71XX_PLL_SIZE		0x100
 #define AR71XX_RESET_BASE	(AR71XX_APB_BASE + 0x00060000)
@@ -32,6 +34,21 @@
 #define AR933X_UART_SIZE	0x14
 
 /*
+ * GPIO block
+ */
+#define AR71XX_GPIO_REG_OE		0x00
+#define AR71XX_GPIO_REG_IN		0x04
+#define AR71XX_GPIO_REG_OUT		0x08
+#define AR71XX_GPIO_REG_SET		0x0c
+#define AR71XX_GPIO_REG_CLEAR		0x10
+#define AR71XX_GPIO_REG_INT_MODE	0x14
+#define AR71XX_GPIO_REG_INT_TYPE	0x18
+#define AR71XX_GPIO_REG_INT_POLARITY	0x1c
+#define AR71XX_GPIO_REG_INT_PENDING	0x20
+#define AR71XX_GPIO_REG_INT_ENABLE	0x24
+#define AR71XX_GPIO_REG_FUNC		0x28
+
+/*
  * PLL block
  */
 #define AR933X_PLL_CPU_CONFIG_REG	0x00
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 1d94661..f39e8da 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -1,6 +1,7 @@
 obj-$(CONFIG_GPIOLIB)		+= gpiolib.o
 
 obj-$(CONFIG_GPIO_74164)	+= gpio-74164.o
+obj-$(CONFIG_MACH_MIPS_ATH79)	+= gpio-ath79.o
 obj-$(CONFIG_GPIO_BCM2835)	+= gpio-bcm2835.o
 obj-$(CONFIG_GPIO_DAVINCI)	+= gpio-davinci.o
 obj-$(CONFIG_GPIO_CLPS711X)	+= gpio-clps711x.o
diff --git a/drivers/gpio/gpio-ath79.c b/drivers/gpio/gpio-ath79.c
new file mode 100644
index 0000000..a1e42c4
--- /dev/null
+++ b/drivers/gpio/gpio-ath79.c
@@ -0,0 +1,156 @@
+/*
+ *  Atheros AR71XX/AR724X/AR913X GPIO API support
+ *
+ *  Copyright (C) 2010-2011 Jaiganesh Narayanan <jnarayanan@atheros.com>
+ *  Copyright (C) 2008-2011 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *  Copyright (C) 2015 Antony Pavlov <antonynpavlov@gmail.com>
+ *
+ *  Parts of this file are based on Atheros' 2.6.15/2.6.31 BSP
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <common.h>
+#include <init.h>
+#include <io.h>
+#include <gpio.h>
+#include <malloc.h>
+
+#include <mach/ar71xx_regs.h>
+#include <mach/ath79.h>
+
+static void __iomem *ath79_gpio_base;
+static u32 ath79_gpio_count;
+
+static void __ath79_gpio_set_value(unsigned gpio, int value)
+{
+	void __iomem *base = ath79_gpio_base;
+
+	if (value)
+		__raw_writel(1 << gpio, base + AR71XX_GPIO_REG_SET);
+	else
+		__raw_writel(1 << gpio, base + AR71XX_GPIO_REG_CLEAR);
+}
+
+static int __ath79_gpio_get_value(unsigned gpio)
+{
+	return (__raw_readl(ath79_gpio_base + AR71XX_GPIO_REG_IN) >> gpio) & 1;
+}
+
+static int ath79_gpio_get_value(struct gpio_chip *chip, unsigned offset)
+{
+	return __ath79_gpio_get_value(offset);
+}
+
+static void ath79_gpio_set_value(struct gpio_chip *chip,
+				  unsigned offset, int value)
+{
+	__ath79_gpio_set_value(offset, value);
+}
+
+static int ath79_gpio_direction_input(struct gpio_chip *chip,
+				       unsigned offset)
+{
+	void __iomem *base = ath79_gpio_base;
+
+	__raw_writel(__raw_readl(base + AR71XX_GPIO_REG_OE) & ~(1 << offset),
+		     base + AR71XX_GPIO_REG_OE);
+
+	return 0;
+}
+
+static int ath79_gpio_direction_output(struct gpio_chip *chip,
+					unsigned offset, int value)
+{
+	void __iomem *base = ath79_gpio_base;
+
+	if (value)
+		__raw_writel(1 << offset, base + AR71XX_GPIO_REG_SET);
+	else
+		__raw_writel(1 << offset, base + AR71XX_GPIO_REG_CLEAR);
+
+	__raw_writel(__raw_readl(base + AR71XX_GPIO_REG_OE) | (1 << offset),
+		     base + AR71XX_GPIO_REG_OE);
+
+	return 0;
+}
+
+static int ath79_gpio_get_direction(struct gpio_chip *chip, unsigned offset)
+{
+
+	void __iomem *base = ath79_gpio_base;
+	uint32_t oe = __raw_readl(base + AR71XX_GPIO_REG_OE);
+
+	return (oe & (1 << offset)) ? GPIOF_DIR_OUT : GPIOF_DIR_IN;
+}
+
+static struct gpio_ops ath79_gpio_ops = {
+	.get			= ath79_gpio_get_value,
+	.set			= ath79_gpio_set_value,
+	.direction_input	= ath79_gpio_direction_input,
+	.direction_output	= ath79_gpio_direction_output,
+	.get_direction		= ath79_gpio_get_direction,
+};
+
+static struct gpio_chip ath79_gpio_chip = {
+	.ops = &ath79_gpio_ops,
+	.base = 0,
+};
+
+static const struct of_device_id ath79_gpio_of_match[] = {
+	{ .compatible = "qca,ar7100-gpio" },
+	{},
+};
+
+static int ath79_gpio_probe(struct device_d *dev)
+{
+	struct device_node *np = dev->device_node;
+	int err;
+
+	if (!np) {
+		dev_err(dev, "No DT node or platform data found\n");
+		return -EINVAL;
+	}
+
+	err = of_property_read_u32(np, "ngpios", &ath79_gpio_count);
+	if (err) {
+		dev_err(dev, "ngpios property is not valid\n");
+		return err;
+	}
+	if (ath79_gpio_count >= 32) {
+		dev_err(dev, "ngpios must be less than 32\n");
+		return -EINVAL;
+	}
+
+	ath79_gpio_base = dev_request_mem_region(dev, 0);
+	if (IS_ERR(ath79_gpio_base)) {
+		dev_err(dev, "could not get memory region\n");
+		return PTR_ERR(ath79_gpio_base);
+	}
+
+	ath79_gpio_chip.dev = dev;
+	ath79_gpio_chip.ngpio = ath79_gpio_count;
+
+	err = gpiochip_add(&ath79_gpio_chip);
+	if (err) {
+		dev_err(dev, "cannot add AR71xx GPIO chip, error=%d", err);
+		return err;
+	}
+
+	return 0;
+}
+
+static struct driver_d ath79_gpio_driver = {
+	.name = "ath79-gpio",
+	.probe = ath79_gpio_probe,
+	.of_compatible = DRV_OF_COMPAT(ath79_gpio_of_match),
+};
+
+static int ath79_gpio_init(void)
+{
+	return platform_driver_register(&ath79_gpio_driver);
+}
+coredevice_initcall(ath79_gpio_init);
-- 
2.5.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 3/6] MIPS: dts: ar9331.dtsi: add gpio
  2015-09-22 22:34 [PATCH 0/6] MIPS: ath79: add gpio support Antony Pavlov
  2015-09-22 22:34 ` [PATCH 1/6] MIPS: ath79: use gpiolib Antony Pavlov
  2015-09-22 22:34 ` [PATCH 2/6] gpio: add ath79-gpio driver for Atheros MIPS SoCs Antony Pavlov
@ 2015-09-22 22:34 ` Antony Pavlov
  2015-09-22 22:34 ` [PATCH 4/6] MIPS: dts: tplink-mr3020.dts: move aliases up Antony Pavlov
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: Antony Pavlov @ 2015-09-22 22:34 UTC (permalink / raw)
  To: barebox

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
 arch/mips/dts/ar9331.dtsi | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/mips/dts/ar9331.dtsi b/arch/mips/dts/ar9331.dtsi
index 8e7afcd..99ede9e 100644
--- a/arch/mips/dts/ar9331.dtsi
+++ b/arch/mips/dts/ar9331.dtsi
@@ -17,6 +17,16 @@
 			status = "disabled";
 		};
 
+		gpio: gpio@18040000 {
+			compatible = "qca,ar7100-gpio";
+			gpio-controller;
+			reg = <0x18040000 0x100>;
+			#gpio-cells = <2>;
+
+			ngpios = <30>;
+			status = "disabled";
+		};
+
 		ar9331_clk: clock {
 			compatible = "qca,ar933x-clk";
 			reg = <0x18050000 0x48>;
-- 
2.5.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 4/6] MIPS: dts: tplink-mr3020.dts: move aliases up
  2015-09-22 22:34 [PATCH 0/6] MIPS: ath79: add gpio support Antony Pavlov
                   ` (2 preceding siblings ...)
  2015-09-22 22:34 ` [PATCH 3/6] MIPS: dts: ar9331.dtsi: add gpio Antony Pavlov
@ 2015-09-22 22:34 ` Antony Pavlov
  2015-09-22 22:34 ` [PATCH 5/6] MIPS: dts: tplink-mr3020.dts: enable gpio & leds Antony Pavlov
  2015-09-22 22:34 ` [PATCH 6/6] MIPS: tplink-mr3020_defconfig: " Antony Pavlov
  5 siblings, 0 replies; 7+ messages in thread
From: Antony Pavlov @ 2015-09-22 22:34 UTC (permalink / raw)
  To: barebox

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
 arch/mips/dts/tplink-mr3020.dts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/arch/mips/dts/tplink-mr3020.dts b/arch/mips/dts/tplink-mr3020.dts
index 41be352..e155de3 100644
--- a/arch/mips/dts/tplink-mr3020.dts
+++ b/arch/mips/dts/tplink-mr3020.dts
@@ -9,6 +9,10 @@
 	memory {
 		reg = <0x00000000 0x2000000>;
 	};
+
+	aliases {
+		spiflash = &spiflash;
+	};
 };
 
 &serial0 {
@@ -28,9 +32,3 @@
 		reg = <0>;
 	};
 };
-
-/ {
-	aliases {
-		spiflash = &spiflash;
-	};
-};
-- 
2.5.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 5/6] MIPS: dts: tplink-mr3020.dts: enable gpio & leds
  2015-09-22 22:34 [PATCH 0/6] MIPS: ath79: add gpio support Antony Pavlov
                   ` (3 preceding siblings ...)
  2015-09-22 22:34 ` [PATCH 4/6] MIPS: dts: tplink-mr3020.dts: move aliases up Antony Pavlov
@ 2015-09-22 22:34 ` Antony Pavlov
  2015-09-22 22:34 ` [PATCH 6/6] MIPS: tplink-mr3020_defconfig: " Antony Pavlov
  5 siblings, 0 replies; 7+ messages in thread
From: Antony Pavlov @ 2015-09-22 22:34 UTC (permalink / raw)
  To: barebox

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
 arch/mips/dts/tplink-mr3020.dts | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/arch/mips/dts/tplink-mr3020.dts b/arch/mips/dts/tplink-mr3020.dts
index e155de3..804d290 100644
--- a/arch/mips/dts/tplink-mr3020.dts
+++ b/arch/mips/dts/tplink-mr3020.dts
@@ -1,6 +1,7 @@
 /dts-v1/;
 
 #include "ar9331.dtsi"
+#include <dt-bindings/gpio/gpio.h>
 
 / {
 	model = "TP-LINK MR3020";
@@ -13,12 +14,44 @@
 	aliases {
 		spiflash = &spiflash;
 	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		wlan {
+			label = "tp-link:green:wlan";
+			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
+			default-state = "off";
+		};
+
+		lan {
+			label = "tp-link:green:lan";
+			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
+			default-state = "off";
+		};
+
+		wps {
+			label = "tp-link:green:wps";
+			gpios = <&gpio 26 GPIO_ACTIVE_LOW>;
+			default-state = "off";
+		};
+
+		led3g {
+			label = "tp-link:green:3g";
+			gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
+			default-state = "off";
+		};
+	};
 };
 
 &serial0 {
 	status = "okay";
 };
 
+&gpio {
+	status = "okay";
+};
+
 &spi {
 	num-chipselects = <1>;
 	status = "okay";
-- 
2.5.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 6/6] MIPS: tplink-mr3020_defconfig: enable gpio & leds
  2015-09-22 22:34 [PATCH 0/6] MIPS: ath79: add gpio support Antony Pavlov
                   ` (4 preceding siblings ...)
  2015-09-22 22:34 ` [PATCH 5/6] MIPS: dts: tplink-mr3020.dts: enable gpio & leds Antony Pavlov
@ 2015-09-22 22:34 ` Antony Pavlov
  5 siblings, 0 replies; 7+ messages in thread
From: Antony Pavlov @ 2015-09-22 22:34 UTC (permalink / raw)
  To: barebox

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
 arch/mips/configs/tplink-mr3020_defconfig | 38 ++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/arch/mips/configs/tplink-mr3020_defconfig b/arch/mips/configs/tplink-mr3020_defconfig
index 9f81ce3..b675993 100644
--- a/arch/mips/configs/tplink-mr3020_defconfig
+++ b/arch/mips/configs/tplink-mr3020_defconfig
@@ -1,34 +1,40 @@
 CONFIG_BUILTIN_DTB=y
 CONFIG_BUILTIN_DTB_NAME="tplink-mr3020"
 CONFIG_MACH_MIPS_ATH79=y
-CONFIG_LONGHELP=y
 CONFIG_CMDLINE_EDITING=y
 CONFIG_AUTO_COMPLETE=y
-CONFIG_CMD_EDIT=y
-CONFIG_CMD_SLEEP=y
-CONFIG_CMD_LET=y
-CONFIG_CMD_GLOBAL=y
+CONFIG_LONGHELP=y
+CONFIG_CMD_IOMEM=y
+CONFIG_CMD_MEMINFO=y
+# CONFIG_CMD_BOOTM is not set
+CONFIG_CMD_GO=y
 CONFIG_CMD_LOADB=y
 CONFIG_CMD_LOADY=y
-CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_IOMEM=y
-CONFIG_CMD_MM=y
+CONFIG_CMD_RESET=y
+CONFIG_CMD_GLOBAL=y
 CONFIG_CMD_SHA1SUM=y
+CONFIG_CMD_LET=y
+CONFIG_CMD_SLEEP=y
+CONFIG_CMD_EDIT=y
+CONFIG_CMD_MM=y
+CONFIG_CMD_CLK=y
 CONFIG_CMD_FLASH=y
-# CONFIG_CMD_BOOTM is not set
-CONFIG_CMD_RESET=y
-CONFIG_CMD_GO=y
-CONFIG_CMD_OFTREE=y
-CONFIG_CMD_OF_PROPERTY=y
-CONFIG_CMD_OF_NODE=y
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_LED=y
 CONFIG_CMD_SPI=y
-CONFIG_CMD_CLK=y
+CONFIG_CMD_LED_TRIGGER=y
+CONFIG_CMD_OF_NODE=y
+CONFIG_CMD_OF_PROPERTY=y
+CONFIG_CMD_OFTREE=y
 CONFIG_OFDEVICE=y
 CONFIG_DRIVER_SERIAL_AR933X=y
 CONFIG_DRIVER_SPI_ATH79=y
 CONFIG_MTD=y
 # CONFIG_MTD_OOB_DEVICE is not set
 CONFIG_MTD_M25P80=y
-CONFIG_MD5=y
+CONFIG_LED=y
+CONFIG_LED_GPIO=y
+CONFIG_LED_GPIO_OF=y
+CONFIG_LED_TRIGGERS=y
 CONFIG_DIGEST_SHA224_GENERIC=y
 CONFIG_DIGEST_SHA256_GENERIC=y
-- 
2.5.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2015-09-22 22:34 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-09-22 22:34 [PATCH 0/6] MIPS: ath79: add gpio support Antony Pavlov
2015-09-22 22:34 ` [PATCH 1/6] MIPS: ath79: use gpiolib Antony Pavlov
2015-09-22 22:34 ` [PATCH 2/6] gpio: add ath79-gpio driver for Atheros MIPS SoCs Antony Pavlov
2015-09-22 22:34 ` [PATCH 3/6] MIPS: dts: ar9331.dtsi: add gpio Antony Pavlov
2015-09-22 22:34 ` [PATCH 4/6] MIPS: dts: tplink-mr3020.dts: move aliases up Antony Pavlov
2015-09-22 22:34 ` [PATCH 5/6] MIPS: dts: tplink-mr3020.dts: enable gpio & leds Antony Pavlov
2015-09-22 22:34 ` [PATCH 6/6] MIPS: tplink-mr3020_defconfig: " Antony Pavlov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox