diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-24 10:02:16 +1100 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-24 10:02:16 +1100 |
commit | d67ebe72c9ce525019db9139153b55247d34b0a4 (patch) | |
tree | a0525be0b15c108facd50bafb3bb32c774255c36 /arch/powerpc/boot/dts/katmai.dts | |
parent | ab2f489294b69e6d736efa7a57dcf286cd9662a0 (diff) | |
parent | 59e1d4952d4cb81ee9a4c22c6cfa23604c5e1ea1 (diff) |
Merge commit 'jwb/next' into next
Diffstat (limited to 'arch/powerpc/boot/dts/katmai.dts')
-rw-r--r-- | arch/powerpc/boot/dts/katmai.dts | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/arch/powerpc/boot/dts/katmai.dts b/arch/powerpc/boot/dts/katmai.dts index 077819bc3cb..b8cd97c5c74 100644 --- a/arch/powerpc/boot/dts/katmai.dts +++ b/arch/powerpc/boot/dts/katmai.dts @@ -16,7 +16,7 @@ / { #address-cells = <2>; - #size-cells = <1>; + #size-cells = <2>; model = "amcc,katmai"; compatible = "amcc,katmai"; dcr-parent = <&{/cpus/cpu@0}>; @@ -49,7 +49,7 @@ memory { device_type = "memory"; - reg = <0x00000000 0x00000000 0x00000000>; /* Filled in by zImage */ + reg = <0x0 0x00000000 0x0 0x00000000>; /* Filled in by U-Boot */ }; UIC0: interrupt-controller0 { @@ -112,7 +112,15 @@ compatible = "ibm,plb-440spe", "ibm,plb-440gp", "ibm,plb4"; #address-cells = <2>; #size-cells = <1>; - ranges; + /* addr-child addr-parent size */ + ranges = <0x4 0xe0000000 0x4 0xe0000000 0x20000000 + 0xc 0x00000000 0xc 0x00000000 0x20000000 + 0xd 0x00000000 0xd 0x00000000 0x80000000 + 0xd 0x80000000 0xd 0x80000000 0x80000000 + 0xe 0x00000000 0xe 0x00000000 0x80000000 + 0xe 0x80000000 0xe 0x80000000 0x80000000 + 0xf 0x00000000 0xf 0x00000000 0x80000000 + 0xf 0x80000000 0xf 0x80000000 0x80000000>; clock-frequency = <0>; /* Filled in by zImage */ SDRAM0: sdram { |