diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2015-04-08 09:22:02 +0000 |
---|---|---|
committer | Rafał Miłecki <zajec5@gmail.com> | 2015-04-08 09:22:02 +0000 |
commit | 4c1ee6f24dbd94333b64fe5f688246daff773865 (patch) | |
tree | dfd6c26a17f254f85b3437ba79fa6bc8f30e21a4 /target/linux/bcm53xx/patches-3.18/323-ARM-BCM5301X-Add-DT-for-Netgear-R8000.patch | |
parent | 705651884d6ad3ae598ce59d3750fd3e53234739 (diff) | |
download | master-31e0f0ae-4c1ee6f24dbd94333b64fe5f688246daff773865.tar.gz master-31e0f0ae-4c1ee6f24dbd94333b64fe5f688246daff773865.tar.bz2 master-31e0f0ae-4c1ee6f24dbd94333b64fe5f688246daff773865.zip |
bcm53xx: replace few BCM5301X patches with versions sent upstream
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 45311
Diffstat (limited to 'target/linux/bcm53xx/patches-3.18/323-ARM-BCM5301X-Add-DT-for-Netgear-R8000.patch')
-rw-r--r-- | target/linux/bcm53xx/patches-3.18/323-ARM-BCM5301X-Add-DT-for-Netgear-R8000.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/target/linux/bcm53xx/patches-3.18/323-ARM-BCM5301X-Add-DT-for-Netgear-R8000.patch b/target/linux/bcm53xx/patches-3.18/323-ARM-BCM5301X-Add-DT-for-Netgear-R8000.patch deleted file mode 100644 index f0919185cf..0000000000 --- a/target/linux/bcm53xx/patches-3.18/323-ARM-BCM5301X-Add-DT-for-Netgear-R8000.patch +++ /dev/null @@ -1,41 +0,0 @@ -From f3389cf7bc90d5702adcd4c100b49baf7a813bb9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> -Date: Wed, 28 Jan 2015 22:39:39 +0100 -Subject: [PATCH] ARM: BCM5301X: Add DT for Netgear R8000 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Rafał Miłecki <zajec5@gmail.com> ---- - arch/arm/boot/dts/Makefile | 3 ++- - arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 26 ++++++++++++++++++++++++++ - 2 files changed, 28 insertions(+), 1 deletion(-) - create mode 100644 arch/arm/boot/dts/bcm4709-netgear-r8000.dts - ---- a/arch/arm/mach-bcm/bcm_5301x.c -+++ b/arch/arm/mach-bcm/bcm_5301x.c -@@ -18,15 +18,16 @@ static bool first_fault = true; - static int bcm5301x_abort_handler(unsigned long addr, unsigned int fsr, - struct pt_regs *regs) - { -- if (fsr == 0x1c06 && first_fault) { -+ if ((fsr == 0x1406 || fsr == 0x1c06) && first_fault) { - first_fault = false; - - /* -- * These faults with code 0x1c06 happens for no good reason, -- * possibly left over from the CFE boot loader. -+ * These faults with codes 0x1406 (BCM4709) or 0x1c06 happens -+ * for no good reason, possibly left over from the CFE boot -+ * loader. - */ - pr_warn("External imprecise Data abort at addr=%#lx, fsr=%#x ignored.\n", -- addr, fsr); -+ addr, fsr); - - /* Returning non-zero causes fault display and panic */ - return 0; --- -1.8.4.5 - |