diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-04-01 23:57:46 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-04-01 23:57:46 -0400 |
commit | e31c6dfa8eb23ec7b3350b95ffe92f5a962d8c6b (patch) | |
tree | e897997d1844a712391772444817abc12d2bc3d6 /arch | |
parent | dd775ae2549217d3ae09363e3edb305d0fa19928 (diff) | |
parent | fa1b42b45a9c96da77f3ddabf715f49525a87209 (diff) |
Merge remote-tracking branch 'kumar/next' into merge
Diffstat (limited to 'arch')
22 files changed, 688 insertions, 45 deletions
diff --git a/arch/powerpc/boot/dts/p1020mbg-pc.dtsi b/arch/powerpc/boot/dts/p1020mbg-pc.dtsi new file mode 100644 index 000000000000..a24699cfea9c --- /dev/null +++ b/arch/powerpc/boot/dts/p1020mbg-pc.dtsi | |||
@@ -0,0 +1,151 @@ | |||
1 | /* | ||
2 | * P1020 MBG-PC Device Tree Source stub (no addresses or top-level ranges) | ||
3 | * | ||
4 | * Copyright 2012 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 | &lbc { | ||
36 | nor@0,0 { | ||
37 | #address-cells = <1>; | ||
38 | #size-cells = <1>; | ||
39 | compatible = "cfi-flash"; | ||
40 | reg = <0x0 0x0 0x4000000>; | ||
41 | bank-width = <2>; | ||
42 | device-width = <1>; | ||
43 | |||
44 | partition@0 { | ||
45 | /* 128KB for DTB Image */ | ||
46 | reg = <0x0 0x00020000>; | ||
47 | label = "NOR DTB Image"; | ||
48 | }; | ||
49 | |||
50 | partition@20000 { | ||
51 | /* 3.875 MB for Linux Kernel Image */ | ||
52 | reg = <0x00020000 0x003e0000>; | ||
53 | label = "NOR Linux Kernel Image"; | ||
54 | }; | ||
55 | |||
56 | partition@400000 { | ||
57 | /* 58MB for Root file System */ | ||
58 | reg = <0x00400000 0x03a00000>; | ||
59 | label = "NOR Root File System"; | ||
60 | }; | ||
61 | |||
62 | partition@3e00000 { | ||
63 | /* This location must not be altered */ | ||
64 | /* 1M for Vitesse 7385 Switch firmware */ | ||
65 | reg = <0x3e00000 0x00100000>; | ||
66 | label = "NOR Vitesse-7385 Firmware"; | ||
67 | read-only; | ||
68 | }; | ||
69 | |||
70 | partition@3f00000 { | ||
71 | /* This location must not be altered */ | ||
72 | /* 512KB for u-boot Bootloader Image */ | ||
73 | /* 512KB for u-boot Environment Variables */ | ||
74 | reg = <0x03f00000 0x00100000>; | ||
75 | label = "NOR U-Boot Image"; | ||
76 | read-only; | ||
77 | }; | ||
78 | }; | ||
79 | |||
80 | L2switch@2,0 { | ||
81 | #address-cells = <1>; | ||
82 | #size-cells = <1>; | ||
83 | compatible = "vitesse-7385"; | ||
84 | reg = <0x2 0x0 0x20000>; | ||
85 | }; | ||
86 | }; | ||
87 | |||
88 | &soc { | ||
89 | i2c@3000 { | ||
90 | rtc@68 { | ||
91 | compatible = "dallas,ds1339"; | ||
92 | reg = <0x68>; | ||
93 | }; | ||
94 | }; | ||
95 | |||
96 | mdio@24000 { | ||
97 | phy0: ethernet-phy@0 { | ||
98 | interrupts = <3 1 0 0>; | ||
99 | reg = <0x0>; | ||
100 | }; | ||
101 | phy1: ethernet-phy@1 { | ||
102 | interrupts = <2 1 0 0>; | ||
103 | reg = <0x1>; | ||
104 | }; | ||
105 | }; | ||
106 | |||
107 | mdio@25000 { | ||
108 | tbi1: tbi-phy@11 { | ||
109 | reg = <0x11>; | ||
110 | device_type = "tbi-phy"; | ||
111 | }; | ||
112 | }; | ||
113 | |||
114 | mdio@26000 { | ||
115 | tbi2: tbi-phy@11 { | ||
116 | reg = <0x11>; | ||
117 | device_type = "tbi-phy"; | ||
118 | }; | ||
119 | }; | ||
120 | |||
121 | enet0: ethernet@b0000 { | ||
122 | fixed-link = <1 1 1000 0 0>; | ||
123 | phy-connection-type = "rgmii-id"; | ||
124 | }; | ||
125 | |||
126 | enet1: ethernet@b1000 { | ||
127 | phy-handle = <&phy0>; | ||
128 | tbi-handle = <&tbi1>; | ||
129 | phy-connection-type = "sgmii"; | ||
130 | }; | ||
131 | |||
132 | enet2: ethernet@b2000 { | ||
133 | phy-handle = <&phy1>; | ||
134 | phy-connection-type = "rgmii-id"; | ||
135 | }; | ||
136 | |||
137 | usb@22000 { | ||
138 | phy_type = "ulpi"; | ||
139 | }; | ||
140 | |||
141 | /* USB2 is shared with localbus, so it must be disabled | ||
142 | by default. We can't put 'status = "disabled";' here | ||
143 | since U-Boot doesn't clear the status property when | ||
144 | it enables USB2. OTOH, U-Boot does create a new node | ||
145 | when there isn't any. So, just comment it out. | ||
146 | */ | ||
147 | usb@23000 { | ||
148 | status = "disabled"; | ||
149 | phy_type = "ulpi"; | ||
150 | }; | ||
151 | }; | ||
diff --git a/arch/powerpc/boot/dts/p1020mbg-pc_32b.dts b/arch/powerpc/boot/dts/p1020mbg-pc_32b.dts new file mode 100644 index 000000000000..ab8f076eae90 --- /dev/null +++ b/arch/powerpc/boot/dts/p1020mbg-pc_32b.dts | |||
@@ -0,0 +1,89 @@ | |||
1 | /* | ||
2 | * P1020 MBG-PC Device Tree Source (32-bit address map) | ||
3 | * | ||
4 | * Copyright 2012 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 | /include/ "fsl/p1020si-pre.dtsi" | ||
36 | / { | ||
37 | model = "fsl,P1020MBG-PC"; | ||
38 | compatible = "fsl,P1020MBG-PC"; | ||
39 | |||
40 | memory { | ||
41 | device_type = "memory"; | ||
42 | }; | ||
43 | |||
44 | lbc: localbus@ffe05000 { | ||
45 | reg = <0x0 0xffe05000 0x0 0x1000>; | ||
46 | |||
47 | /* NOR and L2 switch */ | ||
48 | ranges = <0x0 0x0 0x0 0xec000000 0x04000000 | ||
49 | 0x1 0x0 0x0 0xffa00000 0x00040000 | ||
50 | 0x2 0x0 0x0 0xffb00000 0x00020000>; | ||
51 | }; | ||
52 | |||
53 | soc: soc@ffe00000 { | ||
54 | ranges = <0x0 0x0 0xffe00000 0x100000>; | ||
55 | }; | ||
56 | |||
57 | pci0: pcie@ffe09000 { | ||
58 | reg = <0x0 0xffe09000 0x0 0x1000>; | ||
59 | ranges = <0x2000000 0x0 0xe0000000 0x0 0xa0000000 0x0 0x20000000 | ||
60 | 0x1000000 0x0 0x00000000 0x0 0xffc10000 0x0 0x10000>; | ||
61 | pcie@0 { | ||
62 | ranges = <0x2000000 0x0 0xe0000000 | ||
63 | 0x2000000 0x0 0xe0000000 | ||
64 | 0x0 0x20000000 | ||
65 | |||
66 | 0x1000000 0x0 0x0 | ||
67 | 0x1000000 0x0 0x0 | ||
68 | 0x0 0x100000>; | ||
69 | }; | ||
70 | }; | ||
71 | |||
72 | pci1: pcie@ffe0a000 { | ||
73 | reg = <0x0 0xffe0a000 0x0 0x1000>; | ||
74 | ranges = <0x2000000 0x0 0xe0000000 0x0 0x80000000 0x0 0x20000000 | ||
75 | 0x1000000 0x0 0x00000000 0x0 0xffc00000 0x0 0x10000>; | ||
76 | pcie@0 { | ||
77 | ranges = <0x2000000 0x0 0xe0000000 | ||
78 | 0x2000000 0x0 0xe0000000 | ||
79 | 0x0 0x20000000 | ||
80 | |||
81 | 0x1000000 0x0 0x0 | ||
82 | 0x1000000 0x0 0x0 | ||
83 | 0x0 0x100000>; | ||
84 | }; | ||
85 | }; | ||
86 | }; | ||
87 | |||
88 | /include/ "p1020mbg-pc.dtsi" | ||
89 | /include/ "fsl/p1020si-post.dtsi" | ||
diff --git a/arch/powerpc/boot/dts/p1020mbg-pc_36b.dts b/arch/powerpc/boot/dts/p1020mbg-pc_36b.dts new file mode 100644 index 000000000000..9e9f401419b1 --- /dev/null +++ b/arch/powerpc/boot/dts/p1020mbg-pc_36b.dts | |||
@@ -0,0 +1,89 @@ | |||
1 | /* | ||
2 | * P1020 MBG-PC Device Tree Source (36-bit address map) | ||
3 | * | ||
4 | * Copyright 2012 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 | /include/ "fsl/p1020si-pre.dtsi" | ||
36 | / { | ||
37 | model = "fsl,P1020MBG-PC"; | ||
38 | compatible = "fsl,P1020MBG-PC"; | ||
39 | |||
40 | memory { | ||
41 | device_type = "memory"; | ||
42 | }; | ||
43 | |||
44 | lbc: localbus@fffe05000 { | ||
45 | reg = <0xf 0xffe05000 0x0 0x1000>; | ||
46 | |||
47 | /* NOR and L2 switch */ | ||
48 | ranges = <0x0 0x0 0xf 0xec000000 0x04000000 | ||
49 | 0x1 0x0 0xf 0xffa00000 0x00040000 | ||
50 | 0x2 0x0 0xf 0xffb00000 0x00020000>; | ||
51 | }; | ||
52 | |||
53 | soc: soc@fffe00000 { | ||
54 | ranges = <0x0 0xf 0xffe00000 0x100000>; | ||
55 | }; | ||
56 | |||
57 | pci0: pcie@fffe09000 { | ||
58 | reg = <0xf 0xffe09000 0x0 0x1000>; | ||
59 | ranges = <0x2000000 0x0 0xe0000000 0xc 0x20000000 0x0 0x20000000 | ||
60 | 0x1000000 0x0 0x00000000 0xf 0xffc10000 0x0 0x10000>; | ||
61 | pcie@0 { | ||
62 | ranges = <0x2000000 0x0 0xe0000000 | ||
63 | 0x2000000 0x0 0xe0000000 | ||
64 | 0x0 0x20000000 | ||
65 | |||
66 | 0x1000000 0x0 0x0 | ||
67 | 0x1000000 0x0 0x0 | ||
68 | 0x0 0x100000>; | ||
69 | }; | ||
70 | }; | ||
71 | |||
72 | pci1: pcie@fffe0a000 { | ||
73 | reg = <0xf 0xffe0a000 0 0x1000>; | ||
74 | ranges = <0x2000000 0x0 0xe0000000 0xc 0x00000000 0x0 0x20000000 | ||
75 | 0x1000000 0x0 0x00000000 0xf 0xffc00000 0x0 0x10000>; | ||
76 | pcie@0 { | ||
77 | ranges = <0x2000000 0x0 0xe0000000 | ||
78 | 0x2000000 0x0 0xe0000000 | ||
79 | 0x0 0x20000000 | ||
80 | |||
81 | 0x1000000 0x0 0x0 | ||
82 | 0x1000000 0x0 0x0 | ||
83 | 0x0 0x100000>; | ||
84 | }; | ||
85 | }; | ||
86 | }; | ||
87 | |||
88 | /include/ "p1020mbg-pc.dtsi" | ||
89 | /include/ "fsl/p1020si-post.dtsi" | ||
diff --git a/arch/powerpc/boot/dts/p1020utm-pc.dtsi b/arch/powerpc/boot/dts/p1020utm-pc.dtsi new file mode 100644 index 000000000000..7ea85eabcc5c --- /dev/null +++ b/arch/powerpc/boot/dts/p1020utm-pc.dtsi | |||
@@ -0,0 +1,140 @@ | |||
1 | /* | ||
2 | * P1020 UTM-PC Device Tree Source stub (no addresses or top-level ranges) | ||
3 | * | ||
4 | * Copyright 2012 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 | &lbc { | ||
36 | nor@0,0 { | ||
37 | #address-cells = <1>; | ||
38 | #size-cells = <1>; | ||
39 | compatible = "cfi-flash"; | ||
40 | reg = <0x0 0x0 0x2000000>; | ||
41 | bank-width = <2>; | ||
42 | device-width = <1>; | ||
43 | |||
44 | partition@0 { | ||
45 | /* 256KB for DTB Image */ | ||
46 | reg = <0x0 0x00040000>; | ||
47 | label = "NOR DTB Image"; | ||
48 | }; | ||
49 | |||
50 | partition@40000 { | ||
51 | /* 3.75 MB for Linux Kernel Image */ | ||
52 | reg = <0x00040000 0x003c0000>; | ||
53 | label = "NOR Linux Kernel Image"; | ||
54 | }; | ||
55 | |||
56 | partition@400000 { | ||
57 | /* 27MB for Root file System */ | ||
58 | reg = <0x00400000 0x01b00000>; | ||
59 | label = "NOR Root File System"; | ||
60 | }; | ||
61 | |||
62 | partition@1f00000 { | ||
63 | /* This location must not be altered */ | ||
64 | /* 512KB for u-boot Bootloader Image */ | ||
65 | /* 512KB for u-boot Environment Variables */ | ||
66 | reg = <0x01f00000 0x00100000>; | ||
67 | label = "NOR U-Boot Image"; | ||
68 | read-only; | ||
69 | }; | ||
70 | }; | ||
71 | }; | ||
72 | |||
73 | &soc { | ||
74 | i2c@3000 { | ||
75 | rtc@68 { | ||
76 | compatible = "dallas,ds1339"; | ||
77 | reg = <0x68>; | ||
78 | }; | ||
79 | }; | ||
80 | |||
81 | mdio@24000 { | ||
82 | phy0: ethernet-phy@0 { | ||
83 | interrupts = <3 1 0 0>; | ||
84 | reg = <0x0>; | ||
85 | }; | ||
86 | phy1: ethernet-phy@1 { | ||
87 | interrupts = <2 1 0 0>; | ||
88 | reg = <0x1>; | ||
89 | }; | ||
90 | phy2: ethernet-phy@2 { | ||
91 | interrupts = <1 1 0 0>; | ||
92 | reg = <0x2>; | ||
93 | }; | ||
94 | }; | ||
95 | |||
96 | mdio@25000 { | ||
97 | tbi1: tbi-phy@11 { | ||
98 | reg = <0x11>; | ||
99 | device_type = "tbi-phy"; | ||
100 | }; | ||
101 | }; | ||
102 | |||
103 | mdio@26000 { | ||
104 | tbi2: tbi-phy@11 { | ||
105 | reg = <0x11>; | ||
106 | device_type = "tbi-phy"; | ||
107 | }; | ||
108 | }; | ||
109 | |||
110 | enet0: ethernet@b0000 { | ||
111 | phy-handle = <&phy2>; | ||
112 | phy-connection-type = "rgmii-id"; | ||
113 | }; | ||
114 | |||
115 | enet1: ethernet@b1000 { | ||
116 | phy-handle = <&phy0>; | ||
117 | tbi-handle = <&tbi1>; | ||
118 | phy-connection-type = "sgmii"; | ||
119 | }; | ||
120 | |||
121 | enet2: ethernet@b2000 { | ||
122 | phy-handle = <&phy1>; | ||
123 | phy-connection-type = "rgmii-id"; | ||
124 | }; | ||
125 | |||
126 | usb@22000 { | ||
127 | phy_type = "ulpi"; | ||
128 | }; | ||
129 | |||
130 | /* USB2 is shared with localbus, so it must be disabled | ||
131 | by default. We can't put 'status = "disabled";' here | ||
132 | since U-Boot doesn't clear the status property when | ||
133 | it enables USB2. OTOH, U-Boot does create a new node | ||
134 | when there isn't any. So, just comment it out. | ||
135 | */ | ||
136 | usb@23000 { | ||
137 | status = "disabled"; | ||
138 | phy_type = "ulpi"; | ||
139 | }; | ||
140 | }; | ||
diff --git a/arch/powerpc/boot/dts/p1020utm-pc_32b.dts b/arch/powerpc/boot/dts/p1020utm-pc_32b.dts new file mode 100644 index 000000000000..4bfdd8971cdb --- /dev/null +++ b/arch/powerpc/boot/dts/p1020utm-pc_32b.dts | |||
@@ -0,0 +1,89 @@ | |||
1 | /* | ||
2 | * P1020 UTM-PC Device Tree Source (32-bit address map) | ||
3 | * | ||
4 | * Copyright 2012 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 | /include/ "fsl/p1020si-pre.dtsi" | ||
36 | / { | ||
37 | model = "fsl,P1020UTM-PC"; | ||
38 | compatible = "fsl,P1020UTM-PC"; | ||
39 | |||
40 | memory { | ||
41 | device_type = "memory"; | ||
42 | }; | ||
43 | |||
44 | lbc: localbus@ffe05000 { | ||
45 | reg = <0x0 0xffe05000 0x0 0x1000>; | ||
46 | |||
47 | /* NOR */ | ||
48 | ranges = <0x0 0x0 0x0 0xec000000 0x02000000 | ||
49 | 0x1 0x0 0x0 0xffa00000 0x00040000 | ||
50 | 0x2 0x0 0x0 0xffb00000 0x00020000>; | ||
51 | }; | ||
52 | |||
53 | soc: soc@ffe00000 { | ||
54 | ranges = <0x0 0x0 0xffe00000 0x100000>; | ||
55 | }; | ||
56 | |||
57 | pci0: pcie@ffe09000 { | ||
58 | reg = <0x0 0xffe09000 0x0 0x1000>; | ||
59 | ranges = <0x2000000 0x0 0xe0000000 0x0 0xa0000000 0x0 0x20000000 | ||
60 | 0x1000000 0x0 0x00000000 0x0 0xffc10000 0x0 0x10000>; | ||
61 | pcie@0 { | ||
62 | ranges = <0x2000000 0x0 0xe0000000 | ||
63 | 0x2000000 0x0 0xe0000000 | ||
64 | 0x0 0x20000000 | ||
65 | |||
66 | 0x1000000 0x0 0x0 | ||
67 | 0x1000000 0x0 0x0 | ||
68 | 0x0 0x100000>; | ||
69 | }; | ||
70 | }; | ||
71 | |||
72 | pci1: pcie@ffe0a000 { | ||
73 | reg = <0x0 0xffe0a000 0x0 0x1000>; | ||
74 | ranges = <0x2000000 0x0 0xe0000000 0x0 0x80000000 0x0 0x20000000 | ||
75 | 0x1000000 0x0 0x00000000 0x0 0xffc00000 0x0 0x10000>; | ||
76 | pcie@0 { | ||
77 | ranges = <0x2000000 0x0 0xe0000000 | ||
78 | 0x2000000 0x0 0xe0000000 | ||
79 | 0x0 0x20000000 | ||
80 | |||
81 | 0x1000000 0x0 0x0 | ||
82 | 0x1000000 0x0 0x0 | ||
83 | 0x0 0x100000>; | ||
84 | }; | ||
85 | }; | ||
86 | }; | ||
87 | |||
88 | /include/ "p1020utm-pc.dtsi" | ||
89 | /include/ "fsl/p1020si-post.dtsi" | ||
diff --git a/arch/powerpc/boot/dts/p1020utm-pc_36b.dts b/arch/powerpc/boot/dts/p1020utm-pc_36b.dts new file mode 100644 index 000000000000..abec53557501 --- /dev/null +++ b/arch/powerpc/boot/dts/p1020utm-pc_36b.dts | |||
@@ -0,0 +1,89 @@ | |||
1 | /* | ||
2 | * P1020 UTM-PC Device Tree Source (36-bit address map) | ||
3 | * | ||
4 | * Copyright 2012 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 | /include/ "fsl/p1020si-pre.dtsi" | ||
36 | / { | ||
37 | model = "fsl,P1020UTM-PC"; | ||
38 | compatible = "fsl,P1020UTM-PC"; | ||
39 | |||
40 | memory { | ||
41 | device_type = "memory"; | ||
42 | }; | ||
43 | |||
44 | lbc: localbus@fffe05000 { | ||
45 | reg = <0xf 0xffe05000 0x0 0x1000>; | ||
46 | |||
47 | /* NOR */ | ||
48 | ranges = <0x0 0x0 0xf 0xec000000 0x02000000 | ||
49 | 0x1 0x0 0xf 0xffa00000 0x00040000 | ||
50 | 0x2 0x0 0xf 0xffb00000 0x00020000>; | ||
51 | }; | ||
52 | |||
53 | soc: soc@fffe00000 { | ||
54 | ranges = <0x0 0xf 0xffe00000 0x100000>; | ||
55 | }; | ||
56 | |||
57 | pci0: pcie@fffe09000 { | ||
58 | reg = <0xf 0xffe09000 0x0 0x1000>; | ||
59 | ranges = <0x2000000 0x0 0xe0000000 0xc 0x20000000 0x0 0x20000000 | ||
60 | 0x1000000 0x0 0x00000000 0xf 0xffc10000 0x0 0x10000>; | ||
61 | pcie@0 { | ||
62 | ranges = <0x2000000 0x0 0xe0000000 | ||
63 | 0x2000000 0x0 0xe0000000 | ||
64 | 0x0 0x20000000 | ||
65 | |||
66 | 0x1000000 0x0 0x0 | ||
67 | 0x1000000 0x0 0x0 | ||
68 | 0x0 0x100000>; | ||
69 | }; | ||
70 | }; | ||
71 | |||
72 | pci1: pcie@fffe0a000 { | ||
73 | reg = <0xf 0xffe0a000 0 0x1000>; | ||
74 | ranges = <0x2000000 0x0 0xe0000000 0xc 0x00000000 0x0 0x20000000 | ||
75 | 0x1000000 0x0 0x00000000 0xf 0xffc00000 0x0 0x10000>; | ||
76 | pcie@0 { | ||
77 | ranges = <0x2000000 0x0 0xe0000000 | ||
78 | 0x2000000 0x0 0xe0000000 | ||
79 | 0x0 0x20000000 | ||
80 | |||
81 | 0x1000000 0x0 0x0 | ||
82 | 0x1000000 0x0 0x0 | ||
83 | 0x0 0x100000>; | ||
84 | }; | ||
85 | }; | ||
86 | }; | ||
87 | |||
88 | /include/ "p1020utm-pc.dtsi" | ||
89 | /include/ "fsl/p1020si-post.dtsi" | ||
diff --git a/arch/powerpc/boot/dts/p2041rdb.dts b/arch/powerpc/boot/dts/p2041rdb.dts index 4f957db01230..285213976a7f 100644 --- a/arch/powerpc/boot/dts/p2041rdb.dts +++ b/arch/powerpc/boot/dts/p2041rdb.dts | |||
@@ -135,7 +135,6 @@ | |||
135 | reg = <0xf 0xfe200000 0 0x1000>; | 135 | reg = <0xf 0xfe200000 0 0x1000>; |
136 | ranges = <0x02000000 0 0xe0000000 0xc 0x00000000 0x0 0x20000000 | 136 | ranges = <0x02000000 0 0xe0000000 0xc 0x00000000 0x0 0x20000000 |
137 | 0x01000000 0 0x00000000 0xf 0xf8000000 0x0 0x00010000>; | 137 | 0x01000000 0 0x00000000 0xf 0xf8000000 0x0 0x00010000>; |
138 | fsl,msi = <&msi0>; | ||
139 | pcie@0 { | 138 | pcie@0 { |
140 | ranges = <0x02000000 0 0xe0000000 | 139 | ranges = <0x02000000 0 0xe0000000 |
141 | 0x02000000 0 0xe0000000 | 140 | 0x02000000 0 0xe0000000 |
@@ -151,7 +150,6 @@ | |||
151 | reg = <0xf 0xfe201000 0 0x1000>; | 150 | reg = <0xf 0xfe201000 0 0x1000>; |
152 | ranges = <0x02000000 0x0 0xe0000000 0xc 0x20000000 0x0 0x20000000 | 151 | ranges = <0x02000000 0x0 0xe0000000 0xc 0x20000000 0x0 0x20000000 |
153 | 0x01000000 0x0 0x00000000 0xf 0xf8010000 0x0 0x00010000>; | 152 | 0x01000000 0x0 0x00000000 0xf 0xf8010000 0x0 0x00010000>; |
154 | fsl,msi = <&msi1>; | ||
155 | pcie@0 { | 153 | pcie@0 { |
156 | ranges = <0x02000000 0 0xe0000000 | 154 | ranges = <0x02000000 0 0xe0000000 |
157 | 0x02000000 0 0xe0000000 | 155 | 0x02000000 0 0xe0000000 |
@@ -167,7 +165,6 @@ | |||
167 | reg = <0xf 0xfe202000 0 0x1000>; | 165 | reg = <0xf 0xfe202000 0 0x1000>; |
168 | ranges = <0x02000000 0 0xe0000000 0xc 0x40000000 0 0x20000000 | 166 | ranges = <0x02000000 0 0xe0000000 0xc 0x40000000 0 0x20000000 |
169 | 0x01000000 0 0x00000000 0xf 0xf8020000 0 0x00010000>; | 167 | 0x01000000 0 0x00000000 0xf 0xf8020000 0 0x00010000>; |
170 | fsl,msi = <&msi2>; | ||
171 | pcie@0 { | 168 | pcie@0 { |
172 | ranges = <0x02000000 0 0xe0000000 | 169 | ranges = <0x02000000 0 0xe0000000 |
173 | 0x02000000 0 0xe0000000 | 170 | 0x02000000 0 0xe0000000 |
diff --git a/arch/powerpc/boot/dts/p3041ds.dts b/arch/powerpc/boot/dts/p3041ds.dts index f469145abaeb..22a215e94162 100644 --- a/arch/powerpc/boot/dts/p3041ds.dts +++ b/arch/powerpc/boot/dts/p3041ds.dts | |||
@@ -173,7 +173,6 @@ | |||
173 | reg = <0xf 0xfe200000 0 0x1000>; | 173 | reg = <0xf 0xfe200000 0 0x1000>; |
174 | ranges = <0x02000000 0 0xe0000000 0xc 0x00000000 0x0 0x20000000 | 174 | ranges = <0x02000000 0 0xe0000000 0xc 0x00000000 0x0 0x20000000 |
175 | 0x01000000 0 0x00000000 0xf 0xf8000000 0x0 0x00010000>; | 175 | 0x01000000 0 0x00000000 0xf 0xf8000000 0x0 0x00010000>; |
176 | fsl,msi = <&msi0>; | ||
177 | pcie@0 { | 176 | pcie@0 { |
178 | ranges = <0x02000000 0 0xe0000000 | 177 | ranges = <0x02000000 0 0xe0000000 |
179 | 0x02000000 0 0xe0000000 | 178 | 0x02000000 0 0xe0000000 |
@@ -189,7 +188,6 @@ | |||
189 | reg = <0xf 0xfe201000 0 0x1000>; | 188 | reg = <0xf 0xfe201000 0 0x1000>; |
190 | ranges = <0x02000000 0x0 0xe0000000 0xc 0x20000000 0x0 0x20000000 | 189 | ranges = <0x02000000 0x0 0xe0000000 0xc 0x20000000 0x0 0x20000000 |
191 | 0x01000000 0x0 0x00000000 0xf 0xf8010000 0x0 0x00010000>; | 190 | 0x01000000 0x0 0x00000000 0xf 0xf8010000 0x0 0x00010000>; |
192 | fsl,msi = <&msi1>; | ||
193 | pcie@0 { | 191 | pcie@0 { |
194 | ranges = <0x02000000 0 0xe0000000 | 192 | ranges = <0x02000000 0 0xe0000000 |
195 | 0x02000000 0 0xe0000000 | 193 | 0x02000000 0 0xe0000000 |
@@ -205,7 +203,6 @@ | |||
205 | reg = <0xf 0xfe202000 0 0x1000>; | 203 | reg = <0xf 0xfe202000 0 0x1000>; |
206 | ranges = <0x02000000 0 0xe0000000 0xc 0x40000000 0 0x20000000 | 204 | ranges = <0x02000000 0 0xe0000000 0xc 0x40000000 0 0x20000000 |
207 | 0x01000000 0 0x00000000 0xf 0xf8020000 0 0x00010000>; | 205 | 0x01000000 0 0x00000000 0xf 0xf8020000 0 0x00010000>; |
208 | fsl,msi = <&msi2>; | ||
209 | pcie@0 { | 206 | pcie@0 { |
210 | ranges = <0x02000000 0 0xe0000000 | 207 | ranges = <0x02000000 0 0xe0000000 |
211 | 0x02000000 0 0xe0000000 | 208 | 0x02000000 0 0xe0000000 |
@@ -221,7 +218,6 @@ | |||
221 | reg = <0xf 0xfe203000 0 0x1000>; | 218 | reg = <0xf 0xfe203000 0 0x1000>; |
222 | ranges = <0x02000000 0 0xe0000000 0xc 0x60000000 0 0x20000000 | 219 | ranges = <0x02000000 0 0xe0000000 0xc 0x60000000 0 0x20000000 |
223 | 0x01000000 0 0x00000000 0xf 0xf8030000 0 0x00010000>; | 220 | 0x01000000 0 0x00000000 0xf 0xf8030000 0 0x00010000>; |
224 | fsl,msi = <&msi2>; | ||
225 | pcie@0 { | 221 | pcie@0 { |
226 | ranges = <0x02000000 0 0xe0000000 | 222 | ranges = <0x02000000 0 0xe0000000 |
227 | 0x02000000 0 0xe0000000 | 223 | 0x02000000 0 0xe0000000 |
diff --git a/arch/powerpc/boot/dts/p3060qds.dts b/arch/powerpc/boot/dts/p3060qds.dts index 529042e4b9a2..9ae875c8a211 100644 --- a/arch/powerpc/boot/dts/p3060qds.dts +++ b/arch/powerpc/boot/dts/p3060qds.dts | |||
@@ -212,7 +212,6 @@ | |||
212 | reg = <0xf 0xfe200000 0 0x1000>; | 212 | reg = <0xf 0xfe200000 0 0x1000>; |
213 | ranges = <0x02000000 0 0xe0000000 0xc 0x00000000 0x0 0x20000000 | 213 | ranges = <0x02000000 0 0xe0000000 0xc 0x00000000 0x0 0x20000000 |
214 | 0x01000000 0 0x00000000 0xf 0xf8000000 0x0 0x00010000>; | 214 | 0x01000000 0 0x00000000 0xf 0xf8000000 0x0 0x00010000>; |
215 | fsl,msi = <&msi0>; | ||
216 | pcie@0 { | 215 | pcie@0 { |
217 | ranges = <0x02000000 0 0xe0000000 | 216 | ranges = <0x02000000 0 0xe0000000 |
218 | 0x02000000 0 0xe0000000 | 217 | 0x02000000 0 0xe0000000 |
@@ -228,7 +227,6 @@ | |||
228 | reg = <0xf 0xfe201000 0 0x1000>; | 227 | reg = <0xf 0xfe201000 0 0x1000>; |
229 | ranges = <0x02000000 0x0 0xe0000000 0xc 0x20000000 0x0 0x20000000 | 228 | ranges = <0x02000000 0x0 0xe0000000 0xc 0x20000000 0x0 0x20000000 |
230 | 0x01000000 0x0 0x00000000 0xf 0xf8010000 0x0 0x00010000>; | 229 | 0x01000000 0x0 0x00000000 0xf 0xf8010000 0x0 0x00010000>; |
231 | fsl,msi = <&msi1>; | ||
232 | pcie@0 { | 230 | pcie@0 { |
233 | ranges = <0x02000000 0 0xe0000000 | 231 | ranges = <0x02000000 0 0xe0000000 |
234 | 0x02000000 0 0xe0000000 | 232 | 0x02000000 0 0xe0000000 |
diff --git a/arch/powerpc/boot/dts/p4080ds.dts b/arch/powerpc/boot/dts/p4080ds.dts index 6d60e54e50a0..3e204609d02e 100644 --- a/arch/powerpc/boot/dts/p4080ds.dts +++ b/arch/powerpc/boot/dts/p4080ds.dts | |||
@@ -141,7 +141,6 @@ | |||
141 | reg = <0xf 0xfe200000 0 0x1000>; | 141 | reg = <0xf 0xfe200000 0 0x1000>; |
142 | ranges = <0x02000000 0 0xe0000000 0xc 0x00000000 0x0 0x20000000 | 142 | ranges = <0x02000000 0 0xe0000000 0xc 0x00000000 0x0 0x20000000 |
143 | 0x01000000 0 0x00000000 0xf 0xf8000000 0x0 0x00010000>; | 143 | 0x01000000 0 0x00000000 0xf 0xf8000000 0x0 0x00010000>; |
144 | fsl,msi = <&msi0>; | ||
145 | pcie@0 { | 144 | pcie@0 { |
146 | ranges = <0x02000000 0 0xe0000000 | 145 | ranges = <0x02000000 0 0xe0000000 |
147 | 0x02000000 0 0xe0000000 | 146 | 0x02000000 0 0xe0000000 |
@@ -157,7 +156,6 @@ | |||
157 | reg = <0xf 0xfe201000 0 0x1000>; | 156 | reg = <0xf 0xfe201000 0 0x1000>; |
158 | ranges = <0x02000000 0x0 0xe0000000 0xc 0x20000000 0x0 0x20000000 | 157 | ranges = <0x02000000 0x0 0xe0000000 0xc 0x20000000 0x0 0x20000000 |
159 | 0x01000000 0x0 0x00000000 0xf 0xf8010000 0x0 0x00010000>; | 158 | 0x01000000 0x0 0x00000000 0xf 0xf8010000 0x0 0x00010000>; |
160 | fsl,msi = <&msi1>; | ||
161 | pcie@0 { | 159 | pcie@0 { |
162 | ranges = <0x02000000 0 0xe0000000 | 160 | ranges = <0x02000000 0 0xe0000000 |
163 | 0x02000000 0 0xe0000000 | 161 | 0x02000000 0 0xe0000000 |
@@ -173,7 +171,6 @@ | |||
173 | reg = <0xf 0xfe202000 0 0x1000>; | 171 | reg = <0xf 0xfe202000 0 0x1000>; |
174 | ranges = <0x02000000 0 0xe0000000 0xc 0x40000000 0 0x20000000 | 172 | ranges = <0x02000000 0 0xe0000000 0xc 0x40000000 0 0x20000000 |
175 | 0x01000000 0 0x00000000 0xf 0xf8020000 0 0x00010000>; | 173 | 0x01000000 0 0x00000000 0xf 0xf8020000 0 0x00010000>; |
176 | fsl,msi = <&msi2>; | ||
177 | pcie@0 { | 174 | pcie@0 { |
178 | ranges = <0x02000000 0 0xe0000000 | 175 | ranges = <0x02000000 0 0xe0000000 |
179 | 0x02000000 0 0xe0000000 | 176 | 0x02000000 0 0xe0000000 |
diff --git a/arch/powerpc/boot/dts/p5020ds.dts b/arch/powerpc/boot/dts/p5020ds.dts index 1c250684c902..27c07ed6adc1 100644 --- a/arch/powerpc/boot/dts/p5020ds.dts +++ b/arch/powerpc/boot/dts/p5020ds.dts | |||
@@ -173,7 +173,6 @@ | |||
173 | reg = <0xf 0xfe200000 0 0x1000>; | 173 | reg = <0xf 0xfe200000 0 0x1000>; |
174 | ranges = <0x02000000 0 0xe0000000 0xc 0x00000000 0x0 0x20000000 | 174 | ranges = <0x02000000 0 0xe0000000 0xc 0x00000000 0x0 0x20000000 |
175 | 0x01000000 0 0x00000000 0xf 0xf8000000 0x0 0x00010000>; | 175 | 0x01000000 0 0x00000000 0xf 0xf8000000 0x0 0x00010000>; |
176 | fsl,msi = <&msi0>; | ||
177 | pcie@0 { | 176 | pcie@0 { |
178 | ranges = <0x02000000 0 0xe0000000 | 177 | ranges = <0x02000000 0 0xe0000000 |
179 | 0x02000000 0 0xe0000000 | 178 | 0x02000000 0 0xe0000000 |
@@ -189,7 +188,6 @@ | |||
189 | reg = <0xf 0xfe201000 0 0x1000>; | 188 | reg = <0xf 0xfe201000 0 0x1000>; |
190 | ranges = <0x02000000 0x0 0xe0000000 0xc 0x20000000 0x0 0x20000000 | 189 | ranges = <0x02000000 0x0 0xe0000000 0xc 0x20000000 0x0 0x20000000 |
191 | 0x01000000 0x0 0x00000000 0xf 0xf8010000 0x0 0x00010000>; | 190 | 0x01000000 0x0 0x00000000 0xf 0xf8010000 0x0 0x00010000>; |
192 | fsl,msi = <&msi1>; | ||
193 | pcie@0 { | 191 | pcie@0 { |
194 | ranges = <0x02000000 0 0xe0000000 | 192 | ranges = <0x02000000 0 0xe0000000 |
195 | 0x02000000 0 0xe0000000 | 193 | 0x02000000 0 0xe0000000 |
@@ -205,7 +203,6 @@ | |||
205 | reg = <0xf 0xfe202000 0 0x1000>; | 203 | reg = <0xf 0xfe202000 0 0x1000>; |
206 | ranges = <0x02000000 0 0xe0000000 0xc 0x40000000 0 0x20000000 | 204 | ranges = <0x02000000 0 0xe0000000 0xc 0x40000000 0 0x20000000 |
207 | 0x01000000 0 0x00000000 0xf 0xf8020000 0 0x00010000>; | 205 | 0x01000000 0 0x00000000 0xf 0xf8020000 0 0x00010000>; |
208 | fsl,msi = <&msi2>; | ||
209 | pcie@0 { | 206 | pcie@0 { |
210 | ranges = <0x02000000 0 0xe0000000 | 207 | ranges = <0x02000000 0 0xe0000000 |
211 | 0x02000000 0 0xe0000000 | 208 | 0x02000000 0 0xe0000000 |
@@ -221,7 +218,6 @@ | |||
221 | reg = <0xf 0xfe203000 0 0x1000>; | 218 | reg = <0xf 0xfe203000 0 0x1000>; |
222 | ranges = <0x02000000 0 0xe0000000 0xc 0x60000000 0 0x20000000 | 219 | ranges = <0x02000000 0 0xe0000000 0xc 0x60000000 0 0x20000000 |
223 | 0x01000000 0 0x00000000 0xf 0xf8030000 0 0x00010000>; | 220 | 0x01000000 0 0x00000000 0xf 0xf8030000 0 0x00010000>; |
224 | fsl,msi = <&msi2>; | ||
225 | pcie@0 { | 221 | pcie@0 { |
226 | ranges = <0x02000000 0 0xe0000000 | 222 | ranges = <0x02000000 0 0xe0000000 |
227 | 0x02000000 0 0xe0000000 | 223 | 0x02000000 0 0xe0000000 |
diff --git a/arch/powerpc/configs/corenet32_smp_defconfig b/arch/powerpc/configs/corenet32_smp_defconfig index f8aef205d222..91db656294e8 100644 --- a/arch/powerpc/configs/corenet32_smp_defconfig +++ b/arch/powerpc/configs/corenet32_smp_defconfig | |||
@@ -116,6 +116,7 @@ CONFIG_SERIAL_8250_RSA=y | |||
116 | CONFIG_HW_RANDOM=y | 116 | CONFIG_HW_RANDOM=y |
117 | CONFIG_NVRAM=y | 117 | CONFIG_NVRAM=y |
118 | CONFIG_I2C=y | 118 | CONFIG_I2C=y |
119 | CONFIG_I2C_CHARDEV=y | ||
119 | CONFIG_I2C_MPC=y | 120 | CONFIG_I2C_MPC=y |
120 | CONFIG_SPI=y | 121 | CONFIG_SPI=y |
121 | CONFIG_SPI_GPIO=y | 122 | CONFIG_SPI_GPIO=y |
diff --git a/arch/powerpc/configs/corenet64_smp_defconfig b/arch/powerpc/configs/corenet64_smp_defconfig index 82b13bfcf3c0..6798343580f0 100644 --- a/arch/powerpc/configs/corenet64_smp_defconfig +++ b/arch/powerpc/configs/corenet64_smp_defconfig | |||
@@ -71,6 +71,8 @@ CONFIG_SERIAL_8250_MANY_PORTS=y | |||
71 | CONFIG_SERIAL_8250_DETECT_IRQ=y | 71 | CONFIG_SERIAL_8250_DETECT_IRQ=y |
72 | CONFIG_SERIAL_8250_RSA=y | 72 | CONFIG_SERIAL_8250_RSA=y |
73 | CONFIG_I2C=y | 73 | CONFIG_I2C=y |
74 | CONFIG_I2C_CHARDEV=y | ||
75 | CONFIG_I2C_MPC=y | ||
74 | # CONFIG_HWMON is not set | 76 | # CONFIG_HWMON is not set |
75 | CONFIG_VIDEO_OUTPUT_CONTROL=y | 77 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
76 | # CONFIG_HID_SUPPORT is not set | 78 | # CONFIG_HID_SUPPORT is not set |
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index cc87a8441566..d6b6df5e8743 100644 --- a/arch/powerpc/configs/mpc85xx_defconfig +++ b/arch/powerpc/configs/mpc85xx_defconfig | |||
@@ -117,6 +117,7 @@ CONFIG_SERIAL_8250_RSA=y | |||
117 | CONFIG_SERIAL_QE=m | 117 | CONFIG_SERIAL_QE=m |
118 | CONFIG_NVRAM=y | 118 | CONFIG_NVRAM=y |
119 | CONFIG_I2C=y | 119 | CONFIG_I2C=y |
120 | CONFIG_I2C_CHARDEV=y | ||
120 | CONFIG_I2C_CPM=m | 121 | CONFIG_I2C_CPM=m |
121 | CONFIG_I2C_MPC=y | 122 | CONFIG_I2C_MPC=y |
122 | CONFIG_SPI=y | 123 | CONFIG_SPI=y |
diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig index 48d6682f2434..5b0e2926becd 100644 --- a/arch/powerpc/configs/mpc85xx_smp_defconfig +++ b/arch/powerpc/configs/mpc85xx_smp_defconfig | |||
@@ -119,6 +119,7 @@ CONFIG_SERIAL_8250_RSA=y | |||
119 | CONFIG_SERIAL_QE=m | 119 | CONFIG_SERIAL_QE=m |
120 | CONFIG_NVRAM=y | 120 | CONFIG_NVRAM=y |
121 | CONFIG_I2C=y | 121 | CONFIG_I2C=y |
122 | CONFIG_I2C_CHARDEV=y | ||
122 | CONFIG_I2C_CPM=m | 123 | CONFIG_I2C_CPM=m |
123 | CONFIG_I2C_MPC=y | 124 | CONFIG_I2C_MPC=y |
124 | CONFIG_SPI=y | 125 | CONFIG_SPI=y |
diff --git a/arch/powerpc/include/asm/epapr_hcalls.h b/arch/powerpc/include/asm/epapr_hcalls.h index f3b0c2cc9fea..976835d8f22e 100644 --- a/arch/powerpc/include/asm/epapr_hcalls.h +++ b/arch/powerpc/include/asm/epapr_hcalls.h | |||
@@ -134,10 +134,15 @@ | |||
134 | * whether they will be clobbered. | 134 | * whether they will be clobbered. |
135 | * | 135 | * |
136 | * Note that r11 can be used as an output parameter. | 136 | * Note that r11 can be used as an output parameter. |
137 | * | ||
138 | * The "memory" clobber is only necessary for hcalls where the Hypervisor | ||
139 | * will read or write guest memory. However, we add it to all hcalls because | ||
140 | * the impact is minimal, and we want to ensure that it's present for the | ||
141 | * hcalls that need it. | ||
137 | */ | 142 | */ |
138 | 143 | ||
139 | /* List of common clobbered registers. Do not use this macro. */ | 144 | /* List of common clobbered registers. Do not use this macro. */ |
140 | #define EV_HCALL_CLOBBERS "r0", "r12", "xer", "ctr", "lr", "cc" | 145 | #define EV_HCALL_CLOBBERS "r0", "r12", "xer", "ctr", "lr", "cc", "memory" |
141 | 146 | ||
142 | #define EV_HCALL_CLOBBERS8 EV_HCALL_CLOBBERS | 147 | #define EV_HCALL_CLOBBERS8 EV_HCALL_CLOBBERS |
143 | #define EV_HCALL_CLOBBERS7 EV_HCALL_CLOBBERS8, "r10" | 148 | #define EV_HCALL_CLOBBERS7 EV_HCALL_CLOBBERS8, "r10" |
diff --git a/arch/powerpc/include/asm/fsl_guts.h b/arch/powerpc/include/asm/fsl_guts.h index ce04530d2000..aa4c488589ce 100644 --- a/arch/powerpc/include/asm/fsl_guts.h +++ b/arch/powerpc/include/asm/fsl_guts.h | |||
@@ -16,15 +16,6 @@ | |||
16 | #define __ASM_POWERPC_FSL_GUTS_H__ | 16 | #define __ASM_POWERPC_FSL_GUTS_H__ |
17 | #ifdef __KERNEL__ | 17 | #ifdef __KERNEL__ |
18 | 18 | ||
19 | /* | ||
20 | * These #ifdefs are safe because it's not possible to build a kernel that | ||
21 | * runs on e500 and e600 cores. | ||
22 | */ | ||
23 | |||
24 | #if !defined(CONFIG_PPC_85xx) && !defined(CONFIG_PPC_86xx) | ||
25 | #error Only 85xx and 86xx SOCs are supported | ||
26 | #endif | ||
27 | |||
28 | /** | 19 | /** |
29 | * Global Utility Registers. | 20 | * Global Utility Registers. |
30 | * | 21 | * |
@@ -36,11 +27,7 @@ | |||
36 | * different names. In these cases, one name is chosen to avoid extraneous | 27 | * different names. In these cases, one name is chosen to avoid extraneous |
37 | * #ifdefs. | 28 | * #ifdefs. |
38 | */ | 29 | */ |
39 | #ifdef CONFIG_PPC_85xx | 30 | struct ccsr_guts { |
40 | struct ccsr_guts_85xx { | ||
41 | #else | ||
42 | struct ccsr_guts_86xx { | ||
43 | #endif | ||
44 | __be32 porpllsr; /* 0x.0000 - POR PLL Ratio Status Register */ | 31 | __be32 porpllsr; /* 0x.0000 - POR PLL Ratio Status Register */ |
45 | __be32 porbmsr; /* 0x.0004 - POR Boot Mode Status Register */ | 32 | __be32 porbmsr; /* 0x.0004 - POR Boot Mode Status Register */ |
46 | __be32 porimpscr; /* 0x.0008 - POR I/O Impedance Status and Control Register */ | 33 | __be32 porimpscr; /* 0x.0008 - POR I/O Impedance Status and Control Register */ |
@@ -77,11 +64,8 @@ struct ccsr_guts_86xx { | |||
77 | u8 res0a8[0xb0 - 0xa8]; | 64 | u8 res0a8[0xb0 - 0xa8]; |
78 | __be32 rstcr; /* 0x.00b0 - Reset Control Register */ | 65 | __be32 rstcr; /* 0x.00b0 - Reset Control Register */ |
79 | u8 res0b4[0xc0 - 0xb4]; | 66 | u8 res0b4[0xc0 - 0xb4]; |
80 | #ifdef CONFIG_PPC_85xx | 67 | __be32 iovselsr; /* 0x.00c0 - I/O voltage select status register |
81 | __be32 iovselsr; /* 0x.00c0 - I/O voltage select status register */ | 68 | Called 'elbcvselcr' on 86xx SOCs */ |
82 | #else | ||
83 | __be32 elbcvselcr; /* 0x.00c0 - eLBC Voltage Select Ctrl Reg */ | ||
84 | #endif | ||
85 | u8 res0c4[0x224 - 0xc4]; | 69 | u8 res0c4[0x224 - 0xc4]; |
86 | __be32 iodelay1; /* 0x.0224 - IO delay control register 1 */ | 70 | __be32 iodelay1; /* 0x.0224 - IO delay control register 1 */ |
87 | __be32 iodelay2; /* 0x.0228 - IO delay control register 2 */ | 71 | __be32 iodelay2; /* 0x.0228 - IO delay control register 2 */ |
@@ -136,7 +120,7 @@ struct ccsr_guts_86xx { | |||
136 | * ch: The channel on the DMA controller (0, 1, 2, or 3) | 120 | * ch: The channel on the DMA controller (0, 1, 2, or 3) |
137 | * device: The device to set as the source (CCSR_GUTS_DMACR_DEV_xx) | 121 | * device: The device to set as the source (CCSR_GUTS_DMACR_DEV_xx) |
138 | */ | 122 | */ |
139 | static inline void guts_set_dmacr(struct ccsr_guts_86xx __iomem *guts, | 123 | static inline void guts_set_dmacr(struct ccsr_guts __iomem *guts, |
140 | unsigned int co, unsigned int ch, unsigned int device) | 124 | unsigned int co, unsigned int ch, unsigned int device) |
141 | { | 125 | { |
142 | unsigned int shift = 16 + (8 * (1 - co) + 2 * (3 - ch)); | 126 | unsigned int shift = 16 + (8 * (1 - co) + 2 * (3 - ch)); |
@@ -172,7 +156,7 @@ static inline void guts_set_dmacr(struct ccsr_guts_86xx __iomem *guts, | |||
172 | * ch: The channel on the DMA controller (0, 1, 2, or 3) | 156 | * ch: The channel on the DMA controller (0, 1, 2, or 3) |
173 | * value: the new value for the bit (0 or 1) | 157 | * value: the new value for the bit (0 or 1) |
174 | */ | 158 | */ |
175 | static inline void guts_set_pmuxcr_dma(struct ccsr_guts_86xx __iomem *guts, | 159 | static inline void guts_set_pmuxcr_dma(struct ccsr_guts __iomem *guts, |
176 | unsigned int co, unsigned int ch, unsigned int value) | 160 | unsigned int co, unsigned int ch, unsigned int value) |
177 | { | 161 | { |
178 | if ((ch == 0) || (ch == 3)) { | 162 | if ((ch == 0) || (ch == 3)) { |
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c index 3754ddc00af7..9a6f04406e0d 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c | |||
@@ -270,7 +270,7 @@ static void __init mpc85xx_mds_qe_init(void) | |||
270 | 270 | ||
271 | if (machine_is(p1021_mds)) { | 271 | if (machine_is(p1021_mds)) { |
272 | 272 | ||
273 | struct ccsr_guts_85xx __iomem *guts; | 273 | struct ccsr_guts __iomem *guts; |
274 | 274 | ||
275 | np = of_find_node_by_name(NULL, "global-utilities"); | 275 | np = of_find_node_by_name(NULL, "global-utilities"); |
276 | if (np) { | 276 | if (np) { |
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c index 9848f9e39853..313fce4f5574 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c | |||
@@ -127,7 +127,7 @@ static void __init mpc85xx_rdb_setup_arch(void) | |||
127 | #if defined(CONFIG_UCC_GETH) || defined(CONFIG_SERIAL_QE) | 127 | #if defined(CONFIG_UCC_GETH) || defined(CONFIG_SERIAL_QE) |
128 | if (machine_is(p1025_rdb)) { | 128 | if (machine_is(p1025_rdb)) { |
129 | 129 | ||
130 | struct ccsr_guts_85xx __iomem *guts; | 130 | struct ccsr_guts __iomem *guts; |
131 | 131 | ||
132 | np = of_find_node_by_name(NULL, "global-utilities"); | 132 | np = of_find_node_by_name(NULL, "global-utilities"); |
133 | if (np) { | 133 | if (np) { |
diff --git a/arch/powerpc/platforms/85xx/p1022_ds.c b/arch/powerpc/platforms/85xx/p1022_ds.c index 0fe88e39945e..e74b7cde9aee 100644 --- a/arch/powerpc/platforms/85xx/p1022_ds.c +++ b/arch/powerpc/platforms/85xx/p1022_ds.c | |||
@@ -150,7 +150,7 @@ static void p1022ds_set_monitor_port(enum fsl_diu_monitor_port port) | |||
150 | { | 150 | { |
151 | struct device_node *guts_node; | 151 | struct device_node *guts_node; |
152 | struct device_node *indirect_node = NULL; | 152 | struct device_node *indirect_node = NULL; |
153 | struct ccsr_guts_85xx __iomem *guts; | 153 | struct ccsr_guts __iomem *guts; |
154 | u8 __iomem *lbc_lcs0_ba = NULL; | 154 | u8 __iomem *lbc_lcs0_ba = NULL; |
155 | u8 __iomem *lbc_lcs1_ba = NULL; | 155 | u8 __iomem *lbc_lcs1_ba = NULL; |
156 | u8 b; | 156 | u8 b; |
@@ -269,7 +269,7 @@ exit: | |||
269 | void p1022ds_set_pixel_clock(unsigned int pixclock) | 269 | void p1022ds_set_pixel_clock(unsigned int pixclock) |
270 | { | 270 | { |
271 | struct device_node *guts_np = NULL; | 271 | struct device_node *guts_np = NULL; |
272 | struct ccsr_guts_85xx __iomem *guts; | 272 | struct ccsr_guts __iomem *guts; |
273 | unsigned long freq; | 273 | unsigned long freq; |
274 | u64 temp; | 274 | u64 temp; |
275 | u32 pxclk; | 275 | u32 pxclk; |
diff --git a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c index bbc615206c67..62cd3c555bfb 100644 --- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c +++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c | |||
@@ -225,7 +225,7 @@ void mpc8610hpcd_set_monitor_port(enum fsl_diu_monitor_port port) | |||
225 | void mpc8610hpcd_set_pixel_clock(unsigned int pixclock) | 225 | void mpc8610hpcd_set_pixel_clock(unsigned int pixclock) |
226 | { | 226 | { |
227 | struct device_node *guts_np = NULL; | 227 | struct device_node *guts_np = NULL; |
228 | struct ccsr_guts_86xx __iomem *guts; | 228 | struct ccsr_guts __iomem *guts; |
229 | unsigned long freq; | 229 | unsigned long freq; |
230 | u64 temp; | 230 | u64 temp; |
231 | u32 pxclk; | 231 | u32 pxclk; |
diff --git a/arch/powerpc/sysdev/qe_lib/qe.c b/arch/powerpc/sysdev/qe_lib/qe.c index ceb09cbd2329..818e763f8265 100644 --- a/arch/powerpc/sysdev/qe_lib/qe.c +++ b/arch/powerpc/sysdev/qe_lib/qe.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2006 Freescale Semicondutor, Inc. All rights reserved. | 2 | * Copyright (C) 2006-2010 Freescale Semicondutor, Inc. All rights reserved. |
3 | * | 3 | * |
4 | * Authors: Shlomi Gridish <gridish@freescale.com> | 4 | * Authors: Shlomi Gridish <gridish@freescale.com> |
5 | * Li Yang <leoli@freescale.com> | 5 | * Li Yang <leoli@freescale.com> |
@@ -266,7 +266,19 @@ EXPORT_SYMBOL(qe_clock_source); | |||
266 | static void qe_snums_init(void) | 266 | static void qe_snums_init(void) |
267 | { | 267 | { |
268 | int i; | 268 | int i; |
269 | static const u8 snum_init[] = { | 269 | static const u8 snum_init_76[] = { |
270 | 0x04, 0x05, 0x0C, 0x0D, 0x14, 0x15, 0x1C, 0x1D, | ||
271 | 0x24, 0x25, 0x2C, 0x2D, 0x34, 0x35, 0x88, 0x89, | ||
272 | 0x98, 0x99, 0xA8, 0xA9, 0xB8, 0xB9, 0xC8, 0xC9, | ||
273 | 0xD8, 0xD9, 0xE8, 0xE9, 0x44, 0x45, 0x4C, 0x4D, | ||
274 | 0x54, 0x55, 0x5C, 0x5D, 0x64, 0x65, 0x6C, 0x6D, | ||
275 | 0x74, 0x75, 0x7C, 0x7D, 0x84, 0x85, 0x8C, 0x8D, | ||
276 | 0x94, 0x95, 0x9C, 0x9D, 0xA4, 0xA5, 0xAC, 0xAD, | ||
277 | 0xB4, 0xB5, 0xBC, 0xBD, 0xC4, 0xC5, 0xCC, 0xCD, | ||
278 | 0xD4, 0xD5, 0xDC, 0xDD, 0xE4, 0xE5, 0xEC, 0xED, | ||
279 | 0xF4, 0xF5, 0xFC, 0xFD, | ||
280 | }; | ||
281 | static const u8 snum_init_46[] = { | ||
270 | 0x04, 0x05, 0x0C, 0x0D, 0x14, 0x15, 0x1C, 0x1D, | 282 | 0x04, 0x05, 0x0C, 0x0D, 0x14, 0x15, 0x1C, 0x1D, |
271 | 0x24, 0x25, 0x2C, 0x2D, 0x34, 0x35, 0x88, 0x89, | 283 | 0x24, 0x25, 0x2C, 0x2D, 0x34, 0x35, 0x88, 0x89, |
272 | 0x98, 0x99, 0xA8, 0xA9, 0xB8, 0xB9, 0xC8, 0xC9, | 284 | 0x98, 0x99, 0xA8, 0xA9, 0xB8, 0xB9, 0xC8, 0xC9, |
@@ -274,9 +286,15 @@ static void qe_snums_init(void) | |||
274 | 0x28, 0x29, 0x38, 0x39, 0x48, 0x49, 0x58, 0x59, | 286 | 0x28, 0x29, 0x38, 0x39, 0x48, 0x49, 0x58, 0x59, |
275 | 0x68, 0x69, 0x78, 0x79, 0x80, 0x81, | 287 | 0x68, 0x69, 0x78, 0x79, 0x80, 0x81, |
276 | }; | 288 | }; |
289 | static const u8 *snum_init; | ||
277 | 290 | ||
278 | qe_num_of_snum = qe_get_num_of_snums(); | 291 | qe_num_of_snum = qe_get_num_of_snums(); |
279 | 292 | ||
293 | if (qe_num_of_snum == 76) | ||
294 | snum_init = snum_init_76; | ||
295 | else | ||
296 | snum_init = snum_init_46; | ||
297 | |||
280 | for (i = 0; i < qe_num_of_snum; i++) { | 298 | for (i = 0; i < qe_num_of_snum; i++) { |
281 | snums[i].num = snum_init[i]; | 299 | snums[i].num = snum_init[i]; |
282 | snums[i].state = QE_SNUM_STATE_FREE; | 300 | snums[i].state = QE_SNUM_STATE_FREE; |