← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno
  • Date: 2011-06-07 12:14:05 UTC
  • mfrom: (43.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20110607121405-i3h1rd7nrnd2b73h
Tags: 2.6.39-2
http://bugs.debian.org/627492
http://bugs.debian.org/596626
http://bugs.debian.org/628932
http://bugs.debian.org/628191
http://bugs.debian.org/627837
http://bugs.debian.org/622997
http://bugs.debian.org/622745
http://bugs.debian.org/619827
http://bugs.debian.org/629401
[ Ben Hutchings ]
* [x86] Enable BACKLIGHT_APPLE, replacing BACKLIGHT_MBP_NVIDIA
  (Closes: #627492)
* cgroups: Disable memory resource controller by default. Allow it
  to be enabled using kernel parameter 'cgroup_enable=memory'.
* rt2800usb: Enable support for more USB devices including
  Linksys WUSB600N (Closes: #596626) (this change was accidentally
  omitted from 2.6.39-1)
* [x86] Remove Celeron from list of processors supporting PAE. Most
  'Celeron M' models do not.
* Update debconf template translations:
  - Swedish (Martin Bagge) (Closes: #628932)
  - French (David Prévot) (Closes: #628191)
* aufs: Update for 2.6.39 (Closes: #627837)
* Add stable 2.6.39.1, including:
  - ext4: dont set PageUptodate in ext4_end_bio()
  - pata_cmd64x: fix boot crash on parisc (Closes: #622997, #622745)
  - ext3: Fix fs corruption when make_indexed_dir() fails
  - netfilter: nf_ct_sip: validate Content-Length in TCP SIP messages
  - sctp: fix race between sctp_bind_addr_free() and
    sctp_bind_addr_conflict()
  - sctp: fix memory leak of the ASCONF queue when free asoc
  - md/bitmap: fix saving of events_cleared and other state
  - cdc_acm: Fix oops when Droids MuIn LCD is connected
  - cx88: Fix conversion from BKL to fine-grained locks (Closes: #619827)
  - keys: Set cred->user_ns in key_replace_session_keyring (CVE-2011-2184)
  - tmpfs: fix race between truncate and writepage
  - nfs41: Correct offset for LAYOUTCOMMIT
  - xen/mmu: fix a race window causing leave_mm BUG()
  - ext4: fix possible use-after-free in ext4_remove_li_request()
  For the complete list of changes, see:
   http://www.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.39.1
* Bump ABI to 2
* netfilter: Enable IP_SET, IP_SET_BITMAP_IP, IP_SET_BITMAP_IPMAC,
  IP_SET_BITMAP_PORT, IP_SET_HASH_IP, IP_SET_HASH_IPPORT,
  IP_SET_HASH_IPPORTIP, IP_SET_HASH_IPPORTNET, IP_SET_HASH_NET,
  IP_SET_HASH_NETPORT, IP_SET_LIST_SET, NETFILTER_XT_SET as modules
  (Closes: #629401)

[ Aurelien Jarno ]
* [mipsel/loongson-2f] Disable_SCSI_LPFC to workaround GCC ICE.

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/powerpc/boot/dts/canyonlands.dts
172
172
                        interrupts = <0x1e 4>;
173
173
                };
174
174
 
 
175
                USBOTG0: usbotg@bff80000 {
 
176
                        compatible = "amcc,dwc-otg";
 
177
                        reg = <0x4 0xbff80000 0x10000>;
 
178
                        interrupt-parent = <&USBOTG0>;
 
179
                        #interrupt-cells = <1>;
 
180
                        #address-cells = <0>;
 
181
                        #size-cells = <0>;
 
182
                        interrupts = <0x0 0x1 0x2>;
 
183
                        interrupt-map = </* USB-OTG */ 0x0 &UIC2 0x1c 0x4
 
184
                                         /* HIGH-POWER */ 0x1 &UIC1 0x1a 0x8
 
185
                                         /* DMA */ 0x2 &UIC0 0xc 0x4>;
 
186
                };
 
187
 
175
188
                SATA0: sata@bffd1000 {
176
189
                        compatible = "amcc,sata-460ex";
177
190
                        reg = <4 0xbffd1000 0x800 4 0xbffd0800 0x400>;
233
246
                                        };
234
247
                                };
235
248
 
 
249
                                cpld@2,0 {
 
250
                                        compatible = "amcc,ppc460ex-bcsr";
 
251
                                        reg = <2 0x0 0x9>;
 
252
                                };
 
253
 
236
254
                                ndfc@3,0 {
237
255
                                        compatible = "ibm,ndfc";
238
256
                                        reg = <0x00000003 0x00000000 0x00002000>;
307
325
                                interrupts = <0x3 0x4>;
308
326
                        };
309
327
 
 
328
                        GPIO0: gpio@ef600b00 {
 
329
                                compatible = "ibm,ppc4xx-gpio";
 
330
                                reg = <0xef600b00 0x00000048>;
 
331
                                gpio-controller;
 
332
                        };
 
333
 
310
334
                        ZMII0: emac-zmii@ef600d00 {
311
335
                                compatible = "ibm,zmii-460ex", "ibm,zmii";
312
336
                                reg = <0xef600d00 0x0000000c>;