← Back to branch summary

~ubuntu-branches/ubuntu/karmic/linux-ports/karmic

« back to all changes in this revision

Viewing changes to arch/powerpc/boot/dts/mpc8560ads.dts

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich, Luke Yelavich, Michael Casadevall, Tim Gardner, Upstream Kernel Changes
  • Date: 2009-05-06 18:18:55 UTC
  • Revision ID: james.westby@ubuntu.com-20090506181855-t00baeevpnvd9o7a
Tags: 2.6.30-1.1
[ Luke Yelavich ]
* initial release for karmic
* SAUCE: rebase-ports - adjust for the karmic ports kernel
* SAUCE: rebase-ports - also remove abi dirs/files on rebase
* Update configs after rebase against mainline Jaunty tree
* [Config] Disable CONFIG_BLK_DEV_UB and CONFIG_USB_LIBUSUAL as per
  mainline jaunty
* forward-port patch to drbd for powerpc compilation
* [Config] disable CONFIG_LENOVO_SL_LAPTOP for i386 due to FTBFS
* add .o files found in arch/powerpc/lib to all powerpc kernel header
  packages
* [Config] enable CONFIG_DRM_I915_KMS for i386 as per karmic mainline

[ Michael Casadevall ]

* Disable kgdb on sparc64
* [sparc] [Config] Disable GPIO LEDS
* [ia64] Rename -ia64-generic to -ia64 in line with other architectures
* Correct kernel image path for sparc builds
* [hppa] Fix HPPA config files to build modules for all udebian

Rebase on top of karmic mainline 2.6.30-1.1

[ Tim Gardner ]

* [Config] armel: disable staging drivers, fixes FTBS
* [Config] armel imx51: Disable CONFIG_MTD_NAND_MXC, fixes FTBS

[ Upstream Kernel Changes ]

* mpt2sas: Change reset_type enum to avoid namespace collision.
  Submitted upstream.

* Initial release after rebasing against v2.6.30-rc3

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/powerpc/boot/dts/mpc8560ads.dts
115
115
                        };
116
116
                };
117
117
 
118
 
                mdio@24520 {
119
 
                        #address-cells = <1>;
120
 
                        #size-cells = <0>;
121
 
                        compatible = "fsl,gianfar-mdio";
122
 
                        reg = <0x24520 0x20>;
123
 
 
124
 
                        phy0: ethernet-phy@0 {
125
 
                                interrupt-parent = <&mpic>;
126
 
                                interrupts = <5 1>;
127
 
                                reg = <0x0>;
128
 
                                device_type = "ethernet-phy";
129
 
                        };
130
 
                        phy1: ethernet-phy@1 {
131
 
                                interrupt-parent = <&mpic>;
132
 
                                interrupts = <5 1>;
133
 
                                reg = <0x1>;
134
 
                                device_type = "ethernet-phy";
135
 
                        };
136
 
                        phy2: ethernet-phy@2 {
137
 
                                interrupt-parent = <&mpic>;
138
 
                                interrupts = <7 1>;
139
 
                                reg = <0x2>;
140
 
                                device_type = "ethernet-phy";
141
 
                        };
142
 
                        phy3: ethernet-phy@3 {
143
 
                                interrupt-parent = <&mpic>;
144
 
                                interrupts = <7 1>;
145
 
                                reg = <0x3>;
146
 
                                device_type = "ethernet-phy";
147
 
                        };
148
 
                };
149
 
 
150
118
                enet0: ethernet@24000 {
 
119
                        #address-cells = <1>;
 
120
                        #size-cells = <1>;
151
121
                        cell-index = <0>;
152
122
                        device_type = "network";
153
123
                        model = "TSEC";
154
124
                        compatible = "gianfar";
155
125
                        reg = <0x24000 0x1000>;
 
126
                        ranges = <0x0 0x24000 0x1000>;
156
127
                        local-mac-address = [ 00 00 00 00 00 00 ];
157
128
                        interrupts = <29 2 30 2 34 2>;
158
129
                        interrupt-parent = <&mpic>;
 
130
                        tbi-handle = <&tbi0>;
159
131
                        phy-handle = <&phy0>;
 
132
 
 
133
                        mdio@520 {
 
134
                                #address-cells = <1>;
 
135
                                #size-cells = <0>;
 
136
                                compatible = "fsl,gianfar-mdio";
 
137
                                reg = <0x520 0x20>;
 
138
 
 
139
                                phy0: ethernet-phy@0 {
 
140
                                        interrupt-parent = <&mpic>;
 
141
                                        interrupts = <5 1>;
 
142
                                        reg = <0x0>;
 
143
                                        device_type = "ethernet-phy";
 
144
                                };
 
145
                                phy1: ethernet-phy@1 {
 
146
                                        interrupt-parent = <&mpic>;
 
147
                                        interrupts = <5 1>;
 
148
                                        reg = <0x1>;
 
149
                                        device_type = "ethernet-phy";
 
150
                                };
 
151
                                phy2: ethernet-phy@2 {
 
152
                                        interrupt-parent = <&mpic>;
 
153
                                        interrupts = <7 1>;
 
154
                                        reg = <0x2>;
 
155
                                        device_type = "ethernet-phy";
 
156
                                };
 
157
                                phy3: ethernet-phy@3 {
 
158
                                        interrupt-parent = <&mpic>;
 
159
                                        interrupts = <7 1>;
 
160
                                        reg = <0x3>;
 
161
                                        device_type = "ethernet-phy";
 
162
                                };
 
163
                                tbi0: tbi-phy@11 {
 
164
                                        reg = <0x11>;
 
165
                                        device_type = "tbi-phy";
 
166
                                };
 
167
                        };
160
168
                };
161
169
 
162
170
                enet1: ethernet@25000 {
 
171
                        #address-cells = <1>;
 
172
                        #size-cells = <1>;
163
173
                        cell-index = <1>;
164
174
                        device_type = "network";
165
175
                        model = "TSEC";
166
176
                        compatible = "gianfar";
167
177
                        reg = <0x25000 0x1000>;
 
178
                        ranges = <0x0 0x25000 0x1000>;
168
179
                        local-mac-address = [ 00 00 00 00 00 00 ];
169
180
                        interrupts = <35 2 36 2 40 2>;
170
181
                        interrupt-parent = <&mpic>;
 
182
                        tbi-handle = <&tbi1>;
171
183
                        phy-handle = <&phy1>;
 
184
 
 
185
                        mdio@520 {
 
186
                                #address-cells = <1>;
 
187
                                #size-cells = <0>;
 
188
                                compatible = "fsl,gianfar-tbi";
 
189
                                reg = <0x520 0x20>;
 
190
 
 
191
                                tbi1: tbi-phy@11 {
 
192
                                        reg = <0x11>;
 
193
                                        device_type = "tbi-phy";
 
194
                                };
 
195
                        };
172
196
                };
173
197
 
174
198
                mpic: pic@40000 {