Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-19 02:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'jwb/next' into next

Browse Source
This commit is contained in:
Benjamin Herrenschmidt 2011-06-29 12:45:43 +10:00
commit 3c350a1a55
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/boot/dts/canyonlands.dts
View File

@ -143,6 +143,11 @@
interrupts = <0x1d 0x4>;
};
HWRNG: hwrng@110000 {
compatible = "amcc,ppc460ex-rng", "ppc4xx-rng";
reg = <4 0x00110000 0x50>;
};
MAL0: mcmal {
compatible = "ibm,mcmal-460ex", "ibm,mcmal2";
dcr-reg = <0x180 0x062>;

8
arch/powerpc/boot/dts/glacier.dts
View File

@ -130,12 +130,18 @@
};
CRYPTO: crypto@180000 {
compatible = "amcc,ppc460gt-crypto", "amcc,ppc4xx-crypto";
compatible = "amcc,ppc460gt-crypto", "amcc,ppc460ex-crypto",
"amcc,ppc4xx-crypto";
reg = <4 0x00180000 0x80400>;
interrupt-parent = <&UIC0>;
interrupts = <0x1d 0x4>;
};
HWRNG: hwrng@110000 {
compatible = "amcc,ppc460ex-rng", "ppc4xx-rng";
reg = <4 0x00110000 0x50>;
};
MAL0: mcmal {
compatible = "ibm,mcmal-460gt", "ibm,mcmal2";
dcr-reg = <0x180 0x062>;

12
arch/powerpc/boot/dts/sequoia.dts
View File

@ -110,6 +110,18 @@
dcr-reg = <0x010 0x002>;
};
CRYPTO: crypto@e0100000 {
compatible = "amcc,ppc440epx-crypto","amcc,ppc4xx-crypto";
reg = <0 0xE0100000 0x80400>;
interrupt-parent = <&UIC0>;
interrupts = <0x17 0x4>;
};
rng@e0120000 {
compatible = "amcc,ppc440epx-rng","amcc,ppc4xx-rng";
reg = <0 0xE0120000 0x150>;
};
DMA0: dma {
compatible = "ibm,dma-440epx", "ibm,dma-4xx";
dcr-reg = <0x100 0x027>;