OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9d7ef1b
)
ARM: BCM5301X: add NAND flash chip description
author
Hauke Mehrtens
<hauke@hauke-m.de>
Fri, 29 May 2015 21:39:47 +0000
(23:39 +0200)
committer
Florian Fainelli
<f.fainelli@gmail.com>
Sat, 6 Jun 2015 23:05:50 +0000
(16:05 -0700)
This adds the NAND flash chip description for a standard chip found
connected to this SoC. This makes use of generic Broadcom NAND driver
with the iProc interface.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
14 files changed:
arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
patch
|
blob
|
history
arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
patch
|
blob
|
history
arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
patch
|
blob
|
history
arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
patch
|
blob
|
history
arch/arm/boot/dts/bcm4708-netgear-r6250.dts
patch
|
blob
|
history
arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
patch
|
blob
|
history
arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
patch
|
blob
|
history
arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
patch
|
blob
|
history
arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
patch
|
blob
|
history
arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
patch
|
blob
|
history
arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
patch
|
blob
|
history
arch/arm/boot/dts/bcm4709-netgear-r8000.dts
patch
|
blob
|
history
arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
[new file with mode: 0644]
patch
|
blob
arch/arm/boot/dts/bcm5301x.dtsi
patch
|
blob
|
history
diff --git
a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
index
71cff8d
..
112a5a8
100644
(file)
--- a/
arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
+++ b/
arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
@@
-10,6
+10,7
@@
/dts-v1/;
#include "bcm4708.dtsi"
/dts-v1/;
#include "bcm4708.dtsi"
+#include "bcm5301x-nand-cs0-bch8.dtsi"
/ {
compatible = "asus,rt-ac56u", "brcm,bcm4708";
/ {
compatible = "asus,rt-ac56u", "brcm,bcm4708";
diff --git
a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
index
8b62836
..
3600f56
100644
(file)
--- a/
arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
+++ b/
arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
@@
-10,6
+10,7
@@
/dts-v1/;
#include "bcm4708.dtsi"
/dts-v1/;
#include "bcm4708.dtsi"
+#include "bcm5301x-nand-cs0-bch8.dtsi"
/ {
compatible = "asus,rt-ac68u", "brcm,bcm4708";
/ {
compatible = "asus,rt-ac68u", "brcm,bcm4708";
diff --git
a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
index
78e95c0
..
24f0ab5
100644
(file)
--- a/
arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
+++ b/
arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
@@
-10,6
+10,7
@@
/dts-v1/;
#include "bcm4708.dtsi"
/dts-v1/;
#include "bcm4708.dtsi"
+#include "bcm5301x-nand-cs0-bch8.dtsi"
/ {
compatible = "buffalo,wzr-1750dhp", "brcm,bcm4708";
/ {
compatible = "buffalo,wzr-1750dhp", "brcm,bcm4708";
diff --git
a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
index
946c728
..
f039393
100644
(file)
--- a/
arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
+++ b/
arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
@@
-10,6
+10,7
@@
/dts-v1/;
#include "bcm4708.dtsi"
/dts-v1/;
#include "bcm4708.dtsi"
+#include "bcm5301x-nand-cs0-bch8.dtsi"
/ {
compatible = "luxul,xwc-1000", "brcm,bcm4708";
/ {
compatible = "luxul,xwc-1000", "brcm,bcm4708";
@@
-23,12
+24,8
@@
reg = <0x00000000 0x08000000>;
};
reg = <0x00000000 0x08000000>;
};
- axi@18000000 {
- nand@28000 {
- reg = <0x00028000 0x1000>;
- #address-cells = <1>;
- #size-cells = <1>;
-
+ nand: nand@18028000 {
+ nandcs@0 {
partition@0 {
label = "ubi";
reg = <0x00000000 0x08000000>;
partition@0 {
label = "ubi";
reg = <0x00000000 0x08000000>;
diff --git
a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
index
2ed9e57
..
326ce8f
100644
(file)
--- a/
arch/arm/boot/dts/bcm4708-netgear-r6250.dts
+++ b/
arch/arm/boot/dts/bcm4708-netgear-r6250.dts
@@
-10,6
+10,7
@@
/dts-v1/;
#include "bcm4708.dtsi"
/dts-v1/;
#include "bcm4708.dtsi"
+#include "bcm5301x-nand-cs0-bch8.dtsi"
/ {
compatible = "netgear,r6250v1", "brcm,bcm4708";
/ {
compatible = "netgear,r6250v1", "brcm,bcm4708";
diff --git
a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
index
3991042
..
3a94606
100644
(file)
--- a/
arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
+++ b/
arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
@@
-10,6
+10,7
@@
/dts-v1/;
#include "bcm4708.dtsi"
/dts-v1/;
#include "bcm4708.dtsi"
+#include "bcm5301x-nand-cs0-bch8.dtsi"
/ {
compatible = "netgear,r6300v2", "brcm,bcm4708";
/ {
compatible = "netgear,r6300v2", "brcm,bcm4708";
diff --git
a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
index
66dfb53
..
d6a033b
100644
(file)
--- a/
arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
+++ b/
arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
@@
-10,6
+10,7
@@
/dts-v1/;
#include "bcm4708.dtsi"
/dts-v1/;
#include "bcm4708.dtsi"
+#include "bcm5301x-nand-cs0-bch8.dtsi"
/ {
compatible = "smartrg,sr400ac", "brcm,bcm4708";
/ {
compatible = "smartrg,sr400ac", "brcm,bcm4708";
diff --git
a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
index
0ee85ea
..
71b98cf
100644
(file)
--- a/
arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
+++ b/
arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
@@
-10,6
+10,7
@@
/dts-v1/;
#include "bcm47081.dtsi"
/dts-v1/;
#include "bcm47081.dtsi"
+#include "bcm5301x-nand-cs0-bch8.dtsi"
/ {
compatible = "asus,rt-n18u", "brcm,bcm47081", "brcm,bcm4708";
/ {
compatible = "asus,rt-n18u", "brcm,bcm47081", "brcm,bcm4708";
diff --git
a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
index
db9131e
..
bb0cb0b
100644
(file)
--- a/
arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
+++ b/
arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
@@
-10,6
+10,7
@@
/dts-v1/;
#include "bcm47081.dtsi"
/dts-v1/;
#include "bcm47081.dtsi"
+#include "bcm5301x-nand-cs0-bch8.dtsi"
/ {
compatible = "buffalo,wzr-600dhp2", "brcm,bcm47081", "brcm,bcm4708";
/ {
compatible = "buffalo,wzr-600dhp2", "brcm,bcm47081", "brcm,bcm4708";
diff --git
a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
index
7d6868a
..
184fd92
100644
(file)
--- a/
arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
+++ b/
arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
@@
-10,6
+10,7
@@
/dts-v1/;
#include "bcm47081.dtsi"
/dts-v1/;
#include "bcm47081.dtsi"
+#include "bcm5301x-nand-cs0-bch8.dtsi"
/ {
compatible = "buffalo,wzr-900dhp", "brcm,bcm47081", "brcm,bcm4708";
/ {
compatible = "buffalo,wzr-900dhp", "brcm,bcm47081", "brcm,bcm4708";
diff --git
a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
index
548e93b
..
2a92e8d
100644
(file)
--- a/
arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
+++ b/
arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
@@
-10,6
+10,7
@@
/dts-v1/;
#include "bcm4708.dtsi"
/dts-v1/;
#include "bcm4708.dtsi"
+#include "bcm5301x-nand-cs0-bch8.dtsi"
/ {
compatible = "buffalo,wxr-1900dhp", "brcm,bcm4709", "brcm,bcm4708";
/ {
compatible = "buffalo,wxr-1900dhp", "brcm,bcm4709", "brcm,bcm4708";
diff --git
a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
index
ea26dd3
..
446c586
100644
(file)
--- a/
arch/arm/boot/dts/bcm4709-netgear-r8000.dts
+++ b/
arch/arm/boot/dts/bcm4709-netgear-r8000.dts
@@
-10,6
+10,7
@@
/dts-v1/;
#include "bcm4708.dtsi"
/dts-v1/;
#include "bcm4708.dtsi"
+#include "bcm5301x-nand-cs0-bch8.dtsi"
/ {
compatible = "netgear,r8000", "brcm,bcm4709", "brcm,bcm4708";
/ {
compatible = "netgear,r8000", "brcm,bcm4709", "brcm,bcm4708";
diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
new file mode 100644
(file)
index 0000000..
d10781e
--- /dev/null
+++ b/
arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
@@ -0,0
+1,24
@@
+/*
+ * Broadcom BCM470X / BCM5301X Nand chip defaults.
+ *
+ * This should be included if the NAND controller is on chip select 0
+ * and uses 8 bit ECC.
+ *
+ * Copyright (C) 2015 Hauke Mehrtens <hauke@hauke-m.de>
+ *
+ * Licensed under the GNU/GPL. See COPYING for details.
+ */
+
+/ {
+ nand@18028000 {
+ nandcs@0 {
+ compatible = "brcm,nandcs";
+ reg = <0>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ nand-ecc-strength = <8>;
+ nand-ecc-step-size = <512>;
+ };
+ };
+};
diff --git
a/arch/arm/boot/dts/bcm5301x.dtsi
b/arch/arm/boot/dts/bcm5301x.dtsi
index
78aec62
..
a97f631
100644
(file)
--- a/
arch/arm/boot/dts/bcm5301x.dtsi
+++ b/
arch/arm/boot/dts/bcm5301x.dtsi
@@
-143,4
+143,16
@@
#gpio-cells = <2>;
};
};
#gpio-cells = <2>;
};
};
+
+ nand: nand@18028000 {
+ compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1", "brcm,brcmnand";
+ reg = <0x18028000 0x600>, <0x1811a408 0x600>, <0x18028f00 0x20>;
+ reg-names = "nand", "iproc-idm", "iproc-ext";
+ interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;
+
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ brcm,nand-has-wp;
+ };
};
};