2015-01-29 05:55:43 +08:00
|
|
|
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
|
|
|
|
|
|
|
|
|
|
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
|
|
|
|
|
index 25445c2..e93e9e4 100644
|
|
|
|
|
--- a/arch/arm/boot/dts/Makefile
|
|
|
|
|
+++ b/arch/arm/boot/dts/Makefile
|
|
|
|
|
@@ -58,7 +58,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
|
|
|
|
|
bcm47081-asus-rt-n18u.dtb \
|
|
|
|
|
bcm47081-buffalo-wzr-600dhp2.dtb \
|
|
|
|
|
bcm47081-buffalo-wzr-900dhp.dtb \
|
|
|
|
|
- bcm4709-asus-rt-ac87u.dtb
|
|
|
|
|
+ bcm4709-asus-rt-ac87u.dtb \
|
|
|
|
|
+ bcm4709-netgear-r8000.dtb
|
|
|
|
|
dtb-$(CONFIG_ARCH_BERLIN) += \
|
|
|
|
|
berlin2-sony-nsz-gs7.dtb \
|
|
|
|
|
berlin2cd-google-chromecast.dtb
|
|
|
|
|
diff --git a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 0000000..2d7e388
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
|
|
|
|
|
@@ -0,0 +1,26 @@
|
|
|
|
|
+/*
|
|
|
|
|
+ * Broadcom BCM470X / BCM5301X ARM platform code.
|
|
|
|
|
+ * DTS for Netgear R8000
|
|
|
|
|
+ *
|
|
|
|
|
+ * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
|
|
|
|
|
+ *
|
|
|
|
|
+ * Licensed under the GNU/GPL. See COPYING for details.
|
|
|
|
|
+ */
|
|
|
|
|
+
|
|
|
|
|
+/dts-v1/;
|
|
|
|
|
+
|
|
|
|
|
+#include "bcm4708.dtsi"
|
|
|
|
|
+
|
|
|
|
|
+/ {
|
|
|
|
|
+ compatible = "netgear,r8000", "brcm,bcm4709", "brcm,bcm4708";
|
|
|
|
|
+ model = "Netgear R8000 (BCM4709)";
|
|
|
|
|
+
|
|
|
|
|
+ chosen {
|
|
|
|
|
+ bootargs = "console=ttyS0,115200 earlyprintk";
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
|
|
+ memory {
|
|
|
|
|
+ reg = <0x00000000 0x08000000
|
|
|
|
|
+ 0x88000000 0x08000000>;
|
|
|
|
|
+ };
|
|
|
|
|
+};
|
2015-01-30 14:58:35 +08:00
|
|
|
--- a/arch/arm/mach-bcm/bcm_5301x.c
|
|
|
|
|
+++ b/arch/arm/mach-bcm/bcm_5301x.c
|
|
|
|
|
@@ -35,15 +35,16 @@ static struct bcma_bus *bcm5301x_get_bcm
|
|
|
|
|
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;
|
2015-01-29 05:55:43 +08:00
|
|
|
--
|
|
|
|
|
1.8.4.5
|
|
|
|
|
|
