tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
powerpc/p1010rdb:update mtd of nand to adapt to both old and new p1010rdb
P1010rdb-pa and p1010rdb-pb have different mtd of nand.
So update dts to adapt to both p1010rdb-pa and p1010rdb-pb.
Move the nand-mtd from p1010rdb.dtsi to p1010rdb-pa*.dts.
Remove nand-mtd for p1010rdb-pb, whick will use mtdparts
from u-boot instead of nand-mtd in device tree.
Signed-off-by: Zhao Qiang <B45475@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
authored by
Zhao Qiang
and committed by
Scott Wood
0ff649ca
9667a364
+88
-65
+1
-13
arch/powerpc/boot/dts/p1010rdb-pa.dts
+1
-13
arch/powerpc/boot/dts/p1010rdb-pa.dts
+85
arch/powerpc/boot/dts/p1010rdb-pa.dtsi
+85
arch/powerpc/boot/dts/p1010rdb-pa.dtsi
···
1
+
/*
2
+
* P1010 RDB Device Tree Source stub (no addresses or top-level ranges)
3
+
*
4
+
* Copyright 2013 Freescale Semiconductor Inc.
5
+
*
6
+
* Redistribution and use in source and binary forms, with or without
7
+
* modification, are permitted provided that the following conditions are met:
8
+
* * Redistributions of source code must retain the above copyright
9
+
* notice, this list of conditions and the following disclaimer.
10
+
* * Redistributions in binary form must reproduce the above copyright
11
+
* notice, this list of conditions and the following disclaimer in the
12
+
* documentation and/or other materials provided with the distribution.
13
+
* * Neither the name of Freescale Semiconductor nor the
14
+
* names of its contributors may be used to endorse or promote products
15
+
* derived from this software without specific prior written permission.
16
+
*
17
+
*
18
+
* ALTERNATIVELY, this software may be distributed under the terms of the
19
+
* GNU General Public License ("GPL") as published by the Free Software
20
+
* Foundation, either version 2 of that License or (at your option) any
21
+
* later version.
22
+
*
23
+
* THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY
24
+
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
25
+
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
26
+
* DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY
27
+
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
28
+
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
29
+
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
30
+
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31
+
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
32
+
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33
+
*/
34
+
35
+
&ifc_nand {
36
+
partition@0 {
37
+
/* This location must not be altered */
38
+
/* 1MB for u-boot Bootloader Image */
39
+
reg = <0x0 0x00100000>;
40
+
label = "NAND U-Boot Image";
41
+
read-only;
42
+
};
43
+
44
+
partition@100000 {
45
+
/* 1MB for DTB Image */
46
+
reg = <0x00100000 0x00100000>;
47
+
label = "NAND DTB Image";
48
+
};
49
+
50
+
partition@200000 {
51
+
/* 4MB for Linux Kernel Image */
52
+
reg = <0x00200000 0x00400000>;
53
+
label = "NAND Linux Kernel Image";
54
+
};
55
+
56
+
partition@600000 {
57
+
/* 4MB for Compressed Root file System Image */
58
+
reg = <0x00600000 0x00400000>;
59
+
label = "NAND Compressed RFS Image";
60
+
};
61
+
62
+
partition@a00000 {
63
+
/* 15MB for JFFS2 based Root file System */
64
+
reg = <0x00a00000 0x00f00000>;
65
+
label = "NAND JFFS2 Root File System";
66
+
};
67
+
68
+
partition@1900000 {
69
+
/* 7MB for User Area */
70
+
reg = <0x01900000 0x00700000>;
71
+
label = "NAND User area";
72
+
};
73
+
};
74
+
75
+
&phy0 {
76
+
interrupts = <3 1 0 0>;
77
+
};
78
+
79
+
&phy1 {
80
+
interrupts = <2 1 0 0>;
81
+
};
82
+
83
+
&phy2 {
84
+
interrupts = <2 1 0 0>;
85
+
};
+1
-13
arch/powerpc/boot/dts/p1010rdb-pa_36b.dts
+1
-13
arch/powerpc/boot/dts/p1010rdb-pa_36b.dts
+1
-39
arch/powerpc/boot/dts/p1010rdb.dtsi
+1
-39
arch/powerpc/boot/dts/p1010rdb.dtsi
···
69
69
};
70
70
};
71
71
72
-
nand@1,0 {
72
+
ifc_nand: nand@1,0 {
73
73
#address-cells = <1>;
74
74
#size-cells = <1>;
75
75
compatible = "fsl,ifc-nand";
76
76
reg = <0x1 0x0 0x10000>;
77
-
78
-
partition@0 {
79
-
/* This location must not be altered */
80
-
/* 1MB for u-boot Bootloader Image */
81
-
reg = <0x0 0x00100000>;
82
-
label = "NAND U-Boot Image";
83
-
read-only;
84
-
};
85
-
86
-
partition@100000 {
87
-
/* 1MB for DTB Image */
88
-
reg = <0x00100000 0x00100000>;
89
-
label = "NAND DTB Image";
90
-
};
91
-
92
-
partition@200000 {
93
-
/* 4MB for Linux Kernel Image */
94
-
reg = <0x00200000 0x00400000>;
95
-
label = "NAND Linux Kernel Image";
96
-
};
97
-
98
-
partition@600000 {
99
-
/* 4MB for Compressed Root file System Image */
100
-
reg = <0x00600000 0x00400000>;
101
-
label = "NAND Compressed RFS Image";
102
-
};
103
-
104
-
partition@a00000 {
105
-
/* 15MB for JFFS2 based Root file System */
106
-
reg = <0x00a00000 0x00f00000>;
107
-
label = "NAND JFFS2 Root File System";
108
-
};
109
-
110
-
partition@1900000 {
111
-
/* 7MB for User Area */
112
-
reg = <0x01900000 0x00700000>;
113
-
label = "NAND User area";
114
-
};
115
77
};
116
78
117
79
cpld@3,0 {