aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm53xx/patches-4.3
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2015-12-02 15:14:58 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2015-12-02 15:14:58 +0000
commit1d1c9d56dd77a9fe55a811f2ffc2bc2e804fe010 (patch)
tree7dea5548cb1d04d33ff4077edbb40ada20fa099c /target/linux/bcm53xx/patches-4.3
parent59dbc9fa4e64b97369f04235a69c1323177a92de (diff)
downloadupstream-1d1c9d56dd77a9fe55a811f2ffc2bc2e804fe010.tar.gz
upstream-1d1c9d56dd77a9fe55a811f2ffc2bc2e804fe010.tar.bz2
upstream-1d1c9d56dd77a9fe55a811f2ffc2bc2e804fe010.zip
bcm53xx: move patch 132-ARM-BCM5301X-Add-missing-Netgear-R8000-LEDs.patch
This patch is currently placed directly behind the SMP patches and has nothing to do with SMP, move it to an other position. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 47685
Diffstat (limited to 'target/linux/bcm53xx/patches-4.3')
-rw-r--r--target/linux/bcm53xx/patches-4.3/170-ARM-BCM5301X-Add-missing-Netgear-R8000-LEDs.patch (renamed from target/linux/bcm53xx/patches-4.3/132-ARM-BCM5301X-Add-missing-Netgear-R8000-LEDs.patch)5
-rw-r--r--target/linux/bcm53xx/patches-4.3/186-USB-bcma-switch-to-GPIO-descriptor-for-power-control.patch6
2 files changed, 2 insertions, 9 deletions
diff --git a/target/linux/bcm53xx/patches-4.3/132-ARM-BCM5301X-Add-missing-Netgear-R8000-LEDs.patch b/target/linux/bcm53xx/patches-4.3/170-ARM-BCM5301X-Add-missing-Netgear-R8000-LEDs.patch
index c117774b0b..60fba1315a 100644
--- a/target/linux/bcm53xx/patches-4.3/132-ARM-BCM5301X-Add-missing-Netgear-R8000-LEDs.patch
+++ b/target/linux/bcm53xx/patches-4.3/170-ARM-BCM5301X-Add-missing-Netgear-R8000-LEDs.patch
@@ -11,8 +11,6 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 30 +++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
-diff --git a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
-index 446c586..b52927c 100644
--- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
+++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
@@ -50,6 +50,36 @@
@@ -52,6 +50,3 @@ index 446c586..b52927c 100644
};
gpio-keys {
---
-1.8.4.5
-
diff --git a/target/linux/bcm53xx/patches-4.3/186-USB-bcma-switch-to-GPIO-descriptor-for-power-control.patch b/target/linux/bcm53xx/patches-4.3/186-USB-bcma-switch-to-GPIO-descriptor-for-power-control.patch
index 5031886f00..f1995d1e6d 100644
--- a/target/linux/bcm53xx/patches-4.3/186-USB-bcma-switch-to-GPIO-descriptor-for-power-control.patch
+++ b/target/linux/bcm53xx/patches-4.3/186-USB-bcma-switch-to-GPIO-descriptor-for-power-control.patch
@@ -17,8 +17,6 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
drivers/usb/host/bcma-hcd.c | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
-diff --git a/drivers/usb/host/bcma-hcd.c b/drivers/usb/host/bcma-hcd.c
-index 5398e3d..291aaa2 100644
--- a/drivers/usb/host/bcma-hcd.c
+++ b/drivers/usb/host/bcma-hcd.c
@@ -21,6 +21,7 @@
@@ -37,7 +35,7 @@ index 5398e3d..291aaa2 100644
};
/* Wait for bitmask in a register to get set or cleared.
-@@ -228,19 +230,12 @@ static void bcma_hcd_init_chip_arm(struct bcma_device *dev)
+@@ -228,19 +230,12 @@ static void bcma_hcd_init_chip_arm(struc
static void bcma_hci_platform_power_gpio(struct bcma_device *dev, bool val)
{
@@ -60,7 +58,7 @@ index 5398e3d..291aaa2 100644
}
static const struct usb_ehci_pdata ehci_pdata = {
-@@ -314,7 +309,11 @@ static int bcma_hcd_probe(struct bcma_device *dev)
+@@ -314,7 +309,11 @@ static int bcma_hcd_probe(struct bcma_de
if (!usb_dev)
return -ENOMEM;