Skip to contentSkip to conversation

Fix device tree dts file for katmai board.

PATCH In review [email protected] 3 participants 3 messages Nov 18, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix device tree dts file for katmai board.

From: Pravin Bathija <[email protected]>

Set size cell value to 2 for 4GB memory support in katmai. Also set PCI-E node inbound DMA ranges size to 4GB for correct boot up of katmai.
Content-Type: text/plain; charset=utf-8

---
 arch/powerpc/boot/dts/katmai.dts |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)
arch/powerpc/boot/dts/katmai.dts +10 -10
index 077819b..8b40fd8 100644
@@ -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 zImage */
 	};
 
 	UIC0: interrupt-controller0 {
@@ -245,8 +245,8 @@
 			ranges = <0x02000000 0x00000000 0x80000000 0x0000000d 0x80000000 0x00000000 0x80000000
 				  0x01000000 0x00000000 0x00000000 0x0000000c 0x08000000 0x00000000 0x00010000>;
 
-			/* Inbound 2GB range starting at 0 */
-			dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;
+			/* Inbound 4GB range starting at 0 */
+			dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x1 0x00000000>;
 
 			/* This drives busses 0 to 0xf */
 			bus-range = <0x0 0xf>;
@@ -289,8 +289,8 @@
 			ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x00000000 0x00000000 0x80000000
 				  0x01000000 0x00000000 0x00000000 0x0000000f 0x80000000 0x00000000 0x00010000>;
 
-			/* Inbound 2GB range starting at 0 */
-			dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;
+			/* Inbound 4GB range starting at 0 */
+			dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x1 0x00000000>;
 
 			/* This drives busses 10 to 0x1f */
 			bus-range = <0x10 0x1f>;
@@ -330,8 +330,8 @@
 			ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x80000000 0x00000000 0x80000000
 				  0x01000000 0x00000000 0x00000000 0x0000000f 0x80010000 0x00000000 0x00010000>;
 
-			/* Inbound 2GB range starting at 0 */
-			dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;
+			/* Inbound 4GB range starting at 0 */
+			dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x1 0x00000000>;
 
 			/* This drives busses 10 to 0x1f */
 			bus-range = <0x20 0x2f>;
@@ -371,8 +371,8 @@
 			ranges = <0x02000000 0x00000000 0x80000000 0x0000000f 0x00000000 0x00000000 0x80000000
 				  0x01000000 0x00000000 0x00000000 0x0000000f 0x80020000 0x00000000 0x00010000>;
 
-			/* Inbound 2GB range starting at 0 */
-			dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;
+			/* Inbound 4GB range starting at 0 */
+			dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x1 0x00000000>;
 
 			/* This drives busses 10 to 0x1f */
 			bus-range = <0x30 0x3f>;
Signature · 1 line
1.5.5
#1 lore raw
Quoted 6 lines · On Tue, Nov 17, 2009 at 04:19:48PM -0800, [email protected] wrote:

From: Pravin Bathija <[email protected]>

Set size cell value to 2 for 4GB memory support in katmai. Also set PCI-E node inbound DMA ranges size to 4GB for correct boot up of katmai.
Content-Type: text/plain; charset=utf-8

Quoted 6 lines

This conflicts with one I already have queued up in my next branch. It also seems to lack some of the changes that patch has.

Stefan, can you look this over and work out with Pravin what to do?

josh

#2 lore raw
In reply to [email protected]

Hi Pravin,

Quoted 4 lines · On Wednesday 18 November 2009 01:19:48 [email protected] wrote:

From: Pravin Bathija <[email protected]>

Set size cell value to 2 for 4GB memory support in katmai. Also set
PCI-E node inbound DMA ranges size to 4GB for correct boot up of katmai.

As Josh already mentioned, I already submitted a patch which partly covers this 4GB support:

http://patchwork.ozlabs.org/patch/36768/

I suggest that you rebase your patch (only with the DMA ranges stuff) and resend it.

Cheers,
Stefan