2
0
forked from Ivasoft/openwrt

kernel: backport first bcma patches from 4.2

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 45652
This commit is contained in:
Rafał Miłecki
2015-05-09 17:38:48 +00:00
parent 29f8f90de4
commit 3a6cdac37c
4 changed files with 74 additions and 34 deletions

View File

@@ -1,17 +0,0 @@
Subject: [PATCH] bcma: set gpio chip->base for CONFIG_ARCH_BCM_5301X like on 47xx
This makes system GPIOs easier to deal with, e.g. for user space scripts.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---
--- a/drivers/bcma/driver_gpio.c
+++ b/drivers/bcma/driver_gpio.c
@@ -240,7 +240,7 @@ int bcma_gpio_init(struct bcma_drv_cc *c
* relative (per chip) numbers.
* So let's use predictable base for BCM47XX and "random" for all other.
*/
-#if IS_BUILTIN(CONFIG_BCM47XX)
+#if IS_BUILTIN(CONFIG_BCM47XX) || IS_BUILTIN(CONFIG_ARCH_BCM_5301X)
chip->base = bus->num * BCMA_GPIO_MAX_PINS;
#else
chip->base = -1;

View File

@@ -1,17 +0,0 @@
From: Felix Fietkau <nbd@openwrt.org>
Subject: [PATCH] bcma: enable 32 GPIO pins for BCM4707+
At least one BCM4709 device uses GPIO pins > 16.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---
--- a/drivers/bcma/driver_gpio.c
+++ b/drivers/bcma/driver_gpio.c
@@ -226,6 +226,7 @@ int bcma_gpio_init(struct bcma_drv_cc *c
chip->of_node = cc->core->dev.of_node;
#endif
switch (bus->chipinfo.id) {
+ case BCMA_CHIP_ID_BCM4707:
case BCMA_CHIP_ID_BCM5357:
case BCMA_CHIP_ID_BCM53572:
chip->ngpio = 32;