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/cooloney...
[pandora-kernel.git]
/
arch
/
powerpc
/
boot
/
dts
/
makalu.dts
diff --git
a/arch/powerpc/boot/dts/makalu.dts
b/arch/powerpc/boot/dts/makalu.dts
index
84cc5e7
..
945508c
100644
(file)
--- a/
arch/powerpc/boot/dts/makalu.dts
+++ b/
arch/powerpc/boot/dts/makalu.dts
@@
-8,12
+8,14
@@
* any warranty of any kind, whether express or implied.
*/
* any warranty of any kind, whether express or implied.
*/
+/dts-v1/;
+
/ {
#address-cells = <1>;
#size-cells = <1>;
model = "amcc,makalu";
compatible = "amcc,makalu";
/ {
#address-cells = <1>;
#size-cells = <1>;
model = "amcc,makalu";
compatible = "amcc,makalu";
- dcr-parent = <&
/cpus/cpu@0
>;
+ dcr-parent = <&
{/cpus/cpu@0}
>;
aliases {
ethernet0 = &EMAC0;
aliases {
ethernet0 = &EMAC0;
@@
-29,13
+31,13
@@
cpu@0 {
device_type = "cpu";
model = "PowerPC,405EX";
cpu@0 {
device_type = "cpu";
model = "PowerPC,405EX";
- reg = <0>;
+ reg = <0
x00000000
>;
clock-frequency = <0>; /* Filled in by U-Boot */
timebase-frequency = <0>; /* Filled in by U-Boot */
clock-frequency = <0>; /* Filled in by U-Boot */
timebase-frequency = <0>; /* Filled in by U-Boot */
- i-cache-line-size = <
20
>;
- d-cache-line-size = <
20
>;
- i-cache-size = <
4000
>; /* 16 kB */
- d-cache-size = <
4000
>; /* 16 kB */
+ i-cache-line-size = <
32
>;
+ d-cache-line-size = <
32
>;
+ i-cache-size = <
16384
>; /* 16 kB */
+ d-cache-size = <
16384
>; /* 16 kB */
dcr-controller;
dcr-access-method = "native";
};
dcr-controller;
dcr-access-method = "native";
};
@@
-43,14
+45,14
@@
memory {
device_type = "memory";
memory {
device_type = "memory";
- reg = <0
0>; /* Filled in by U-Boot */
+ reg = <0
x00000000 0x0000000
0>; /* Filled in by U-Boot */
};
UIC0: interrupt-controller {
compatible = "ibm,uic-405ex", "ibm,uic";
interrupt-controller;
cell-index = <0>;
};
UIC0: interrupt-controller {
compatible = "ibm,uic-405ex", "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>;
@@
-60,11
+62,11
@@
compatible = "ibm,uic-405ex","ibm,uic";
interrupt-controller;
cell-index = <1>;
compatible = "ibm,uic-405ex","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>;
};
@@
-72,11
+74,11
@@
compatible = "ibm,uic-405ex","ibm,uic";
interrupt-controller;
cell-index = <2>;
compatible = "ibm,uic-405ex","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>;
};
interrupt-parent = <&UIC0>;
};
@@
-89,72
+91,72
@@
SDRAM0: memory-controller {
compatible = "ibm,sdram-405ex";
SDRAM0: memory-controller {
compatible = "ibm,sdram-405ex";
- dcr-reg = <0
10
2>;
+ dcr-reg = <0
x010 0x00
2>;
};
MAL0: mcmal {
compatible = "ibm,mcmal-405ex", "ibm,mcmal2";
};
MAL0: mcmal {
compatible = "ibm,mcmal-405ex", "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>;
};
POB0: opb {
compatible = "ibm,opb-405ex", "ibm,opb";
#address-cells = <1>;
#size-cells = <1>;
};
POB0: opb {
compatible = "ibm,opb-405ex", "ibm,opb";
#address-cells = <1>;
#size-cells = <1>;
- ranges = <
80000000 80000000
10000000
-
ef600000 ef600000
a00000
-
f0000000 f0000000
10000000>;
- dcr-reg = <0
a0
5>;
+ ranges = <
0x80000000 0x80000000 0x
10000000
+
0xef600000 0xef600000 0x00
a00000
+
0xf0000000 0xf0000000 0x
10000000>;
+ dcr-reg = <0
x0a0 0x00
5>;
clock-frequency = <0>; /* Filled in by U-Boot */
EBC0: ebc {
compatible = "ibm,ebc-405ex", "ibm,ebc";
clock-frequency = <0>; /* Filled in by U-Boot */
EBC0: ebc {
compatible = "ibm,ebc-405ex", "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 U-Boot */
/* ranges property is supplied by U-Boot */
#address-cells = <2>;
#size-cells = <1>;
clock-frequency = <0>; /* Filled in by U-Boot */
/* ranges property is supplied by U-Boot */
- interrupts = <
5
1>;
+ interrupts = <
0x5 0x
1>;
interrupt-parent = <&UIC1>;
nor_flash@0,0 {
compatible = "amd,s29gl512n", "cfi-flash";
bank-width = <2>;
interrupt-parent = <&UIC1>;
nor_flash@0,0 {
compatible = "amd,s29gl512n", "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
200000>;
+ reg = <0
x00000000 0x00
200000>;
};
partition@200000 {
label = "root";
};
partition@200000 {
label = "root";
- reg = <
200000
200000>;
+ reg = <
0x00200000 0x00
200000>;
};
partition@400000 {
label = "user";
};
partition@400000 {
label = "user";
- reg = <
400000
3b60000>;
+ reg = <
0x00400000 0x0
3b60000>;
};
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>;
};
};
};
};
};
};
@@
-162,68
+164,68
@@
UART0: serial@ef600200 {
device_type = "serial";
compatible = "ns16550";
UART0: serial@ef600200 {
device_type = "serial";
compatible = "ns16550";
- reg = <
ef600200
8>;
- virtual-reg = <ef600200>;
+ reg = <
0xef600200 0x0000000
8>;
+ virtual-reg = <
0x
ef600200>;
clock-frequency = <0>; /* Filled in by U-Boot */
current-speed = <0>;
interrupt-parent = <&UIC0>;
clock-frequency = <0>; /* Filled in by U-Boot */
current-speed = <0>;
interrupt-parent = <&UIC0>;
- interrupts = <
1a
4>;
+ interrupts = <
0x1a 0x
4>;
};
UART1: serial@ef600300 {
device_type = "serial";
compatible = "ns16550";
};
UART1: 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 U-Boot */
current-speed = <0>;
interrupt-parent = <&UIC0>;
clock-frequency = <0>; /* Filled in by U-Boot */
current-speed = <0>;
interrupt-parent = <&UIC0>;
- interrupts = <
1
4>;
+ interrupts = <
0x1 0x
4>;
};
IIC0: i2c@ef600400 {
compatible = "ibm,iic-405ex", "ibm,iic";
};
IIC0: i2c@ef600400 {
compatible = "ibm,iic-405ex", "ibm,iic";
- reg = <
ef600400
14>;
+ reg = <
0xef600400 0x000000
14>;
interrupt-parent = <&UIC0>;
interrupt-parent = <&UIC0>;
- interrupts = <
2
4>;
+ interrupts = <
0x2 0x
4>;
};
IIC1: i2c@ef600500 {
compatible = "ibm,iic-405ex", "ibm,iic";
};
IIC1: i2c@ef600500 {
compatible = "ibm,iic-405ex", "ibm,iic";
- reg = <
ef600500
14>;
+ reg = <
0xef600500 0x000000
14>;
interrupt-parent = <&UIC0>;
interrupt-parent = <&UIC0>;
- interrupts = <
7
4>;
+ interrupts = <
0x7 0x
4>;
};
RGMII0: emac-rgmii@ef600b00 {
compatible = "ibm,rgmii-405ex", "ibm,rgmii";
};
RGMII0: emac-rgmii@ef600b00 {
compatible = "ibm,rgmii-405ex", "ibm,rgmii";
- reg = <
ef600b00
104>;
+ reg = <
0xef600b00 0x00000
104>;
has-mdio;
};
EMAC0: ethernet@ef600900 {
has-mdio;
};
EMAC0: ethernet@ef600900 {
- linux,network-index = <0>;
+ linux,network-index = <0
x0
>;
device_type = "network";
device_type = "network";
- compatible = "ibm,emac-405ex", "ibm,emac4";
+ compatible = "ibm,emac-405ex", "ibm,emac4
sync
";
interrupt-parent = <&EMAC0>;
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 = <
ef600900 70
>;
+ interrupt-map = </*Status*/ 0
x0 &UIC0 0x18 0x
4
+ /*Wake*/
0x1 &UIC1 0x1d 0x
4>;
+ reg = <
0xef600900 0x000000c4
>;
local-mac-address = [000000000000]; /* Filled in by U-Boot */
mal-device = <&MAL0>;
mal-tx-channel = <0>;
mal-rx-channel = <0>;
cell-index = <0>;
local-mac-address = [000000000000]; /* Filled in by U-Boot */
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 = <0
000003f>;
/* Start at 6 */
+ phy-map = <0
x0000003f>;
/* Start at 6 */
rgmii-device = <&RGMII0>;
rgmii-channel = <0>;
has-inverted-stacr-oc;
rgmii-device = <&RGMII0>;
rgmii-channel = <0>;
has-inverted-stacr-oc;
@@
-231,27
+233,27
@@
};
EMAC1: ethernet@ef600a00 {
};
EMAC1: ethernet@ef600a00 {
- linux,network-index = <1>;
+ linux,network-index = <
0x
1>;
device_type = "network";
device_type = "network";
- compatible = "ibm,emac-405ex", "ibm,emac4";
+ compatible = "ibm,emac-405ex", "ibm,emac4
sync
";
interrupt-parent = <&EMAC1>;
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 = <
ef600a00 70
>;
+ interrupt-map = </*Status*/ 0
x0 &UIC0 0x19 0x
4
+ /*Wake*/
0x1 &UIC1 0x1f 0x
4>;
+ reg = <
0xef600a00 0x000000c4
>;
local-mac-address = [000000000000]; /* Filled in by U-Boot */
mal-device = <&MAL0>;
mal-tx-channel = <1>;
mal-rx-channel = <1>;
cell-index = <1>;
local-mac-address = [000000000000]; /* Filled in by U-Boot */
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>;
rgmii-device = <&RGMII0>;
rgmii-channel = <1>;
has-inverted-stacr-oc;
rgmii-device = <&RGMII0>;
rgmii-channel = <1>;
has-inverted-stacr-oc;
@@
-266,23
+268,23
@@
#address-cells = <3>;
compatible = "ibm,plb-pciex-405ex", "ibm,plb-pciex";
primary;
#address-cells = <3>;
compatible = "ibm,plb-pciex-405ex", "ibm,plb-pciex";
primary;
- port = <0>; /* port number */
- reg = <
a0000000 20000000
/* Config space access */
-
ef000000 00001000>;
/* Registers */
- dcr-reg = <0
40
020>;
- sdr-base = <400>;
+ port = <0
x0
>; /* port number */
+ reg = <
0xa0000000 0x20000000
/* Config space access */
+
0xef000000 0x00001000>;
/* Registers */
+ dcr-reg = <0
x040 0x
020>;
+ sdr-base = <
0x
400>;
/* 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 90000000 0
08000000
- 0
1000000 0 00000000 e0000000 0
00010000>;
+ ranges = <0
x02000000 0x00000000 0x80000000 0x90000000 0x00000000 0x
08000000
+ 0
x01000000 0x00000000 0x00000000 0xe0000000 0x00000000 0x
00010000>;
/* Inbound 2GB range starting at 0 */
/* Inbound 2GB range starting at 0 */
- dma-ranges = <
42000000 0 0 0 0
80000000>;
+ dma-ranges = <
0x42000000 0x0 0x0 0x0 0x0 0x
80000000>;
/* This drives busses 0x00 to 0x3f */
/* This drives busses 0x00 to 0x3f */
- bus-range = <0
0
3f>;
+ bus-range = <0
x0 0x
3f>;
/* Legacy interrupts (note the weird polarity, the bridge seems
* to invert PCIe legacy interrupts).
/* Legacy interrupts (note the weird polarity, the bridge seems
* to invert PCIe legacy interrupts).
@@
-292,12
+294,12
@@
* below are basically de-swizzled numbers.
* The real slot is on idsel 0, so the swizzling is 1:1
*/
* below are basically de-swizzled numbers.
* The real slot is on idsel 0, so the swizzling is 1:1
*/
- interrupt-map-mask = <0
000 0 0
7>;
+ interrupt-map-mask = <0
x0 0x0 0x0 0x
7>;
interrupt-map = <
interrupt-map = <
- 0
000 0 0 1 &UIC2 0
4 /* swizzled int A */
- 0
000 0 0 2 &UIC2 1
4 /* swizzled int B */
- 0
000 0 0 3 &UIC2 2
4 /* swizzled int C */
- 0
000 0 0 4 &UIC2 3
4 /* swizzled int D */>;
+ 0
x0 0x0 0x0 0x1 &UIC2 0x0 0x
4 /* swizzled int A */
+ 0
x0 0x0 0x0 0x2 &UIC2 0x1 0x
4 /* swizzled int B */
+ 0
x0 0x0 0x0 0x3 &UIC2 0x2 0x
4 /* swizzled int C */
+ 0
x0 0x0 0x0 0x4 &UIC2 0x3 0x
4 /* swizzled int D */>;
};
PCIE1: pciex@0c0000000 {
};
PCIE1: pciex@0c0000000 {
@@
-307,23
+309,23
@@
#address-cells = <3>;
compatible = "ibm,plb-pciex-405ex", "ibm,plb-pciex";
primary;
#address-cells = <3>;
compatible = "ibm,plb-pciex-405ex", "ibm,plb-pciex";
primary;
- port = <1>; /* port number */
- reg = <
c0000000 20000000
/* Config space access */
-
ef001000 00001000>;
/* Registers */
- dcr-reg = <0
60
020>;
- sdr-base = <440>;
+ port = <
0x
1>; /* port number */
+ reg = <
0xc0000000 0x20000000
/* Config space access */
+
0xef001000 0x00001000>;
/* Registers */
+ dcr-reg = <0
x060 0x
020>;
+ sdr-base = <
0x
440>;
/* 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 98000000 0
08000000
- 0
1000000 0 00000000 e0010000 0
00010000>;
+ ranges = <0
x02000000 0x00000000 0x80000000 0x98000000 0x00000000 0x
08000000
+ 0
x01000000 0x00000000 0x00000000 0xe0010000 0x00000000 0x
00010000>;
/* Inbound 2GB range starting at 0 */
/* Inbound 2GB range starting at 0 */
- dma-ranges = <
42000000 0 0 0 0
80000000>;
+ dma-ranges = <
0x42000000 0x0 0x0 0x0 0x0 0x
80000000>;
/* This drives busses 0x40 to 0x7f */
/* This drives busses 0x40 to 0x7f */
- bus-range = <
40
7f>;
+ bus-range = <
0x40 0x
7f>;
/* Legacy interrupts (note the weird polarity, the bridge seems
* to invert PCIe legacy interrupts).
/* Legacy interrupts (note the weird polarity, the bridge seems
* to invert PCIe legacy interrupts).
@@
-333,12
+335,12
@@
* below are basically de-swizzled numbers.
* The real slot is on idsel 0, so the swizzling is 1:1
*/
* below are basically de-swizzled numbers.
* The real slot is on idsel 0, so the swizzling is 1:1
*/
- interrupt-map-mask = <0
000 0 0
7>;
+ interrupt-map-mask = <0
x0 0x0 0x0 0x
7>;
interrupt-map = <
interrupt-map = <
- 0
000 0 0 1 &UIC2 b
4 /* swizzled int A */
- 0
000 0 0 2 &UIC2 c
4 /* swizzled int B */
- 0
000 0 0 3 &UIC2 d
4 /* swizzled int C */
- 0
000 0 0 4 &UIC2 e
4 /* swizzled int D */>;
+ 0
x0 0x0 0x0 0x1 &UIC2 0xb 0x
4 /* swizzled int A */
+ 0
x0 0x0 0x0 0x2 &UIC2 0xc 0x
4 /* swizzled int B */
+ 0
x0 0x0 0x0 0x3 &UIC2 0xd 0x
4 /* swizzled int C */
+ 0
x0 0x0 0x0 0x4 &UIC2 0xe 0x
4 /* swizzled int D */>;
};
};
};
};
};
};