diff mbox

[6/6] DTS: add SPI flash(s25fl128p01) support on p4080ds and mpc8536ds board

Message ID 1279591705-7574-7-git-send-email-Mingkai.hu@freescale.com (mailing list archive)
State Changes Requested
Delegated to: Grant Likely
Headers show

Commit Message

Mingkai Hu July 20, 2010, 2:08 a.m. UTC
Signed-off-by: Mingkai Hu <Mingkai.hu@freescale.com>
---
 arch/powerpc/boot/dts/mpc8536ds.dts |   52 +++++++++++++++++++++++++++++++++++
 arch/powerpc/boot/dts/p4080ds.dts   |    9 ++----
 2 files changed, 55 insertions(+), 6 deletions(-)

Comments

Grant Likely July 26, 2010, 12:35 a.m. UTC | #1
On Tue, Jul 20, 2010 at 10:08:25AM +0800, Mingkai Hu wrote:
> Signed-off-by: Mingkai Hu <Mingkai.hu@freescale.com>
> ---
>  arch/powerpc/boot/dts/mpc8536ds.dts |   52 +++++++++++++++++++++++++++++++++++
>  arch/powerpc/boot/dts/p4080ds.dts   |    9 ++----
>  2 files changed, 55 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/powerpc/boot/dts/mpc8536ds.dts b/arch/powerpc/boot/dts/mpc8536ds.dts
> index 815cebb..e5d07ec 100644
> --- a/arch/powerpc/boot/dts/mpc8536ds.dts
> +++ b/arch/powerpc/boot/dts/mpc8536ds.dts
> @@ -108,6 +108,58 @@
>  			};
>  		};
>  
> +		spi@7000 {
> +			#address-cells = <1>;
> +			#size-cells = <0>;
> +			compatible = "fsl,espi";
> +			reg = <0x7000 0x1000>;
> +			interrupts = <59 0x2>;
> +			interrupt-parent = <&mpic>;
> + 			fsl,espi-num-chipselects = <4>;
> +
> + 			flash@0 {
> +				#address-cells = <1>;
> +				#size-cells = <1>;
> + 				compatible = "spansion,s25sl12801";

whitespace inconsitencies

> +				reg = <0>;
> +				spi-max-frequency = <40000000>;
> +				partition@u-boot {
> +					label = "u-boot";
> +					reg = <0x00000000 0x00100000>;
> +					read-only;
> +				};
> +				partition@kernel {
> +					label = "kernel";
> +					reg = <0x00100000 0x00500000>;
> +					read-only;
> +				};
> +				partition@dtb {
> +					label = "dtb";
> +					reg = <0x00600000 0x00100000>;
> +					read-only;
> +				};
> +				partition@fs {
> +					label = "file system";
> +					reg = <0x00700000 0x00900000>;
> +				};
> +			};
> + 			flash@1 {
> + 				compatible = "spansion,s25sl12801";
> +				reg = <1>;
> +				spi-max-frequency = <40000000>;
> +			};
> + 			flash@2 {
> + 				compatible = "spansion,s25sl12801";
> +				reg = <2>;
> +				spi-max-frequency = <40000000>;
> +			};
> + 			flash@3 {
> + 				compatible = "spansion,s25sl12801";

whitespace inconsitencies

> +				reg = <3>;
> +				spi-max-frequency = <40000000>;
> +			};
> +		};
> +
>  		dma@21300 {
>  			#address-cells = <1>;
>  			#size-cells = <1>;
> diff --git a/arch/powerpc/boot/dts/p4080ds.dts b/arch/powerpc/boot/dts/p4080ds.dts
> index 6b29eab..ac7dd23 100644
> --- a/arch/powerpc/boot/dts/p4080ds.dts
> +++ b/arch/powerpc/boot/dts/p4080ds.dts
> @@ -236,22 +236,19 @@
>  		};
>  
>  		spi@110000 {
> -			cell-index = <0>;
>  			#address-cells = <1>;
>  			#size-cells = <0>;
>  			compatible = "fsl,espi";
>  			reg = <0x110000 0x1000>;
>  			interrupts = <53 0x2>;
>  			interrupt-parent = <&mpic>;
> -			espi,num-ss-bits = <4>;
> -			mode = "cpu";
> + 			fsl,espi-num-chipselects = <4>;
>  
> -			fsl_m25p80@0 {
> + 			flash@0 {
>  				#address-cells = <1>;
>  				#size-cells = <1>;
> -				compatible = "fsl,espi-flash";
> + 				compatible = "spansion,s25sl12801";

whitespace inconsistencies

>  				reg = <0>;
> -				linux,modalias = "fsl_m25p80";
>  				spi-max-frequency = <40000000>; /* input clock */
>  				partition@u-boot {
>  					label = "u-boot";
> -- 
> 1.6.4
> 
>
Hu Mingkai-B21284 July 26, 2010, 7:39 a.m. UTC | #2
> -----Original Message-----
> From: Grant Likely [mailto:glikely@secretlab.ca] On Behalf Of 
> Grant Likely
> Sent: Monday, July 26, 2010 8:35 AM
> To: Hu Mingkai-B21284
> Cc: linuxppc-dev@ozlabs.org; galak@kernel.crashing.org; Zang 
> Roy-R61911
> Subject: Re: [PATCH 6/6] DTS: add SPI flash(s25fl128p01) 
> support on p4080ds and mpc8536ds board
> 
> On Tue, Jul 20, 2010 at 10:08:25AM +0800, Mingkai Hu wrote:
> > Signed-off-by: Mingkai Hu <Mingkai.hu@freescale.com>
> > ---
> >  arch/powerpc/boot/dts/mpc8536ds.dts |   52 
> +++++++++++++++++++++++++++++++++++
> >  arch/powerpc/boot/dts/p4080ds.dts   |    9 ++----
> >  2 files changed, 55 insertions(+), 6 deletions(-)
> > 
> > diff --git a/arch/powerpc/boot/dts/mpc8536ds.dts 
> > b/arch/powerpc/boot/dts/mpc8536ds.dts
> > index 815cebb..e5d07ec 100644
> > --- a/arch/powerpc/boot/dts/mpc8536ds.dts
> > +++ b/arch/powerpc/boot/dts/mpc8536ds.dts
> > @@ -108,6 +108,58 @@
> >  			};
> >  		};
> >  
> > +		spi@7000 {
> > +			#address-cells = <1>;
> > +			#size-cells = <0>;
> > +			compatible = "fsl,espi";
> > +			reg = <0x7000 0x1000>;
> > +			interrupts = <59 0x2>;
> > +			interrupt-parent = <&mpic>;
> > + 			fsl,espi-num-chipselects = <4>;
> > +
> > + 			flash@0 {
> > +				#address-cells = <1>;
> > +				#size-cells = <1>;
> > + 				compatible = "spansion,s25sl12801";
> 
> whitespace inconsitencies
> 
> > +				reg = <0>;
> > +				spi-max-frequency = <40000000>;
> > +				partition@u-boot {
> > +					label = "u-boot";
> > +					reg = <0x00000000 0x00100000>;
> > +					read-only;
> > +				};
> > +				partition@kernel {
> > +					label = "kernel";
> > +					reg = <0x00100000 0x00500000>;
> > +					read-only;
> > +				};
> > +				partition@dtb {
> > +					label = "dtb";
> > +					reg = <0x00600000 0x00100000>;
> > +					read-only;
> > +				};
> > +				partition@fs {
> > +					label = "file system";
> > +					reg = <0x00700000 0x00900000>;
> > +				};
> > +			};
> > + 			flash@1 {
> > + 				compatible = "spansion,s25sl12801";
> > +				reg = <1>;
> > +				spi-max-frequency = <40000000>;
> > +			};
> > + 			flash@2 {
> > + 				compatible = "spansion,s25sl12801";
> > +				reg = <2>;
> > +				spi-max-frequency = <40000000>;
> > +			};
> > + 			flash@3 {
> > + 				compatible = "spansion,s25sl12801";
> 
> whitespace inconsitencies
> 
> > +				reg = <3>;
> > +				spi-max-frequency = <40000000>;
> > +			};
> > +		};
> > +
> >  		dma@21300 {
> >  			#address-cells = <1>;
> >  			#size-cells = <1>;
> > diff --git a/arch/powerpc/boot/dts/p4080ds.dts 
> > b/arch/powerpc/boot/dts/p4080ds.dts
> > index 6b29eab..ac7dd23 100644
> > --- a/arch/powerpc/boot/dts/p4080ds.dts
> > +++ b/arch/powerpc/boot/dts/p4080ds.dts
> > @@ -236,22 +236,19 @@
> >  		};
> >  
> >  		spi@110000 {
> > -			cell-index = <0>;
> >  			#address-cells = <1>;
> >  			#size-cells = <0>;
> >  			compatible = "fsl,espi";
> >  			reg = <0x110000 0x1000>;
> >  			interrupts = <53 0x2>;
> >  			interrupt-parent = <&mpic>;
> > -			espi,num-ss-bits = <4>;
> > -			mode = "cpu";
> > + 			fsl,espi-num-chipselects = <4>;
> >  
> > -			fsl_m25p80@0 {
> > + 			flash@0 {
> >  				#address-cells = <1>;
> >  				#size-cells = <1>;
> > -				compatible = "fsl,espi-flash";
> > + 				compatible = "spansion,s25sl12801";
> 
> whitespace inconsistencies
> 

I use checkpatch to check the patch, but don't find any warnings and
errors.
so what's the whitespace inconsistencies means?

hmk@rock:~/public/linux-2.6$ ./scripts/checkpatch.pl
patch/public/v1/0006-DTS-add-SPI-flash-s25fl128p01-support-on-p4080ds-an
d.patch
total: 0 errors, 0 warnings, 83 lines checked

patch/public/v1/0006-DTS-add-SPI-flash-s25fl128p01-support-on-p4080ds-an
d.patch has no obvious style problems and is ready for submission.

Thanks,
Mingkai
Grant Likely July 26, 2010, 7:59 a.m. UTC | #3
On Mon, Jul 26, 2010 at 1:39 AM, Hu Mingkai-B21284 <B21284@freescale.com> wrote:
>
>
>> -----Original Message-----
>> From: Grant Likely [mailto:glikely@secretlab.ca] On Behalf Of
>> Grant Likely
>> Sent: Monday, July 26, 2010 8:35 AM
>> To: Hu Mingkai-B21284
>> Cc: linuxppc-dev@ozlabs.org; galak@kernel.crashing.org; Zang
>> Roy-R61911
>> Subject: Re: [PATCH 6/6] DTS: add SPI flash(s25fl128p01)
>> support on p4080ds and mpc8536ds board
>>
>> On Tue, Jul 20, 2010 at 10:08:25AM +0800, Mingkai Hu wrote:
>> > Signed-off-by: Mingkai Hu <Mingkai.hu@freescale.com>
>> > ---
>> >  arch/powerpc/boot/dts/mpc8536ds.dts |   52
>> +++++++++++++++++++++++++++++++++++
>> >  arch/powerpc/boot/dts/p4080ds.dts   |    9 ++----
>> >  2 files changed, 55 insertions(+), 6 deletions(-)
>> >
>> > diff --git a/arch/powerpc/boot/dts/mpc8536ds.dts
>> > b/arch/powerpc/boot/dts/mpc8536ds.dts
>> > index 815cebb..e5d07ec 100644
>> > --- a/arch/powerpc/boot/dts/mpc8536ds.dts
>> > +++ b/arch/powerpc/boot/dts/mpc8536ds.dts
>> > @@ -108,6 +108,58 @@
>> >                     };
>> >             };
>> >
>> > +           spi@7000 {
>> > +                   #address-cells = <1>;
>> > +                   #size-cells = <0>;
>> > +                   compatible = "fsl,espi";
>> > +                   reg = <0x7000 0x1000>;
>> > +                   interrupts = <59 0x2>;
>> > +                   interrupt-parent = <&mpic>;
>> > +                   fsl,espi-num-chipselects = <4>;
>> > +
>> > +                   flash@0 {
>> > +                           #address-cells = <1>;
>> > +                           #size-cells = <1>;
>> > +                           compatible = "spansion,s25sl12801";
>>
>> whitespace inconsitencies
>>
>> > +                           reg = <0>;
>> > +                           spi-max-frequency = <40000000>;
>> > +                           partition@u-boot {
>> > +                                   label = "u-boot";
>> > +                                   reg = <0x00000000 0x00100000>;
>> > +                                   read-only;
>> > +                           };
>> > +                           partition@kernel {
>> > +                                   label = "kernel";
>> > +                                   reg = <0x00100000 0x00500000>;
>> > +                                   read-only;
>> > +                           };
>> > +                           partition@dtb {
>> > +                                   label = "dtb";
>> > +                                   reg = <0x00600000 0x00100000>;
>> > +                                   read-only;
>> > +                           };
>> > +                           partition@fs {
>> > +                                   label = "file system";
>> > +                                   reg = <0x00700000 0x00900000>;
>> > +                           };
>> > +                   };
>> > +                   flash@1 {
>> > +                           compatible = "spansion,s25sl12801";
>> > +                           reg = <1>;
>> > +                           spi-max-frequency = <40000000>;
>> > +                   };
>> > +                   flash@2 {
>> > +                           compatible = "spansion,s25sl12801";
>> > +                           reg = <2>;
>> > +                           spi-max-frequency = <40000000>;
>> > +                   };
>> > +                   flash@3 {
>> > +                           compatible = "spansion,s25sl12801";
>>
>> whitespace inconsitencies
>>
>> > +                           reg = <3>;
>> > +                           spi-max-frequency = <40000000>;
>> > +                   };
>> > +           };
>> > +
>> >             dma@21300 {
>> >                     #address-cells = <1>;
>> >                     #size-cells = <1>;
>> > diff --git a/arch/powerpc/boot/dts/p4080ds.dts
>> > b/arch/powerpc/boot/dts/p4080ds.dts
>> > index 6b29eab..ac7dd23 100644
>> > --- a/arch/powerpc/boot/dts/p4080ds.dts
>> > +++ b/arch/powerpc/boot/dts/p4080ds.dts
>> > @@ -236,22 +236,19 @@
>> >             };
>> >
>> >             spi@110000 {
>> > -                   cell-index = <0>;
>> >                     #address-cells = <1>;
>> >                     #size-cells = <0>;
>> >                     compatible = "fsl,espi";
>> >                     reg = <0x110000 0x1000>;
>> >                     interrupts = <53 0x2>;
>> >                     interrupt-parent = <&mpic>;
>> > -                   espi,num-ss-bits = <4>;
>> > -                   mode = "cpu";
>> > +                   fsl,espi-num-chipselects = <4>;
>> >
>> > -                   fsl_m25p80@0 {
>> > +                   flash@0 {
>> >                             #address-cells = <1>;
>> >                             #size-cells = <1>;
>> > -                           compatible = "fsl,espi-flash";
>> > +                           compatible = "spansion,s25sl12801";
>>
>> whitespace inconsistencies
>>
>
> I use checkpatch to check the patch, but don't find any warnings and
> errors.
> so what's the whitespace inconsistencies means?
>
> hmk@rock:~/public/linux-2.6$ ./scripts/checkpatch.pl
> patch/public/v1/0006-DTS-add-SPI-flash-s25fl128p01-support-on-p4080ds-an
> d.patch
> total: 0 errors, 0 warnings, 83 lines checked
>
> patch/public/v1/0006-DTS-add-SPI-flash-s25fl128p01-support-on-p4080ds-an
> d.patch has no obvious style problems and is ready for submission.

Configure your editor to show tab characters differently from spaces.
About a dozen lines have a single space at the beginning of the line
before the tab indentation.

g.
diff mbox

Patch

diff --git a/arch/powerpc/boot/dts/mpc8536ds.dts b/arch/powerpc/boot/dts/mpc8536ds.dts
index 815cebb..e5d07ec 100644
--- a/arch/powerpc/boot/dts/mpc8536ds.dts
+++ b/arch/powerpc/boot/dts/mpc8536ds.dts
@@ -108,6 +108,58 @@ 
 			};
 		};
 
+		spi@7000 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "fsl,espi";
+			reg = <0x7000 0x1000>;
+			interrupts = <59 0x2>;
+			interrupt-parent = <&mpic>;
+ 			fsl,espi-num-chipselects = <4>;
+
+ 			flash@0 {
+				#address-cells = <1>;
+				#size-cells = <1>;
+ 				compatible = "spansion,s25sl12801";
+				reg = <0>;
+				spi-max-frequency = <40000000>;
+				partition@u-boot {
+					label = "u-boot";
+					reg = <0x00000000 0x00100000>;
+					read-only;
+				};
+				partition@kernel {
+					label = "kernel";
+					reg = <0x00100000 0x00500000>;
+					read-only;
+				};
+				partition@dtb {
+					label = "dtb";
+					reg = <0x00600000 0x00100000>;
+					read-only;
+				};
+				partition@fs {
+					label = "file system";
+					reg = <0x00700000 0x00900000>;
+				};
+			};
+ 			flash@1 {
+ 				compatible = "spansion,s25sl12801";
+				reg = <1>;
+				spi-max-frequency = <40000000>;
+			};
+ 			flash@2 {
+ 				compatible = "spansion,s25sl12801";
+				reg = <2>;
+				spi-max-frequency = <40000000>;
+			};
+ 			flash@3 {
+ 				compatible = "spansion,s25sl12801";
+				reg = <3>;
+				spi-max-frequency = <40000000>;
+			};
+		};
+
 		dma@21300 {
 			#address-cells = <1>;
 			#size-cells = <1>;
diff --git a/arch/powerpc/boot/dts/p4080ds.dts b/arch/powerpc/boot/dts/p4080ds.dts
index 6b29eab..ac7dd23 100644
--- a/arch/powerpc/boot/dts/p4080ds.dts
+++ b/arch/powerpc/boot/dts/p4080ds.dts
@@ -236,22 +236,19 @@ 
 		};
 
 		spi@110000 {
-			cell-index = <0>;
 			#address-cells = <1>;
 			#size-cells = <0>;
 			compatible = "fsl,espi";
 			reg = <0x110000 0x1000>;
 			interrupts = <53 0x2>;
 			interrupt-parent = <&mpic>;
-			espi,num-ss-bits = <4>;
-			mode = "cpu";
+ 			fsl,espi-num-chipselects = <4>;
 
-			fsl_m25p80@0 {
+ 			flash@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "fsl,espi-flash";
+ 				compatible = "spansion,s25sl12801";
 				reg = <0>;
-				linux,modalias = "fsl_m25p80";
 				spi-max-frequency = <40000000>; /* input clock */
 				partition@u-boot {
 					label = "u-boot";