hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'jwb/next' into merge

This commit is contained in:
Benjamin Herrenschmidt 2009-12-21 09:30:45 +11:00
parent 2593f939a5 a18cb387e5
commit 8beac08ee9
2 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
arch/powerpc/boot/dts/katmai.dts
View File

@ -108,12 +108,19 @@
dcr-reg = <0x00c 0x002>; dcr-reg = <0x00c 0x002>;
}; };
MQ0: mq {
compatible = "ibm,mq-440spe";
dcr-reg = <0x040 0x020>;
};
plb { plb {
compatible = "ibm,plb-440spe", "ibm,plb-440gp", "ibm,plb4"; compatible = "ibm,plb-440spe", "ibm,plb-440gp", "ibm,plb4";
#address-cells = <2>; #address-cells = <2>;
#size-cells = <1>; #size-cells = <1>;
/* addr-child addr-parent size */ /* addr-child addr-parent size */
ranges = <0x4 0xe0000000 0x4 0xe0000000 0x20000000 ranges = <0x4 0x00100000 0x4 0x00100000 0x00001000
0x4 0x00200000 0x4 0x00200000 0x00000400
0x4 0xe0000000 0x4 0xe0000000 0x20000000
0xc 0x00000000 0xc 0x00000000 0x20000000 0xc 0x00000000 0xc 0x00000000 0x20000000
0xd 0x00000000 0xd 0x00000000 0x80000000 0xd 0x00000000 0xd 0x00000000 0x80000000
0xd 0x80000000 0xd 0x80000000 0x80000000 0xd 0x80000000 0xd 0x80000000 0x80000000
@ -400,6 +407,49 @@
0x0 0x0 0x0 0x3 &UIC3 0xa 0x4 /* swizzled int C */ 0x0 0x0 0x0 0x3 &UIC3 0xa 0x4 /* swizzled int C */
0x0 0x0 0x0 0x4 &UIC3 0xb 0x4 /* swizzled int D */>; 0x0 0x0 0x0 0x4 &UIC3 0xb 0x4 /* swizzled int D */>;
}; };
I2O: i2o@400100000 {
compatible = "ibm,i2o-440spe";
reg = <0x00000004 0x00100000 0x100>;
dcr-reg = <0x060 0x020>;
};
DMA0: dma0@400100100 {
compatible = "ibm,dma-440spe";
cell-index = <0>;
reg = <0x00000004 0x00100100 0x100>;
dcr-reg = <0x060 0x020>;
interrupt-parent = <&DMA0>;
interrupts = <0 1>;
#interrupt-cells = <1>;
#address-cells = <0>;
#size-cells = <0>;
interrupt-map = <
0 &UIC0 0x14 4
1 &UIC1 0x16 4>;
};
DMA1: dma1@400100200 {
compatible = "ibm,dma-440spe";
cell-index = <1>;
reg = <0x00000004 0x00100200 0x100>;
dcr-reg = <0x060 0x020>;
interrupt-parent = <&DMA1>;
interrupts = <0 1>;
#interrupt-cells = <1>;
#address-cells = <0>;
#size-cells = <0>;
interrupt-map = <
0 &UIC0 0x16 4
1 &UIC1 0x16 4>;
};
xor-accel@400200000 {
compatible = "amcc,xor-accelerator";
reg = <0x00000004 0x00200000 0x400>;
interrupt-parent = <&UIC1>;
interrupts = <0x1f 4>;
};
}; };
chosen { chosen {

2
arch/powerpc/boot/dts/warp.dts
View File

@ -146,7 +146,7 @@
fpga@2,4000 { fpga@2,4000 {
compatible = "pika,fpga-sd"; compatible = "pika,fpga-sd";
reg = <0x00000002 0x00004000 0x00000A00>; reg = <0x00000002 0x00004000 0x00004000>;
}; };
nor@0,0 { nor@0,0 {