git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
arch
/
powerpc
/
boot
/
dts
/
ebony.dts
diff --git
a/arch/powerpc/boot/dts/ebony.dts
b/arch/powerpc/boot/dts/ebony.dts
index
0b000cb
..
ec2d142
100644
(file)
--- a/
arch/powerpc/boot/dts/ebony.dts
+++ b/
arch/powerpc/boot/dts/ebony.dts
@@
-11,12
+11,14
@@
* any warranty of any kind, whether express or implied.
*/
* any warranty of any kind, whether express or implied.
*/
+/dts-v1/;
+
/ {
#address-cells = <2>;
#size-cells = <1>;
model = "ibm,ebony";
compatible = "ibm,ebony";
/ {
#address-cells = <2>;
#size-cells = <1>;
model = "ibm,ebony";
compatible = "ibm,ebony";
- dcr-parent = <&
/cpus/cpu@0
>;
+ dcr-parent = <&
{/cpus/cpu@0}
>;
aliases {
ethernet0 = &EMAC0;
aliases {
ethernet0 = &EMAC0;
@@
-32,13
+34,13
@@
cpu@0 {
device_type = "cpu";
model = "PowerPC,440GP";
cpu@0 {
device_type = "cpu";
model = "PowerPC,440GP";
- reg = <0>;
+ reg = <0
x00000000
>;
clock-frequency = <0>; // Filled in by zImage
timebase-frequency = <0>; // Filled in by zImage
clock-frequency = <0>; // Filled in by zImage
timebase-frequency = <0>; // Filled in by zImage
- i-cache-line-size = <
20
>;
- d-cache-line-size = <
20
>;
- i-cache-size = <
8000
>; /* 32 kB */
- d-cache-size = <
8000
>; /* 32 kB */
+ i-cache-line-size = <
32
>;
+ d-cache-line-size = <
32
>;
+ i-cache-size = <
32768
>; /* 32 kB */
+ d-cache-size = <
32768
>; /* 32 kB */
dcr-controller;
dcr-access-method = "native";
};
dcr-controller;
dcr-access-method = "native";
};
@@
-46,14
+48,14
@@
memory {
device_type = "memory";
memory {
device_type = "memory";
- reg = <0
0
0>; // Filled in by zImage
+ reg = <0
x00000000 0x00000000 0x0000000
0>; // Filled in by zImage
};
UIC0: interrupt-controller0 {
compatible = "ibm,uic-440gp", "ibm,uic";
interrupt-controller;
cell-index = <0>;
};
UIC0: interrupt-controller0 {
compatible = "ibm,uic-440gp", "ibm,uic";
interrupt-controller;
cell-index = <0>;
- dcr-reg = <0
c0
009>;
+ dcr-reg = <0
x0c0 0x
009>;
#address-cells = <0>;
#size-cells = <0>;
#interrupt-cells = <2>;
#address-cells = <0>;
#size-cells = <0>;
#interrupt-cells = <2>;
@@
-64,17
+66,17
@@
compatible = "ibm,uic-440gp", "ibm,uic";
interrupt-controller;
cell-index = <1>;
compatible = "ibm,uic-440gp", "ibm,uic";
interrupt-controller;
cell-index = <1>;
- dcr-reg = <0
d0
009>;
+ dcr-reg = <0
x0d0 0x
009>;
#address-cells = <0>;
#size-cells = <0>;
#interrupt-cells = <2>;
#address-cells = <0>;
#size-cells = <0>;
#interrupt-cells = <2>;
- interrupts = <
1e 4 1f
4>; /* cascade */
+ interrupts = <
0x1e 0x4 0x1f 0x
4>; /* cascade */
interrupt-parent = <&UIC0>;
};
CPC0: cpc {
compatible = "ibm,cpc-440gp";
interrupt-parent = <&UIC0>;
};
CPC0: cpc {
compatible = "ibm,cpc-440gp";
- dcr-reg = <0
b0 003 0e0
010>;
+ dcr-reg = <0
x0b0 0x003 0x0e0 0x
010>;
// FIXME: anything else?
};
// FIXME: anything else?
};
@@
-87,37
+89,37
@@
SDRAM0: memory-controller {
compatible = "ibm,sdram-440gp";
SDRAM0: memory-controller {
compatible = "ibm,sdram-440gp";
- dcr-reg = <0
10
2>;
+ dcr-reg = <0
x010 0x00
2>;
// FIXME: anything else?
};
SRAM0: sram {
compatible = "ibm,sram-440gp";
// FIXME: anything else?
};
SRAM0: sram {
compatible = "ibm,sram-440gp";
- dcr-reg = <0
20 8 00a
1>;
+ dcr-reg = <0
x020 0x008 0x00a 0x00
1>;
};
DMA0: dma {
// FIXME: ???
compatible = "ibm,dma-440gp";
};
DMA0: dma {
// FIXME: ???
compatible = "ibm,dma-440gp";
- dcr-reg = <
100
027>;
+ dcr-reg = <
0x100 0x
027>;
};
MAL0: mcmal {
compatible = "ibm,mcmal-440gp", "ibm,mcmal";
};
MAL0: mcmal {
compatible = "ibm,mcmal-440gp", "ibm,mcmal";
- dcr-reg = <
180
62>;
+ dcr-reg = <
0x180 0x0
62>;
num-tx-chans = <4>;
num-rx-chans = <4>;
interrupt-parent = <&MAL0>;
num-tx-chans = <4>;
num-rx-chans = <4>;
interrupt-parent = <&MAL0>;
- interrupts = <0
1 2 3
4>;
+ interrupts = <0
x0 0x1 0x2 0x3 0x
4>;
#interrupt-cells = <1>;
#address-cells = <0>;
#size-cells = <0>;
#interrupt-cells = <1>;
#address-cells = <0>;
#size-cells = <0>;
- interrupt-map = </*TXEOB*/ 0
&UIC0 a
4
- /*RXEOB*/
1 &UIC0 b
4
- /*SERR*/
2 &UIC1 0
4
- /*TXDE*/
3 &UIC1 1
4
- /*RXDE*/
4 &UIC1 2
4>;
- interrupt-map-mask = <ffffffff>;
+ interrupt-map = </*TXEOB*/ 0
x0 &UIC0 0xa 0x
4
+ /*RXEOB*/
0x1 &UIC0 0xb 0x
4
+ /*SERR*/
0x2 &UIC1 0x0 0x
4
+ /*TXDE*/
0x3 &UIC1 0x1 0x
4
+ /*RXDE*/
0x4 &UIC1 0x2 0x
4>;
+ interrupt-map-mask = <
0x
ffffffff>;
};
POB0: opb {
};
POB0: opb {
@@
-126,34
+128,34
@@
#size-cells = <1>;
/* Wish there was a nicer way of specifying a full 32-bit
range */
#size-cells = <1>;
/* Wish there was a nicer way of specifying a full 32-bit
range */
- ranges = <0
0000000 1 00000000
80000000
-
80000000 1 80000000
80000000>;
- dcr-reg = <0
90
00b>;
+ ranges = <0
x00000000 0x00000001 0x00000000 0x
80000000
+
0x80000000 0x00000001 0x80000000 0x
80000000>;
+ dcr-reg = <0
x090 0x
00b>;
interrupt-parent = <&UIC1>;
interrupt-parent = <&UIC1>;
- interrupts = <
7
4>;
+ interrupts = <
0x7 0x
4>;
clock-frequency = <0>; // Filled in by zImage
EBC0: ebc {
compatible = "ibm,ebc-440gp", "ibm,ebc";
clock-frequency = <0>; // Filled in by zImage
EBC0: ebc {
compatible = "ibm,ebc-440gp", "ibm,ebc";
- dcr-reg = <0
12
2>;
+ dcr-reg = <0
x012 0x00
2>;
#address-cells = <2>;
#size-cells = <1>;
clock-frequency = <0>; // Filled in by zImage
// ranges property is supplied by zImage
// based on firmware's configuration of the
// EBC bridge
#address-cells = <2>;
#size-cells = <1>;
clock-frequency = <0>; // Filled in by zImage
// ranges property is supplied by zImage
// based on firmware's configuration of the
// EBC bridge
- interrupts = <
5
4>;
+ interrupts = <
0x5 0x
4>;
interrupt-parent = <&UIC1>;
small-flash@0,80000 {
compatible = "jedec-flash";
bank-width = <1>;
interrupt-parent = <&UIC1>;
small-flash@0,80000 {
compatible = "jedec-flash";
bank-width = <1>;
- reg = <0
80000
80000>;
+ reg = <0
x00000000 0x00080000 0x000
80000>;
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "OpenBIOS";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "OpenBIOS";
- reg = <0
80000>;
+ reg = <0
x00000000 0x000
80000>;
read-only;
};
};
read-only;
};
};
@@
-161,122
+163,120
@@
nvram@1,0 {
/* NVRAM & RTC */
compatible = "ds1743-nvram";
nvram@1,0 {
/* NVRAM & RTC */
compatible = "ds1743-nvram";
- #bytes = <2000>;
- reg = <
1 0
2000>;
+ #bytes = <
0x
2000>;
+ reg = <
0x00000001 0x00000000 0x0000
2000>;
};
large-flash@2,0 {
compatible = "jedec-flash";
bank-width = <1>;
};
large-flash@2,0 {
compatible = "jedec-flash";
bank-width = <1>;
- reg = <
2 0
400000>;
+ reg = <
0x00000002 0x00000000 0x00
400000>;
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "fs";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "fs";
- reg = <0
380000>;
+ reg = <0
x00000000 0x00
380000>;
};
partition@380000 {
label = "firmware";
};
partition@380000 {
label = "firmware";
- reg = <
380000
80000>;
+ reg = <
0x00380000 0x000
80000>;
};
};
ir@3,0 {
};
};
ir@3,0 {
- reg = <
3 0
10>;
+ reg = <
0x00000003 0x00000000 0x000000
10>;
};
fpga@7,0 {
compatible = "Ebony-FPGA";
};
fpga@7,0 {
compatible = "Ebony-FPGA";
- reg = <
7 0
10>;
- virtual-reg = <e8300000>;
+ reg = <
0x00000007 0x00000000 0x000000
10>;
+ virtual-reg = <
0x
e8300000>;
};
};
UART0: serial@40000200 {
device_type = "serial";
compatible = "ns16550";
};
};
UART0: serial@40000200 {
device_type = "serial";
compatible = "ns16550";
- reg = <
40000200
8>;
- virtual-reg = <e0000200>;
- clock-frequency = <
A8C0
00>;
- current-speed = <
258
0>;
+ reg = <
0x40000200 0x0000000
8>;
+ virtual-reg = <
0x
e0000200>;
+ clock-frequency = <
110592
00>;
+ current-speed = <
960
0>;
interrupt-parent = <&UIC0>;
interrupt-parent = <&UIC0>;
- interrupts = <0
4>;
+ interrupts = <0
x0 0x
4>;
};
UART1: serial@40000300 {
device_type = "serial";
compatible = "ns16550";
};
UART1: serial@40000300 {
device_type = "serial";
compatible = "ns16550";
- reg = <
40000300
8>;
- virtual-reg = <e0000300>;
- clock-frequency = <
A8C0
00>;
- current-speed = <
258
0>;
+ reg = <
0x40000300 0x0000000
8>;
+ virtual-reg = <
0x
e0000300>;
+ clock-frequency = <
110592
00>;
+ current-speed = <
960
0>;
interrupt-parent = <&UIC0>;
interrupt-parent = <&UIC0>;
- interrupts = <
1
4>;
+ interrupts = <
0x1 0x
4>;
};
IIC0: i2c@40000400 {
/* FIXME */
compatible = "ibm,iic-440gp", "ibm,iic";
};
IIC0: i2c@40000400 {
/* FIXME */
compatible = "ibm,iic-440gp", "ibm,iic";
- reg = <
40000400
14>;
+ reg = <
0x40000400 0x000000
14>;
interrupt-parent = <&UIC0>;
interrupt-parent = <&UIC0>;
- interrupts = <
2
4>;
+ interrupts = <
0x2 0x
4>;
};
IIC1: i2c@40000500 {
/* FIXME */
compatible = "ibm,iic-440gp", "ibm,iic";
};
IIC1: i2c@40000500 {
/* FIXME */
compatible = "ibm,iic-440gp", "ibm,iic";
- reg = <
40000500
14>;
+ reg = <
0x40000500 0x000000
14>;
interrupt-parent = <&UIC0>;
interrupt-parent = <&UIC0>;
- interrupts = <
3
4>;
+ interrupts = <
0x3 0x
4>;
};
GPIO0: gpio@40000700 {
/* FIXME */
compatible = "ibm,gpio-440gp";
};
GPIO0: gpio@40000700 {
/* FIXME */
compatible = "ibm,gpio-440gp";
- reg = <
40000700
20>;
+ reg = <
0x40000700 0x000000
20>;
};
ZMII0: emac-zmii@40000780 {
compatible = "ibm,zmii-440gp", "ibm,zmii";
};
ZMII0: emac-zmii@40000780 {
compatible = "ibm,zmii-440gp", "ibm,zmii";
- reg = <
40000780
c>;
+ reg = <
0x40000780 0x0000000
c>;
};
EMAC0: ethernet@40000800 {
};
EMAC0: ethernet@40000800 {
- linux,network-index = <0>;
device_type = "network";
compatible = "ibm,emac-440gp", "ibm,emac";
interrupt-parent = <&UIC1>;
device_type = "network";
compatible = "ibm,emac-440gp", "ibm,emac";
interrupt-parent = <&UIC1>;
- interrupts = <
1c 4 1d
4>;
- reg = <
40000800
70>;
+ interrupts = <
0x1c 0x4 0x1d 0x
4>;
+ reg = <
0x40000800 0x000000
70>;
local-mac-address = [000000000000]; // Filled in by zImage
mal-device = <&MAL0>;
mal-tx-channel = <0 1>;
mal-rx-channel = <0>;
cell-index = <0>;
local-mac-address = [000000000000]; // Filled in by zImage
mal-device = <&MAL0>;
mal-tx-channel = <0 1>;
mal-rx-channel = <0>;
cell-index = <0>;
- max-frame-size = <
5dc
>;
- rx-fifo-size = <
1000
>;
- tx-fifo-size = <
800
>;
+ max-frame-size = <
1500
>;
+ rx-fifo-size = <
4096
>;
+ tx-fifo-size = <
2048
>;
phy-mode = "rmii";
phy-mode = "rmii";
- phy-map = <00000001>;
+ phy-map = <0
x0
0000001>;
zmii-device = <&ZMII0>;
zmii-channel = <0>;
};
EMAC1: ethernet@40000900 {
zmii-device = <&ZMII0>;
zmii-channel = <0>;
};
EMAC1: ethernet@40000900 {
- linux,network-index = <1>;
device_type = "network";
compatible = "ibm,emac-440gp", "ibm,emac";
interrupt-parent = <&UIC1>;
device_type = "network";
compatible = "ibm,emac-440gp", "ibm,emac";
interrupt-parent = <&UIC1>;
- interrupts = <
1e 4 1f
4>;
- reg = <
40000900
70>;
+ interrupts = <
0x1e 0x4 0x1f 0x
4>;
+ reg = <
0x40000900 0x000000
70>;
local-mac-address = [000000000000]; // Filled in by zImage
mal-device = <&MAL0>;
mal-tx-channel = <2 3>;
mal-rx-channel = <1>;
cell-index = <1>;
local-mac-address = [000000000000]; // Filled in by zImage
mal-device = <&MAL0>;
mal-tx-channel = <2 3>;
mal-rx-channel = <1>;
cell-index = <1>;
- max-frame-size = <
5dc
>;
- rx-fifo-size = <
1000
>;
- tx-fifo-size = <
800
>;
+ max-frame-size = <
1500
>;
+ rx-fifo-size = <
4096
>;
+ tx-fifo-size = <
2048
>;
phy-mode = "rmii";
phy-mode = "rmii";
- phy-map = <00000001>;
+ phy-map = <0
x0
0000001>;
zmii-device = <&ZMII0>;
zmii-channel = <1>;
};
zmii-device = <&ZMII0>;
zmii-channel = <1>;
};
@@
-284,9
+284,9
@@
GPT0: gpt@40000a00 {
/* FIXME */
GPT0: gpt@40000a00 {
/* FIXME */
- reg = <
40000a00
d4>;
+ reg = <
0x40000a00 0x000000
d4>;
interrupt-parent = <&UIC0>;
interrupt-parent = <&UIC0>;
- interrupts = <
12 4 13 4 14 4 15 4 16
4>;
+ interrupts = <
0x12 0x4 0x13 0x4 0x14 0x4 0x15 0x4 0x16 0x
4>;
};
};
};
};
@@
-298,35
+298,35
@@
#address-cells = <3>;
compatible = "ibm,plb440gp-pcix", "ibm,plb-pcix";
primary;
#address-cells = <3>;
compatible = "ibm,plb440gp-pcix", "ibm,plb-pcix";
primary;
- reg = <
2 0ec00000 8
/* Config space access */
- 0
0 0
/* no IACK cycles */
-
2 0ed00000
4 /* Special cycles */
-
2 0ec80000 f0
/* Internal registers */
-
2 0ec80100 fc>;
/* Internal messaging registers */
+ reg = <
0x00000002 0x0ec00000 0x00000008
/* Config space access */
+ 0
x00000000 0x00000000 0x00000000
/* no IACK cycles */
+
0x00000002 0x0ed00000 0x0000000
4 /* Special cycles */
+
0x00000002 0x0ec80000 0x000000f0
/* Internal registers */
+
0x00000002 0x0ec80100 0x000000fc>;
/* Internal messaging registers */
/* Outbound ranges, one memory and one IO,
* later cannot be changed
*/
/* Outbound ranges, one memory and one IO,
* later cannot be changed
*/
- ranges = <0
2000000 0 80000000 00000003 80000000 0
80000000
- 0
1000000 0 00000000 00000002 08000000 0
00010000>;
+ ranges = <0
x02000000 0x00000000 0x80000000 0x00000003 0x80000000 0x00000000 0x
80000000
+ 0
x01000000 0x00000000 0x00000000 0x00000002 0x08000000 0x00000000 0x
00010000>;
/* Inbound 2GB range starting at 0 */
/* Inbound 2GB range starting at 0 */
- dma-ranges = <
42000000 0 0 0 0 0
80000000>;
+ dma-ranges = <
0x42000000 0x0 0x0 0x0 0x0 0x0 0x
80000000>;
/* Ebony has all 4 IRQ pins tied together per slot */
/* Ebony has all 4 IRQ pins tied together per slot */
- interrupt-map-mask = <
f800 0 0
0>;
+ interrupt-map-mask = <
0xf800 0x0 0x0 0x
0>;
interrupt-map = <
/* IDSEL 1 */
interrupt-map = <
/* IDSEL 1 */
- 0
800 0 0 0 &UIC0 17
8
+ 0
x800 0x0 0x0 0x0 &UIC0 0x17 0x
8
/* IDSEL 2 */
/* IDSEL 2 */
-
1000 0 0 0 &UIC0 18
8
+
0x1000 0x0 0x0 0x0 &UIC0 0x18 0x
8
/* IDSEL 3 */
/* IDSEL 3 */
-
1800 0 0 0 &UIC0 19
8
+
0x1800 0x0 0x0 0x0 &UIC0 0x19 0x
8
/* IDSEL 4 */
/* IDSEL 4 */
-
2000 0 0 0 &UIC0 1a
8
+
0x2000 0x0 0x0 0x0 &UIC0 0x1a 0x
8
>;
};
};
>;
};
};