diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-05-09 17:38:48 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2015-05-09 17:38:48 +0000 |
| commit | 8b3aa19010b00466c946f1f6d3807d5d03327257 (patch) | |
| tree | 2706fc7e8c1723f6d5c23973ff0780b8b5f8d1ea /target/linux/bcm53xx | |
| parent | d123ad1b881e92e4f66ec3226a63744ad1b0e736 (diff) | |
| download | upstream-8b3aa19010b00466c946f1f6d3807d5d03327257.tar.gz upstream-8b3aa19010b00466c946f1f6d3807d5d03327257.tar.bz2 upstream-8b3aa19010b00466c946f1f6d3807d5d03327257.zip | |
kernel: backport first bcma patches from 4.2
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45652 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/bcm53xx')
| -rw-r--r-- | target/linux/bcm53xx/patches-3.18/180-bcma_set_gpio_base.patch | 17 | ||||
| -rw-r--r-- | target/linux/bcm53xx/patches-3.18/181-bcma-ngpio-bcm4707.patch | 17 |
2 files changed, 0 insertions, 34 deletions
diff --git a/target/linux/bcm53xx/patches-3.18/180-bcma_set_gpio_base.patch b/target/linux/bcm53xx/patches-3.18/180-bcma_set_gpio_base.patch deleted file mode 100644 index de1dd0914d..0000000000 --- a/target/linux/bcm53xx/patches-3.18/180-bcma_set_gpio_base.patch +++ /dev/null @@ -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; diff --git a/target/linux/bcm53xx/patches-3.18/181-bcma-ngpio-bcm4707.patch b/target/linux/bcm53xx/patches-3.18/181-bcma-ngpio-bcm4707.patch deleted file mode 100644 index 79cb6df7f1..0000000000 --- a/target/linux/bcm53xx/patches-3.18/181-bcma-ngpio-bcm4707.patch +++ /dev/null @@ -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; |