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 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
[pandora-kernel.git]
/
arch
/
powerpc
/
boot
/
dts
/
sequoia.dts
diff --git
a/arch/powerpc/boot/dts/sequoia.dts
b/arch/powerpc/boot/dts/sequoia.dts
index
72d6756
..
72d15f0
100644
(file)
--- a/
arch/powerpc/boot/dts/sequoia.dts
+++ b/
arch/powerpc/boot/dts/sequoia.dts
@@
-12,12
+12,14
@@
*
*/
*
*/
+/dts-v1/;
+
/ {
#address-cells = <2>;
#size-cells = <1>;
model = "amcc,sequoia";
compatible = "amcc,sequoia";
/ {
#address-cells = <2>;
#size-cells = <1>;
model = "amcc,sequoia";
compatible = "amcc,sequoia";
- dcr-parent = <&
/cpus/cpu@0
>;
+ dcr-parent = <&
{/cpus/cpu@0}
>;
aliases {
ethernet0 = &EMAC0;
aliases {
ethernet0 = &EMAC0;
@@
-35,13
+37,13
@@
cpu@0 {
device_type = "cpu";
model = "PowerPC,440EPx";
cpu@0 {
device_type = "cpu";
model = "PowerPC,440EPx";
- 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
>;
- d-cache-size = <
8000
>;
+ i-cache-line-size = <
32
>;
+ d-cache-line-size = <
32
>;
+ i-cache-size = <
32768
>;
+ d-cache-size = <
32768
>;
dcr-controller;
dcr-access-method = "native";
};
dcr-controller;
dcr-access-method = "native";
};
@@
-49,14
+51,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-440epx","ibm,uic";
interrupt-controller;
cell-index = <0>;
};
UIC0: interrupt-controller0 {
compatible = "ibm,uic-440epx","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>;
@@
-66,11
+68,11
@@
compatible = "ibm,uic-440epx","ibm,uic";
interrupt-controller;
cell-index = <1>;
compatible = "ibm,uic-440epx","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>;
};
interrupt-parent = <&UIC0>;
};
@@
-78,22
+80,22
@@
compatible = "ibm,uic-440epx","ibm,uic";
interrupt-controller;
cell-index = <2>;
compatible = "ibm,uic-440epx","ibm,uic";
interrupt-controller;
cell-index = <2>;
- dcr-reg = <0
e0
009>;
+ dcr-reg = <0
x0e0 0x
009>;
#address-cells = <0>;
#size-cells = <0>;
#interrupt-cells = <2>;
#address-cells = <0>;
#size-cells = <0>;
#interrupt-cells = <2>;
- interrupts = <
1c 4 1d
4>; /* cascade */
+ interrupts = <
0x1c 0x4 0x1d 0x
4>; /* cascade */
interrupt-parent = <&UIC0>;
};
SDR0: sdr {
compatible = "ibm,sdr-440epx", "ibm,sdr-440ep";
interrupt-parent = <&UIC0>;
};
SDR0: sdr {
compatible = "ibm,sdr-440epx", "ibm,sdr-440ep";
- dcr-reg = <0
0e
002>;
+ dcr-reg = <0
x00e 0x
002>;
};
CPR0: cpr {
compatible = "ibm,cpr-440epx", "ibm,cpr-440ep";
};
CPR0: cpr {
compatible = "ibm,cpr-440epx", "ibm,cpr-440ep";
- dcr-reg = <0
0c
002>;
+ dcr-reg = <0
x00c 0x
002>;
};
plb {
};
plb {
@@
-105,44
+107,44
@@
SDRAM0: sdram {
compatible = "ibm,sdram-440epx", "ibm,sdram-44x-ddr2denali";
SDRAM0: sdram {
compatible = "ibm,sdram-440epx", "ibm,sdram-44x-ddr2denali";
- dcr-reg = <0
10
2>;
+ dcr-reg = <0
x010 0x00
2>;
};
DMA0: dma {
compatible = "ibm,dma-440epx", "ibm,dma-4xx";
};
DMA0: dma {
compatible = "ibm,dma-440epx", "ibm,dma-4xx";
- dcr-reg = <
100
027>;
+ dcr-reg = <
0x100 0x
027>;
};
MAL0: mcmal {
compatible = "ibm,mcmal-440epx", "ibm,mcmal2";
};
MAL0: mcmal {
compatible = "ibm,mcmal-440epx", "ibm,mcmal2";
- dcr-reg = <
180
62>;
+ dcr-reg = <
0x180 0x0
62>;
num-tx-chans = <2>;
num-rx-chans = <2>;
interrupt-parent = <&MAL0>;
num-tx-chans = <2>;
num-rx-chans = <2>;
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>;
};
USB1: usb@e0000400 {
compatible = "ohci-be";
};
USB1: usb@e0000400 {
compatible = "ohci-be";
- reg = <0
e0000400
60>;
+ reg = <0
x00000000 0xe0000400 0x000000
60>;
interrupt-parent = <&UIC0>;
interrupt-parent = <&UIC0>;
- interrupts = <
15
8>;
+ interrupts = <
0x15 0x
8>;
};
USB0: ehci@e0000300 {
compatible = "ibm,usb-ehci-440epx", "usb-ehci";
interrupt-parent = <&UIC0>;
};
USB0: ehci@e0000300 {
compatible = "ibm,usb-ehci-440epx", "usb-ehci";
interrupt-parent = <&UIC0>;
- interrupts = <
1a
4>;
- reg = <0
e0000300 90 0 e0000390
70>;
+ interrupts = <
0x1a 0x
4>;
+ reg = <0
x00000000 0xe0000300 0x00000090 0x00000000 0xe0000390 0x000000
70>;
big-endian;
};
big-endian;
};
@@
-150,50
+152,50
@@
compatible = "ibm,opb-440epx", "ibm,opb";
#address-cells = <1>;
#size-cells = <1>;
compatible = "ibm,opb-440epx", "ibm,opb";
#address-cells = <1>;
#size-cells = <1>;
- ranges = <0
0000000 1 00000000
80000000
-
80000000 1 80000000
80000000>;
+ ranges = <0
x00000000 0x00000001 0x00000000 0x
80000000
+
0x80000000 0x00000001 0x80000000 0x
80000000>;
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-440epx", "ibm,ebc";
clock-frequency = <0>; /* Filled in by zImage */
EBC0: ebc {
compatible = "ibm,ebc-440epx", "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 */
#address-cells = <2>;
#size-cells = <1>;
clock-frequency = <0>; /* Filled in by zImage */
- interrupts = <
5
1>;
+ interrupts = <
0x5 0x
1>;
interrupt-parent = <&UIC1>;
nor_flash@0,0 {
compatible = "amd,s29gl256n", "cfi-flash";
bank-width = <2>;
interrupt-parent = <&UIC1>;
nor_flash@0,0 {
compatible = "amd,s29gl256n", "cfi-flash";
bank-width = <2>;
- reg = <0
000000
4000000>;
+ reg = <0
x00000000 0x00000000 0x0
4000000>;
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "Kernel";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "Kernel";
- reg = <0
180000>;
+ reg = <0
x00000000 0x00
180000>;
};
partition@180000 {
label = "ramdisk";
};
partition@180000 {
label = "ramdisk";
- reg = <
180000
200000>;
+ reg = <
0x00180000 0x00
200000>;
};
partition@380000 {
label = "file system";
};
partition@380000 {
label = "file system";
- reg = <
380000
3aa0000>;
+ reg = <
0x00380000 0x0
3aa0000>;
};
partition@3e20000 {
label = "kozio";
};
partition@3e20000 {
label = "kozio";
- reg = <
3e20000
140000>;
+ reg = <
0x03e20000 0x00
140000>;
};
partition@3f60000 {
label = "env";
};
partition@3f60000 {
label = "env";
- reg = <
3f60000
40000>;
+ reg = <
0x03f60000 0x000
40000>;
};
partition@3fa0000 {
label = "u-boot";
};
partition@3fa0000 {
label = "u-boot";
- reg = <
3fa0000
60000>;
+ reg = <
0x03fa0000 0x000
60000>;
};
};
};
};
@@
-202,69
+204,69
@@
UART0: serial@ef600300 {
device_type = "serial";
compatible = "ns16550";
UART0: serial@ef600300 {
device_type = "serial";
compatible = "ns16550";
- reg = <
ef600300
8>;
- virtual-reg = <ef600300>;
+ reg = <
0xef600300 0x0000000
8>;
+ virtual-reg = <
0x
ef600300>;
clock-frequency = <0>; /* Filled in by zImage */
clock-frequency = <0>; /* Filled in by zImage */
- current-speed = <1
c
200>;
+ current-speed = <1
15
200>;
interrupt-parent = <&UIC0>;
interrupt-parent = <&UIC0>;
- interrupts = <0
4>;
+ interrupts = <0
x0 0x
4>;
};
UART1: serial@ef600400 {
device_type = "serial";
compatible = "ns16550";
};
UART1: serial@ef600400 {
device_type = "serial";
compatible = "ns16550";
- reg = <
ef600400
8>;
- virtual-reg = <ef600400>;
+ reg = <
0xef600400 0x0000000
8>;
+ virtual-reg = <
0x
ef600400>;
clock-frequency = <0>;
current-speed = <0>;
interrupt-parent = <&UIC0>;
clock-frequency = <0>;
current-speed = <0>;
interrupt-parent = <&UIC0>;
- interrupts = <
1
4>;
+ interrupts = <
0x1 0x
4>;
};
UART2: serial@ef600500 {
device_type = "serial";
compatible = "ns16550";
};
UART2: serial@ef600500 {
device_type = "serial";
compatible = "ns16550";
- reg = <
ef600500
8>;
- virtual-reg = <ef600500>;
+ reg = <
0xef600500 0x0000000
8>;
+ virtual-reg = <
0x
ef600500>;
clock-frequency = <0>;
current-speed = <0>;
interrupt-parent = <&UIC1>;
clock-frequency = <0>;
current-speed = <0>;
interrupt-parent = <&UIC1>;
- interrupts = <
3
4>;
+ interrupts = <
0x3 0x
4>;
};
UART3: serial@ef600600 {
device_type = "serial";
compatible = "ns16550";
};
UART3: serial@ef600600 {
device_type = "serial";
compatible = "ns16550";
- reg = <
ef600600
8>;
- virtual-reg = <ef600600>;
+ reg = <
0xef600600 0x0000000
8>;
+ virtual-reg = <
0x
ef600600>;
clock-frequency = <0>;
current-speed = <0>;
interrupt-parent = <&UIC1>;
clock-frequency = <0>;
current-speed = <0>;
interrupt-parent = <&UIC1>;
- interrupts = <
4
4>;
+ interrupts = <
0x4 0x
4>;
};
IIC0: i2c@ef600700 {
compatible = "ibm,iic-440epx", "ibm,iic";
};
IIC0: i2c@ef600700 {
compatible = "ibm,iic-440epx", "ibm,iic";
- reg = <
ef600700
14>;
+ reg = <
0xef600700 0x000000
14>;
interrupt-parent = <&UIC0>;
interrupt-parent = <&UIC0>;
- interrupts = <
2
4>;
+ interrupts = <
0x2 0x
4>;
};
IIC1: i2c@ef600800 {
compatible = "ibm,iic-440epx", "ibm,iic";
};
IIC1: i2c@ef600800 {
compatible = "ibm,iic-440epx", "ibm,iic";
- reg = <
ef600800
14>;
+ reg = <
0xef600800 0x000000
14>;
interrupt-parent = <&UIC0>;
interrupt-parent = <&UIC0>;
- interrupts = <
7
4>;
+ interrupts = <
0x7 0x
4>;
};
ZMII0: emac-zmii@ef600d00 {
compatible = "ibm,zmii-440epx", "ibm,zmii";
};
ZMII0: emac-zmii@ef600d00 {
compatible = "ibm,zmii-440epx", "ibm,zmii";
- reg = <
ef600d00
c>;
+ reg = <
0xef600d00 0x0000000
c>;
};
RGMII0: emac-rgmii@ef601000 {
compatible = "ibm,rgmii-440epx", "ibm,rgmii";
};
RGMII0: emac-rgmii@ef601000 {
compatible = "ibm,rgmii-440epx", "ibm,rgmii";
- reg = <
ef601000
8>;
+ reg = <
0xef601000 0x0000000
8>;
has-mdio;
};
has-mdio;
};
@@
-272,23
+274,23
@@
device_type = "network";
compatible = "ibm,emac-440epx", "ibm,emac4";
interrupt-parent = <&EMAC0>;
device_type = "network";
compatible = "ibm,emac-440epx", "ibm,emac4";
interrupt-parent = <&EMAC0>;
- interrupts = <0
1>;
+ interrupts = <0
x0 0x
1>;
#interrupt-cells = <1>;
#address-cells = <0>;
#size-cells = <0>;
#interrupt-cells = <1>;
#address-cells = <0>;
#size-cells = <0>;
- interrupt-map = </*Status*/ 0
&UIC0 18
4
- /*Wake*/
1 &UIC1 1d
4>;
- reg = <
ef600e00 70
>;
+ interrupt-map = </*Status*/ 0
x0 &UIC0 0x18 0x
4
+ /*Wake*/
0x1 &UIC1 0x1d 0x
4>;
+ reg = <
0xef600e00 0x00000074
>;
local-mac-address = [000000000000];
mal-device = <&MAL0>;
mal-tx-channel = <0>;
mal-rx-channel = <0>;
cell-index = <0>;
local-mac-address = [000000000000];
mal-device = <&MAL0>;
mal-tx-channel = <0>;
mal-rx-channel = <0>;
cell-index = <0>;
- max-frame-size = <
2328
>;
- rx-fifo-size = <
1000
>;
- tx-fifo-size = <
800
>;
+ max-frame-size = <
9000
>;
+ rx-fifo-size = <
4096
>;
+ tx-fifo-size = <
2048
>;
phy-mode = "rgmii";
phy-mode = "rgmii";
- phy-map = <00000000>;
+ phy-map = <0
x0
0000000>;
zmii-device = <&ZMII0>;
zmii-channel = <0>;
rgmii-device = <&RGMII0>;
zmii-device = <&ZMII0>;
zmii-channel = <0>;
rgmii-device = <&RGMII0>;
@@
-301,23
+303,23
@@
device_type = "network";
compatible = "ibm,emac-440epx", "ibm,emac4";
interrupt-parent = <&EMAC1>;
device_type = "network";
compatible = "ibm,emac-440epx", "ibm,emac4";
interrupt-parent = <&EMAC1>;
- interrupts = <0
1>;
+ interrupts = <0
x0 0x
1>;
#interrupt-cells = <1>;
#address-cells = <0>;
#size-cells = <0>;
#interrupt-cells = <1>;
#address-cells = <0>;
#size-cells = <0>;
- interrupt-map = </*Status*/ 0
&UIC0 19
4
- /*Wake*/
1 &UIC1 1f
4>;
- reg = <
ef600f00 70
>;
+ interrupt-map = </*Status*/ 0
x0 &UIC0 0x19 0x
4
+ /*Wake*/
0x1 &UIC1 0x1f 0x
4>;
+ reg = <
0xef600f00 0x00000074
>;
local-mac-address = [000000000000];
mal-device = <&MAL0>;
mal-tx-channel = <1>;
mal-rx-channel = <1>;
cell-index = <1>;
local-mac-address = [000000000000];
mal-device = <&MAL0>;
mal-tx-channel = <1>;
mal-rx-channel = <1>;
cell-index = <1>;
- max-frame-size = <
2328
>;
- rx-fifo-size = <
1000
>;
- tx-fifo-size = <
800
>;
+ max-frame-size = <
9000
>;
+ rx-fifo-size = <
4096
>;
+ tx-fifo-size = <
2048
>;
phy-mode = "rgmii";
phy-mode = "rgmii";
- phy-map = <00000000>;
+ phy-map = <0
x0
0000000>;
zmii-device = <&ZMII0>;
zmii-channel = <1>;
rgmii-device = <&RGMII0>;
zmii-device = <&ZMII0>;
zmii-channel = <1>;
rgmii-device = <&RGMII0>;
@@
-334,10
+336,10
@@
#address-cells = <3>;
compatible = "ibm,plb440epx-pci", "ibm,plb-pci";
primary;
#address-cells = <3>;
compatible = "ibm,plb440epx-pci", "ibm,plb-pci";
primary;
- reg = <
1 eec00000 8
/* Config space access */
-
1 eed00000 4
/* IACK */
-
1 eed00000 4
/* Special cycle */
-
1 ef400000 40>;
/* Internal registers */
+ reg = <
0x00000001 0xeec00000 0x00000008
/* Config space access */
+
0x00000001 0xeed00000 0x00000004
/* IACK */
+
0x00000001 0xeed00000 0x00000004
/* Special cycle */
+
0x00000001 0xef400000 0x00000040>;
/* Internal registers */
/* Outbound ranges, one memory and one IO,
* later cannot be changed. Chip supports a second
/* Outbound ranges, one memory and one IO,
* later cannot be changed. Chip supports a second
@@
-347,16
+349,16
@@
* I/O 1 E800 0000 1 E800 FFFF 64KB
* I/O 1 E880 0000 1 EBFF FFFF 56MB
*/
* I/O 1 E800 0000 1 E800 FFFF 64KB
* I/O 1 E880 0000 1 EBFF FFFF 56MB
*/
- ranges = <0
2000000 0 80000000 1 80000000 0
40000000
- 0
1000000 0 00000000 1 e8000000 0
00010000
- 0
1000000 0 00000000 1 e8800000 0
03800000>;
+ ranges = <0
x02000000 0x00000000 0x80000000 0x00000001 0x80000000 0x00000000 0x
40000000
+ 0
x01000000 0x00000000 0x00000000 0x00000001 0xe8000000 0x00000000 0x
00010000
+ 0
x01000000 0x00000000 0x00000000 0x00000001 0xe8800000 0x00000000 0x
03800000>;
/* 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>;
/* All PCI interrupts are routed to IRQ 67 */
/* All PCI interrupts are routed to IRQ 67 */
- interrupt-map-mask = <0
000 0 0
0>;
- interrupt-map = < 0
000 0 0 0 &UIC2 3
8 >;
+ interrupt-map-mask = <0
x0 0x0 0x0 0x
0>;
+ interrupt-map = < 0
x0 0x0 0x0 0x0 &UIC2 0x3 0x
8 >;
};
};
};
};