gwrx/openwrt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

brcm63xx: remove gpio base workaround

Browse Source 
Now that all gpio users without named gpios use DT, we do not need
to fix the gpio controller bases anymore.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 44567
This commit is contained in:
Jonas Gorski 2015-02-27 17:40:09 +00:00
parent b82cb155fc
commit 8ff23c60e2
2 changed files with 0 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
target/linux/brcm63xx/patches-3.14/379-gpio-gpio-bcm63xx-use-alias-id-for-base-calculation.patch
View File

@ -1,34 +0,0 @@
From 6759a62f28bb1995afe6562c0adfbbb6e8540933 Mon Sep 17 00:00:00 2001
From: Jonas Gorski <jogo@openwrt.org>
Date: Sun, 22 Feb 2015 12:57:58 +0100
Subject: [PATCH 6/6] gpio: gpio-bcm63xx: use alias id for base calculation
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
---
drivers/gpio/gpio-bcm63xx.c | 6 ++++++
1 file changed, 6 insertions(+)
--- a/drivers/gpio/gpio-bcm63xx.c
+++ b/drivers/gpio/gpio-bcm63xx.c
@@ -32,6 +32,8 @@
#include <linux/of.h>
#include <linux/of_gpio.h>
+#define BCM63XX_GPIOS_PER_BANK 32
+
static int bcm63xx_gpio_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
@@ -73,8 +75,12 @@ static int bcm63xx_gpio_probe(struct pla
platform_set_drvdata(pdev, bgc);
if (dev->of_node) {
+ int id = of_alias_get_id(dev->of_node, "gpio");
u32 ngpios;
+ if (id >= 0)
+ bgc->gc.base = id * BCM63XX_GPIOS_PER_BANK;
+
if (!of_property_read_u32(dev->of_node, "ngpios", &ngpios))
bgc->gc.ngpio = ngpios;

34
target/linux/brcm63xx/patches-3.18/379-gpio-gpio-bcm63xx-use-alias-id-for-base-calculation.patch
View File

@ -1,34 +0,0 @@
From 6759a62f28bb1995afe6562c0adfbbb6e8540933 Mon Sep 17 00:00:00 2001
From: Jonas Gorski <jogo@openwrt.org>
Date: Sun, 22 Feb 2015 12:57:58 +0100
Subject: [PATCH 6/6] gpio: gpio-bcm63xx: use alias id for base calculation
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
---
drivers/gpio/gpio-bcm63xx.c | 6 ++++++
1 file changed, 6 insertions(+)
--- a/drivers/gpio/gpio-bcm63xx.c
+++ b/drivers/gpio/gpio-bcm63xx.c
@@ -32,6 +32,8 @@
#include <linux/of.h>
#include <linux/of_gpio.h>
+#define BCM63XX_GPIOS_PER_BANK 32
+
static int bcm63xx_gpio_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
@@ -73,8 +75,12 @@ static int bcm63xx_gpio_probe(struct pla
platform_set_drvdata(pdev, bgc);
if (dev->of_node) {
+ int id = of_alias_get_id(dev->of_node, "gpio");
u32 ngpios;
+ if (id >= 0)
+ bgc->gc.base = id * BCM63XX_GPIOS_PER_BANK;
+
if (!of_property_read_u32(dev->of_node, "ngpios", &ngpios))
bgc->gc.ngpio = ngpios;