[PATCH 1/2] [RFC][POWERPC] MPC8568E-MDS: create localbus node

[PATCH 1/2] [RFC][POWERPC] MPC8568E-MDS: create localbus node

[Anton Vorontsov]

This patch creates localbus node, moves bcsr into it, and adds
localbus to the probe path.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
---

Patch is against galak/powerpc.git master branch.

 arch/powerpc/boot/dts/mpc8568mds.dts      |   14 +++++++++++---
 arch/powerpc/platforms/85xx/mpc85xx_mds.c |    1 +
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
index 5439437..296adc3 100644
--- a/arch/powerpc/boot/dts/mpc8568mds.dts
+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -42,9 +42,17 @@
 		reg = <00000000 10000000>;
 	};
 
-	bcsr@f8000000 {
-		device_type = "board-control";
-		reg = <f8000000 8000>;
+	localbus@f0000000 {
+		compatible = "fsl,mpc8568mds-localbus";
+		#address-cells = <2>;
+		#size-cells = <1>;
+		reg = <f0000000 10000000>;
+		ranges = <0 0 f8000000 0008000>;
+
+		bcsr@0,0 {
+			device_type = "board-control";
+			reg = <0 0 8000>;
+		};
 	};
 
 	soc8568@e0000000 {
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index 61b3eed..0cf994b 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -139,6 +139,7 @@ static struct of_device_id mpc85xx_ids[] = {
 	{ .type = "soc", },
 	{ .compatible = "soc", },
 	{ .type = "qe", },
+	{ .compatible = "fsl,mpc8568mds-localbus", },
 	{},
 };
 
-- 
1.5.0.6

Re: [PATCH 1/2] [RFC][POWERPC] MPC8568E-MDS: create localbus node

[Sergei Shtylyov]

Anton Vorontsov wrote:

> This patch creates localbus node, moves bcsr into it, and adds
> localbus to the probe path.

> Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>

> diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
> index 5439437..296adc3 100644
> --- a/arch/powerpc/boot/dts/mpc8568mds.dts
> +++ b/arch/powerpc/boot/dts/mpc8568mds.dts
> @@ -42,9 +42,17 @@
>  		reg = <00000000 10000000>;
>  	};
>  
> -	bcsr@f8000000 {
> -		device_type = "board-control";
> -		reg = <f8000000 8000>;
> +	localbus@f0000000 {
> +		compatible = "fsl,mpc8568mds-localbus";

    Is the entity described as "localbus" indeed so *board* specific?

> +		#address-cells = <2>;
> +		#size-cells = <1>;
> +		reg = <f0000000 10000000>;
> +		ranges = <0 0 f8000000 0008000>;

    Isn't that range a part of "reg"?

> +
> +		bcsr@0,0 {
> +			device_type = "board-control";
> +			reg = <0 0 8000>;
> +		};
>  	};
>  
>  	soc8568@e0000000 {

WBR, Sergei

Re: [PATCH 1/2] [RFC][POWERPC] MPC8568E-MDS: create localbus node

[Anton Vorontsov]

On Mon, Oct 15, 2007 at 07:42:12PM +0400, Sergei Shtylyov wrote:
> Anton Vorontsov wrote:
>
>> This patch creates localbus node, moves bcsr into it, and adds
>> localbus to the probe path.
>
>> Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
>
>> diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts 
>> b/arch/powerpc/boot/dts/mpc8568mds.dts
>> index 5439437..296adc3 100644
>> --- a/arch/powerpc/boot/dts/mpc8568mds.dts
>> +++ b/arch/powerpc/boot/dts/mpc8568mds.dts
>> @@ -42,9 +42,17 @@
>>  		reg = <00000000 10000000>;
>>  	};
>>  -	bcsr@f8000000 {

Heh, this is wrong.

>> -		device_type = "board-control";
>> -		reg = <f8000000 8000>;
>> +	localbus@f0000000 {
>> +		compatible = "fsl,mpc8568mds-localbus";
>
>    Is the entity described as "localbus" indeed so *board* specific?

That's what booting-without-of.txt gives as an example.

>> +		#address-cells = <2>;
>> +		#size-cells = <1>;
>> +		reg = <f0000000 10000000>;
>> +		ranges = <0 0 f8000000 0008000>;
>
>    Isn't that range a part of "reg"?

Heh. Right you are.

>> +
>> +		bcsr@0,0 {

Hrm, wrong.

>> +			device_type = "board-control";
>> +			reg = <0 0 8000>;
>> +		};
>>  	};
>>   	soc8568@e0000000 {
>
> WBR, Sergei

I'll repost fixed version shortly.

Thanks,

-- 
Anton Vorontsov
email: cbou@mail.ru
backup email: ya-cbou@yandex.ru
irc://irc.freenode.net/bd2

[PATCH v2 1/2] [RFC][POWERPC] MPC8568E-MDS: create localbus node

[Anton Vorontsov]

This patch creates localbus node, moves bcsr into it, and adds
localbus to the probe path.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
---

Notice that localbus control registers are in the soc address
space, but ranges are not. Just the same situation as with PCI
nodes.

Patch is against galak/powerpc.git master branch.

 arch/powerpc/boot/dts/mpc8568mds.dts      |   14 +++++++++++---
 arch/powerpc/platforms/85xx/mpc85xx_mds.c |    1 +
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
index 5439437..8e15dba 100644
--- a/arch/powerpc/boot/dts/mpc8568mds.dts
+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -42,9 +42,17 @@
 		reg = <00000000 10000000>;
 	};
 
-	bcsr@f8000000 {
-		device_type = "board-control";
-		reg = <f8000000 8000>;
+	localbus@e0005000 {
+		compatible = "fsl,mpc8568mds-localbus";
+		#address-cells = <2>;
+		#size-cells = <1>;
+		reg = <e0005000 d8>;
+		ranges = <1 0 f8000000 0008000>;
+
+		bcsr@1,0 {
+			device_type = "board-control";
+			reg = <1 0 8000>;
+		};
 	};
 
 	soc8568@e0000000 {
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index 61b3eed..0cf994b 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -139,6 +139,7 @@ static struct of_device_id mpc85xx_ids[] = {
 	{ .type = "soc", },
 	{ .compatible = "soc", },
 	{ .type = "qe", },
+	{ .compatible = "fsl,mpc8568mds-localbus", },
 	{},
 };
 
-- 
1.5.0.6

[PATCH v2 2/2] [POWERPC] MPC8568E-MDS: add support for flash

[Anton Vorontsov]

MPC8568E-MDS have 1 32MB Spansion x16 CFI flash chip. Let's use it.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
---

Patch is against galak/powerpc.git master branch.

 arch/powerpc/boot/dts/mpc8568mds.dts |   35 +++++++++++++++++++++++++++++++++-
 1 files changed, 34 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
index 8e15dba..1198363 100644
--- a/arch/powerpc/boot/dts/mpc8568mds.dts
+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -47,12 +47,45 @@
 		#address-cells = <2>;
 		#size-cells = <1>;
 		reg = <e0005000 d8>;
-		ranges = <1 0 f8000000 0008000>;
+		ranges = <1 0 f8000000 0008000
+			  0 0 fe000000 2000000>;
 
 		bcsr@1,0 {
 			device_type = "board-control";
 			reg = <1 0 8000>;
 		};
+
+		flash@0,0 {
+			compatible = "Spansion,S29GL256N11TFIV2O", "cfi-flash";
+			reg = <0 0 2000000>;
+			probe-type = "CFI";
+			bank-width = <2>;
+			device-width = <1>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			hrcw@0 {
+				label = "hrcw";
+				reg = <0 20001>;
+				read-only;
+			};
+
+			kernel@20000 {
+				label = "kernel";
+				reg = <20000 200000>;
+			};
+
+			rootfs@220000 {
+				label = "rootfs";
+				reg = <220000 1d60000>;
+			};
+
+			uboot@1f80000 {
+				label = "u-boot";
+				reg = <1f80000 80000>;
+				read-only;
+			};
+		};
 	};
 
 	soc8568@e0000000 {
-- 
1.5.0.6

Re: [PATCH v2 2/2] [POWERPC] MPC8568E-MDS: add support for flash

[Sergei Shtylyov]

Anton Vorontsov wrote:

> MPC8568E-MDS have 1 32MB Spansion x16 CFI flash chip. Let's use it.

> Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>

> diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
> index 8e15dba..1198363 100644
> --- a/arch/powerpc/boot/dts/mpc8568mds.dts
> +++ b/arch/powerpc/boot/dts/mpc8568mds.dts
> @@ -47,12 +47,45 @@
>  		#address-cells = <2>;
>  		#size-cells = <1>;
>  		reg = <e0005000 d8>;
> -		ranges = <1 0 f8000000 0008000>;
> +		ranges = <1 0 f8000000 0008000
> +			  0 0 fe000000 2000000>;
>  
>  		bcsr@1,0 {
>  			device_type = "board-control";
>  			reg = <1 0 8000>;
>  		};
> +
> +		flash@0,0 {
> +			compatible = "Spansion,S29GL256N11TFIV2O", "cfi-flash";
> +			reg = <0 0 2000000>;
> +			probe-type = "CFI";

    I don't get it -- has physmap_of.c rewrite been already committed?
If yes, you don't need probe_type; if no, your "compatible" won't work...
Well, I see that the driver rewrite has been committed (when I wasn't looking 
8-)...

> +			bank-width = <2>;
> +			device-width = <1>;
> +			#address-cells = <1>;
> +			#size-cells = <1>;
> +
> +			hrcw@0 {
> +				label = "hrcw";
> +				reg = <0 20001>;

    What?! Odd sized partition? Don't try to follow both the old and new 
partition device tree specs -- you'll only get yourself into trouble with 
this.  The size-cell doesn't bear r/o flag in the new paritions spec.

> +				read-only;
> +			};
> +
> +			kernel@20000 {
> +				label = "kernel";
> +				reg = <20000 200000>;
> +			};
> +
> +			rootfs@220000 {
> +				label = "rootfs";
> +				reg = <220000 1d60000>;
> +			};
> +
> +			uboot@1f80000 {
> +				label = "u-boot";
> +				reg = <1f80000 80000>;
> +				read-only;

    Well, this is not even consistent... :-)

> +			};
> +		};
>  	};

WBR, Sergei

Re: [PATCH v2 2/2] [POWERPC] MPC8568E-MDS: add support for flash

[Kumar Gala]

On Oct 15, 2007, at 12:33 PM, Sergei Shtylyov wrote:

> Anton Vorontsov wrote:
>
>> MPC8568E-MDS have 1 32MB Spansion x16 CFI flash chip. Let's use it.
>
>> Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
>
>> diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/ 
>> boot/dts/mpc8568mds.dts
>> index 8e15dba..1198363 100644
>> --- a/arch/powerpc/boot/dts/mpc8568mds.dts
>> +++ b/arch/powerpc/boot/dts/mpc8568mds.dts
>> @@ -47,12 +47,45 @@
>>  		#address-cells = <2>;
>>  		#size-cells = <1>;
>>  		reg = <e0005000 d8>;
>> -		ranges = <1 0 f8000000 0008000>;
>> +		ranges = <1 0 f8000000 0008000
>> +			  0 0 fe000000 2000000>;
>>
>>  		bcsr@1,0 {
>>  			device_type = "board-control";
>>  			reg = <1 0 8000>;
>>  		};
>> +
>> +		flash@0,0 {
>> +			compatible = "Spansion,S29GL256N11TFIV2O", "cfi-flash";
>> +			reg = <0 0 2000000>;
>> +			probe-type = "CFI";
>
>     I don't get it -- has physmap_of.c rewrite been already committed?
> If yes, you don't need probe_type; if no, your "compatible" won't  
> work...
> Well, I see that the driver rewrite has been committed (when I  
> wasn't looking
> 8-)...

Any NOR flash nodes should conform to the "new" bindings from David  
Gibson, et al.  Not sure about the status of those being in  
physmap_of.c w/regards to 2.6.24.

- k

Re: [PATCH 1/2] [RFC][POWERPC] MPC8568E-MDS: create localbus node

[Scott Wood]

On Mon, Oct 15, 2007 at 07:57:30PM +0400, Anton Vorontsov wrote:
> On Mon, Oct 15, 2007 at 07:42:12PM +0400, Sergei Shtylyov wrote:
> >    Is the entity described as "localbus" indeed so *board* specific?
> 
> That's what booting-without-of.txt gives as an example.

The board should have been left out of that.  Your compatible should be
something like "fsl,mpc8568-localbus", possibly with some canonical mpc85xx
chip as well, chosen to represent 85xx localbus in general.

-Scott

Re: [PATCH 1/2] [RFC][POWERPC] MPC8568E-MDS: create localbus node

[Kumar Gala]

On Oct 15, 2007, at 1:47 PM, Scott Wood wrote:

> On Mon, Oct 15, 2007 at 07:57:30PM +0400, Anton Vorontsov wrote:
>> On Mon, Oct 15, 2007 at 07:42:12PM +0400, Sergei Shtylyov wrote:
>>>    Is the entity described as "localbus" indeed so *board* specific?
>>
>> That's what booting-without-of.txt gives as an example.
>
> The board should have been left out of that.  Your compatible  
> should be
> something like "fsl,mpc8568-localbus", possibly with some canonical  
> mpc85xx
> chip as well, chosen to represent 85xx localbus in general.

Lets be careful, there are at least two forms of localbus on 85xx.

- k

Re: [PATCH 1/2] [RFC][POWERPC] MPC8568E-MDS: create localbus node

[Scott Wood]

Kumar Gala wrote:
> 
> On Oct 15, 2007, at 1:47 PM, Scott Wood wrote:
> 
>> On Mon, Oct 15, 2007 at 07:57:30PM +0400, Anton Vorontsov wrote:
>>> On Mon, Oct 15, 2007 at 07:42:12PM +0400, Sergei Shtylyov wrote:
>>>>    Is the entity described as "localbus" indeed so *board* specific?
>>>
>>> That's what booting-without-of.txt gives as an example.
>>
>> The board should have been left out of that.  Your compatible should be
>> something like "fsl,mpc8568-localbus", possibly with some canonical 
>> mpc85xx
>> chip as well, chosen to represent 85xx localbus in general.
> 
> Lets be careful, there are at least two forms of localbus on 85xx.

Do you mean LAWBAR v. BRn/ORn (the manuals refer to the latter as 
"localbus", so I'd be inclined to stick with that name, and call the 
former mpc8568-lawbar or something), or some 85xx being different than 
others?

-Scott

Re: [PATCH v2 2/2] [POWERPC] MPC8568E-MDS: add support for flash

[David Gibson]

On Mon, Oct 15, 2007 at 01:00:24PM -0500, Kumar Gala wrote:
> 
> On Oct 15, 2007, at 12:33 PM, Sergei Shtylyov wrote:
> 
> > Anton Vorontsov wrote:
> >
> >> MPC8568E-MDS have 1 32MB Spansion x16 CFI flash chip. Let's use it.
> >
> >> Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
> >
> >> diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/ 
> >> boot/dts/mpc8568mds.dts
> >> index 8e15dba..1198363 100644
> >> --- a/arch/powerpc/boot/dts/mpc8568mds.dts
> >> +++ b/arch/powerpc/boot/dts/mpc8568mds.dts
> >> @@ -47,12 +47,45 @@
> >>  		#address-cells = <2>;
> >>  		#size-cells = <1>;
> >>  		reg = <e0005000 d8>;
> >> -		ranges = <1 0 f8000000 0008000>;
> >> +		ranges = <1 0 f8000000 0008000
> >> +			  0 0 fe000000 2000000>;
> >>
> >>  		bcsr@1,0 {
> >>  			device_type = "board-control";
> >>  			reg = <1 0 8000>;
> >>  		};
> >> +
> >> +		flash@0,0 {
> >> +			compatible = "Spansion,S29GL256N11TFIV2O", "cfi-flash";
> >> +			reg = <0 0 2000000>;
> >> +			probe-type = "CFI";
> >
> >     I don't get it -- has physmap_of.c rewrite been already committed?
> > If yes, you don't need probe_type; if no, your "compatible" won't  
> > work...
> > Well, I see that the driver rewrite has been committed (when I  
> > wasn't looking
> > 8-)...
> 
> Any NOR flash nodes should conform to the "new" bindings from David  
> Gibson, et al.  Not sure about the status of those being in  
> physmap_of.c w/regards to 2.6.24.

Yes, in which case probe_type should be dropped, as should the low bit
in the read-only partitions.

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

Re: [PATCH v2 2/2] [POWERPC] MPC8568E-MDS: add support for flash

[Anton Vorontsov]

On Mon, Oct 15, 2007 at 09:33:40PM +0400, Sergei Shtylyov wrote:
> Anton Vorontsov wrote:
>
>> MPC8568E-MDS have 1 32MB Spansion x16 CFI flash chip. Let's use it.
>
>> Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
>
>> diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts 
>> b/arch/powerpc/boot/dts/mpc8568mds.dts
>> index 8e15dba..1198363 100644
>> --- a/arch/powerpc/boot/dts/mpc8568mds.dts
>> +++ b/arch/powerpc/boot/dts/mpc8568mds.dts
>> @@ -47,12 +47,45 @@
>>  		#address-cells = <2>;
>>  		#size-cells = <1>;
>>  		reg = <e0005000 d8>;
>> -		ranges = <1 0 f8000000 0008000>;
>> +		ranges = <1 0 f8000000 0008000
>> +			  0 0 fe000000 2000000>;
>>   		bcsr@1,0 {
>>  			device_type = "board-control";
>>  			reg = <1 0 8000>;
>>  		};
>> +
>> +		flash@0,0 {
>> +			compatible = "Spansion,S29GL256N11TFIV2O", "cfi-flash";
>> +			reg = <0 0 2000000>;
>> +			probe-type = "CFI";
>
>    I don't get it -- has physmap_of.c rewrite been already committed?
> If yes, you don't need probe_type; if no, your "compatible" won't work...

I see.

/* Helper function to handle probing of the obsolete "direct-mapped"
 * compatible binding, which has an extra "probe-type" property [...]

Obsolete, very good.

> Well, I see that the driver rewrite has been committed (when I wasn't 
> looking 8-)...
>> +			bank-width = <2>;
>> +			device-width = <1>;
>> +			#address-cells = <1>;
>> +			#size-cells = <1>;
>> +
>> +			hrcw@0 {
>> +				label = "hrcw";
>> +				reg = <0 20001>;
>
>    What?! Odd sized partition? Don't try to follow both the old and new 
> partition device tree specs -- you'll only get yourself into trouble with 
> this.  The size-cell doesn't bear r/o flag in the new paritions spec.

Thanks for spotting this. It's, of course, forward-porting "thinko".

>> +				read-only;
>> +			};
>> +
>> +			kernel@20000 {
>> +				label = "kernel";
>> +				reg = <20000 200000>;
>> +			};
>> +
>> +			rootfs@220000 {
>> +				label = "rootfs";
>> +				reg = <220000 1d60000>;
>> +			};
>> +
>> +			uboot@1f80000 {
>> +				label = "u-boot";
>> +				reg = <1f80000 80000>;
>> +				read-only;
>
>    Well, this is not even consistent... :-)

Yup, it was a thinko in the hrcw node, not something I really
meant to spread over all ro nodes.

>> +			};
>> +		};
>>  	};
>
> WBR, Sergei

Much thanks for the review,

-- 
Anton Vorontsov
email: cbou@mail.ru
backup email: ya-cbou@yandex.ru
irc://irc.freenode.net/bd2