diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-07-11 13:28:26 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-07-11 13:28:26 +1000 |
| commit | bf22f6fe2d72b4d7e9035be8ceb340414cf490e3 (patch) | |
| tree | 14085d90de0428316479fe6de8a0c6d32e6e65e2 /arch/powerpc/boot/dts/ebony.dts | |
| parent | 4eb6bf6bfb580afaf1e1a1d30cba17a078530cf4 (diff) | |
| parent | 93ab471889c6662b42ce7da257f31f24c08d7d9e (diff) | |
| download | kernel_samsung_aries-bf22f6fe2d72b4d7e9035be8ceb340414cf490e3.zip kernel_samsung_aries-bf22f6fe2d72b4d7e9035be8ceb340414cf490e3.tar.gz kernel_samsung_aries-bf22f6fe2d72b4d7e9035be8ceb340414cf490e3.tar.bz2 | |
Merge branch 'for-2.6.23' into merge
Diffstat (limited to 'arch/powerpc/boot/dts/ebony.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/ebony.dts | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/powerpc/boot/dts/ebony.dts b/arch/powerpc/boot/dts/ebony.dts index 0ec02f4..c5f9961 100644 --- a/arch/powerpc/boot/dts/ebony.dts +++ b/arch/powerpc/boot/dts/ebony.dts @@ -31,8 +31,8 @@ reg = <0>; clock-frequency = <0>; // Filled in by zImage timebase-frequency = <0>; // Filled in by zImage - i-cache-line-size = <32>; - d-cache-line-size = <32>; + i-cache-line-size = <20>; + d-cache-line-size = <20>; i-cache-size = <8000>; /* 32 kB */ d-cache-size = <8000>; /* 32 kB */ dcr-controller; @@ -135,11 +135,9 @@ #address-cells = <2>; #size-cells = <1>; clock-frequency = <0>; // Filled in by zImage - ranges = <0 00000000 fff00000 100000 - 1 00000000 48000000 100000 - 2 00000000 ff800000 400000 - 3 00000000 48200000 100000 - 7 00000000 48300000 100000>; + // ranges property is supplied by zImage + // based on firmware's configuration of the + // EBC bridge interrupts = <5 4>; interrupt-parent = <&UIC1>; |