aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2016-01-24 10:37:33 -0500
committerKalle Valo <kvalo@codeaurora.org>2016-02-06 06:46:59 -0500
commit61dba73cdbba8ec5c01b31beaf9e2debc2d2f273 (patch)
tree77b2acdc4cb71a782d606c5a8a4acad908a3af7c
parent4c81acab3816c6941900c2abdb412df6cf34bc74 (diff)
bcma: add support for BCM47094
It's another SoC with 32 GPIOs and simplified watchdog handling. It was tested on D-Link DIR-885L. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-rw-r--r--drivers/bcma/driver_chipcommon.c1
-rw-r--r--drivers/bcma/driver_gpio.c1
-rw-r--r--include/linux/bcma/bcma.h1
3 files changed, 3 insertions, 0 deletions
diff --git a/drivers/bcma/driver_chipcommon.c b/drivers/bcma/driver_chipcommon.c
index bdb73d97da63..b0f44a2937b9 100644
--- a/drivers/bcma/driver_chipcommon.c
+++ b/drivers/bcma/driver_chipcommon.c
@@ -197,6 +197,7 @@ u32 bcma_chipco_watchdog_timer_set(struct bcma_drv_cc *cc, u32 ticks)
197 struct bcma_bus *bus = cc->core->bus; 197 struct bcma_bus *bus = cc->core->bus;
198 198
199 if (bus->chipinfo.id != BCMA_CHIP_ID_BCM4707 && 199 if (bus->chipinfo.id != BCMA_CHIP_ID_BCM4707 &&
200 bus->chipinfo.id != BCMA_CHIP_ID_BCM47094 &&
200 bus->chipinfo.id != BCMA_CHIP_ID_BCM53018) 201 bus->chipinfo.id != BCMA_CHIP_ID_BCM53018)
201 bcma_core_set_clockmode(cc->core, 202 bcma_core_set_clockmode(cc->core,
202 ticks ? BCMA_CLKMODE_FAST : BCMA_CLKMODE_DYNAMIC); 203 ticks ? BCMA_CLKMODE_FAST : BCMA_CLKMODE_DYNAMIC);
diff --git a/drivers/bcma/driver_gpio.c b/drivers/bcma/driver_gpio.c
index 504899a72966..77b0738fbe1b 100644
--- a/drivers/bcma/driver_gpio.c
+++ b/drivers/bcma/driver_gpio.c
@@ -197,6 +197,7 @@ int bcma_gpio_init(struct bcma_drv_cc *cc)
197 case BCMA_CHIP_ID_BCM4707: 197 case BCMA_CHIP_ID_BCM4707:
198 case BCMA_CHIP_ID_BCM5357: 198 case BCMA_CHIP_ID_BCM5357:
199 case BCMA_CHIP_ID_BCM53572: 199 case BCMA_CHIP_ID_BCM53572:
200 case BCMA_CHIP_ID_BCM47094:
200 chip->ngpio = 32; 201 chip->ngpio = 32;
201 break; 202 break;
202 default: 203 default:
diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h
index 991ebb4c2015..0367c63f5960 100644
--- a/include/linux/bcma/bcma.h
+++ b/include/linux/bcma/bcma.h
@@ -201,6 +201,7 @@ struct bcma_host_ops {
201#define BCMA_PKG_ID_BCM4707 1 201#define BCMA_PKG_ID_BCM4707 1
202#define BCMA_PKG_ID_BCM4708 2 202#define BCMA_PKG_ID_BCM4708 2
203#define BCMA_PKG_ID_BCM4709 0 203#define BCMA_PKG_ID_BCM4709 0
204#define BCMA_CHIP_ID_BCM47094 53030
204#define BCMA_CHIP_ID_BCM53018 53018 205#define BCMA_CHIP_ID_BCM53018 53018
205 206
206/* Board types (on PCI usually equals to the subsystem dev id) */ 207/* Board types (on PCI usually equals to the subsystem dev id) */