[PATCH 0/4] Enable SPI flash support on da850-evm DT kernel

[PATCH 0/4] Enable SPI flash support on da850-evm DT kernel

[Manjunathappa, Prakash]

Patch enables support for m25p80 SPI flash support on
da850-EVM.

Testing information:
da850-evm comes with partitions specified in DT blob.
Able to mount/umount and create/delete files on filesystem partition.

Depends on below patch in spi-next branch of git://git.secretlab.ca/git/linux-2.6.git.
"spi/davinci: add OF support for the spi controller"

Applies on top of below patch under community review:
http://www.mail-archive.com/davinci-linux-open-source at linux.davincidsp.com/msg25184.html

Manjunathappa, Prakash (4):
  spi/davinci: fix module build error
  ARM: davinci: da850: add SPI1 DT node
  ARM: davinci: da850: override SPI DT node device name
  ARM: davinci: da850-evm: add SPI flash support

 arch/arm/boot/dts/da850-evm.dts  |   40 ++++++++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/da850.dtsi     |   18 +++++++++++++++++
 arch/arm/mach-davinci/da8xx-dt.c |    1 +
 drivers/spi/spi-davinci.c        |    2 +-
 4 files changed, 60 insertions(+), 1 deletions(-)

-- 
1.7.4.1

[PATCH 1/4] spi/davinci: fix module build error

[Manjunathappa, Prakash]

Fix below module build error:

  CC [M]  drivers/spi/spi-davinci.o
drivers/spi/spi-davinci.c:774:1: error: '__mod_of_device_table' aliased
to undefined symbol 'davini_spi_of_match'
drivers/spi/spi-davinci.c:774:1: error: '__mod_of_device_table' aliased
to undefined symbol 'davini_spi_of_match'
make[2]: *** [drivers/spi/spi-davinci.o] Error 1
make[1]: *** [drivers/spi] Error 2
make[1]: *** Waiting for unfinished jobs....
make: *** [drivers] Error 2

Signed-off-by: Manjunathappa, Prakash <prakash.pm@ti.com>
---
 drivers/spi/spi-davinci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index 50bd2cd..b30064b 100644
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -771,7 +771,7 @@ static const struct of_device_id davinci_spi_of_match[] = {
 	},
 	{ },
 };
-MODULE_DEVICE_TABLE(of, davini_spi_of_match);
+MODULE_DEVICE_TABLE(of, davinci_spi_of_match);
 
 /**
  * spi_davinci_get_pdata - Get platform data from DTS binding
-- 
1.7.4.1

[PATCH 1/4] spi/davinci: fix module build error

[Sekhar Nori]

On 2/25/2013 4:14 PM, Manjunathappa, Prakash wrote:
> Fix below module build error:
> 
>   CC [M]  drivers/spi/spi-davinci.o
> drivers/spi/spi-davinci.c:774:1: error: '__mod_of_device_table' aliased
> to undefined symbol 'davini_spi_of_match'
> drivers/spi/spi-davinci.c:774:1: error: '__mod_of_device_table' aliased
> to undefined symbol 'davini_spi_of_match'
> make[2]: *** [drivers/spi/spi-davinci.o] Error 1
> make[1]: *** [drivers/spi] Error 2
> make[1]: *** Waiting for unfinished jobs....
> make: *** [drivers] Error 2
> 
> Signed-off-by: Manjunathappa, Prakash <prakash.pm@ti.com>

Acked-by: Sekhar Nori <nsekhar@ti.com>

Thanks,
Sekhar

[PATCH 1/4] spi/davinci: fix module build error

[Grant Likely]

On Wed, 27 Feb 2013 13:57:07 +0530, Sekhar Nori <nsekhar@ti.com> wrote:
> On 2/25/2013 4:14 PM, Manjunathappa, Prakash wrote:
> > Fix below module build error:
> > 
> >   CC [M]  drivers/spi/spi-davinci.o
> > drivers/spi/spi-davinci.c:774:1: error: '__mod_of_device_table' aliased
> > to undefined symbol 'davini_spi_of_match'
> > drivers/spi/spi-davinci.c:774:1: error: '__mod_of_device_table' aliased
> > to undefined symbol 'davini_spi_of_match'
> > make[2]: *** [drivers/spi/spi-davinci.o] Error 1
> > make[1]: *** [drivers/spi] Error 2
> > make[1]: *** Waiting for unfinished jobs....
> > make: *** [drivers] Error 2
> > 
> > Signed-off-by: Manjunathappa, Prakash <prakash.pm@ti.com>
> 
> Acked-by: Sekhar Nori <nsekhar@ti.com>

Applied, thanks.

g.

[PATCH 2/4] ARM: davinci: da850: add SPI1 DT node

[Manjunathappa, Prakash]

Patch adds SPI1 DT node along with pinmux data.

Signed-off-by: Manjunathappa, Prakash <prakash.pm@ti.com>
---
 arch/arm/boot/dts/da850.dtsi |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi
index ebe7386..e921c82 100644
--- a/arch/arm/boot/dts/da850.dtsi
+++ b/arch/arm/boot/dts/da850.dtsi
@@ -76,6 +76,14 @@
 					0x28 0x00222222  0x00ffffff
 				>;
 			};
+			spi1_pins: pinmux_spi_pins {
+				pinctrl-single,bits = <
+					/* SIMO, SOMI, ENA,
+					 * CLK, CS[0], CS[1]
+					 */
+					0x14 0x00111111 0x00ffffff
+				>;
+			};
 		};
 		serial0: serial at 1c42000 {
 			compatible = "ns16550a";
@@ -126,6 +134,16 @@
 			interrupts = <16>;
 			status = "disabled";
 		};
+		spi1: spi at 1f0e000 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "ti,da8xx-spi";
+			reg = <0x30e000 0x1000>;
+			num-cs = <4>;
+			ti,davinci-spi-intr-line = <1>;
+			interrupts = <56>;
+			status = "disabled";
+		};
 	};
 	nand_cs3 at 62000000 {
 		compatible = "ti,davinci-nand";
-- 
1.7.4.1

[PATCH 3/4] ARM: davinci: da850: override SPI DT node device name

[Manjunathappa, Prakash]

Populate OF_DEV_AUXDATA with desired device name expected by spi-davinci
driver. Without this clk_get of spi-davinci DT driver fails.

Signed-off-by: Manjunathappa, Prakash <prakash.pm@ti.com>
---
 arch/arm/mach-davinci/da8xx-dt.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c
index 2b740a9..d9c76009 100644
--- a/arch/arm/mach-davinci/da8xx-dt.c
+++ b/arch/arm/mach-davinci/da8xx-dt.c
@@ -42,6 +42,7 @@ struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {
 	OF_DEV_AUXDATA("ti,davinci-wdt", 0x01c21000, "watchdog", NULL),
 	OF_DEV_AUXDATA("ti,davinci-mmc-da830", 0x01c40000, "davinci-mmc-da830.0",
 			NULL),
+	OF_DEV_AUXDATA("ti,da8xx-spi", 0x01f0e000, "spi_davinci.1", NULL),
 	{}
 };
 
-- 
1.7.4.1

[PATCH 4/4] ARM: davinci: da850-evm: add SPI flash support

[Manjunathappa, Prakash]

Enable m25p80 SPI flash support on da850-EVM. Also
add partition information of SPI flash.

Signed-off-by: Manjunathappa, Prakash <prakash.pm@ti.com>
---
 arch/arm/boot/dts/da850-evm.dts |   40 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 40 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/da850-evm.dts b/arch/arm/boot/dts/da850-evm.dts
index 78c8e54..1a28d43 100644
--- a/arch/arm/boot/dts/da850-evm.dts
+++ b/arch/arm/boot/dts/da850-evm.dts
@@ -46,6 +46,46 @@
 			pinctrl-names = "default";
 			pinctrl-0 = <&mmc0_pins>;
 		};
+		spi1: spi at 1f0e000 {
+			status = "okay";
+			pinctrl-names = "default";
+			pinctrl-0 = <&spi1_pins>;
+			flash: m25p80 at 0 {
+				#address-cells = <1>;
+				#size-cells = <1>;
+				compatible = "m25p80";
+				spi-max-frequency = <30000000>;
+				reg = <0>;
+				partition at 0 {
+					label = "U-Boot-SPL";
+					reg = <0x00000000 0x00010000>;
+					read-only;
+				};
+				partition at 1 {
+					label = "U-Boot";
+					reg = <0x00010000 0x00080000>;
+					read-only;
+				};
+				partition at 2 {
+					label = "U-Boot-Env";
+					reg = <0x00090000 0x00010000>;
+					read-only;
+				};
+				partition at 3 {
+					label = "Kernel";
+					reg = <0x000a0000 0x00280000>;
+				};
+				partition at 4 {
+					label = "Filesystem";
+					reg = <0x00220000 0x00400000>;
+				};
+				partition at 5 {
+					label = "MAC-Address";
+					reg = <0x00620000 0x00010000>;
+					read-only;
+				};
+			};
+		};
 	};
 	nand_cs3 at 62000000 {
 		status = "okay";
-- 
1.7.4.1

[PATCH 4/4] ARM: davinci: da850-evm: add SPI flash support

[Sekhar Nori]

On 2/25/2013 4:14 PM, Manjunathappa, Prakash wrote:
> Enable m25p80 SPI flash support on da850-EVM. Also
> add partition information of SPI flash.
> 
> Signed-off-by: Manjunathappa, Prakash <prakash.pm@ti.com>
> ---
>  arch/arm/boot/dts/da850-evm.dts |   40 +++++++++++++++++++++++++++++++++++++++
>  1 files changed, 40 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/da850-evm.dts b/arch/arm/boot/dts/da850-evm.dts
> index 78c8e54..1a28d43 100644
> --- a/arch/arm/boot/dts/da850-evm.dts
> +++ b/arch/arm/boot/dts/da850-evm.dts
> @@ -46,6 +46,46 @@
>  			pinctrl-names = "default";
>  			pinctrl-0 = <&mmc0_pins>;
>  		};
> +		spi1: spi at 1f0e000 {
> +			status = "okay";
> +			pinctrl-names = "default";
> +			pinctrl-0 = <&spi1_pins>;
> +			flash: m25p80 at 0 {
> +				#address-cells = <1>;
> +				#size-cells = <1>;
> +				compatible = "m25p80";

Are you sure there is a m25p80 part on these boards? On my board using
this patch I get:

m25p80 spi32766.0: found m25p64, expected m25p80

I can access the flash just fine though.

Thanks,
Sekhar

[PATCH 4/4] ARM: davinci: da850-evm: add SPI flash support

[Manjunathappa, Prakash]

On Wed, Feb 27, 2013 at 13:55:09, Nori, Sekhar wrote:
> On 2/25/2013 4:14 PM, Manjunathappa, Prakash wrote:
> > Enable m25p80 SPI flash support on da850-EVM. Also
> > add partition information of SPI flash.
> > 
> > Signed-off-by: Manjunathappa, Prakash <prakash.pm@ti.com>
> > ---
> >  arch/arm/boot/dts/da850-evm.dts |   40 +++++++++++++++++++++++++++++++++++++++
> >  1 files changed, 40 insertions(+), 0 deletions(-)
> > 
> > diff --git a/arch/arm/boot/dts/da850-evm.dts b/arch/arm/boot/dts/da850-evm.dts
> > index 78c8e54..1a28d43 100644
> > --- a/arch/arm/boot/dts/da850-evm.dts
> > +++ b/arch/arm/boot/dts/da850-evm.dts
> > @@ -46,6 +46,46 @@
> >  			pinctrl-names = "default";
> >  			pinctrl-0 = <&mmc0_pins>;
> >  		};
> > +		spi1: spi at 1f0e000 {
> > +			status = "okay";
> > +			pinctrl-names = "default";
> > +			pinctrl-0 = <&spi1_pins>;
> > +			flash: m25p80 at 0 {
> > +				#address-cells = <1>;
> > +				#size-cells = <1>;
> > +				compatible = "m25p80";
> 
> Are you sure there is a m25p80 part on these boards? On my board using
> this patch I get:
> 
> m25p80 spi32766.0: found m25p64, expected m25p80
> 

On my board also I see this warning. Also there is mistake in filesystem
partition information specified in this patch, will correct it in next
version of patch.

Thanks,
Prakash

> I can access the flash just fine though.
> 
> Thanks,
> Sekhar
> 

[PATCH 0/4] Enable SPI flash support on da850-evm DT kernel

[Sekhar Nori]

On 2/25/2013 4:14 PM, Manjunathappa, Prakash wrote:
> Patch enables support for m25p80 SPI flash support on
> da850-EVM.
> 
> Testing information:
> da850-evm comes with partitions specified in DT blob.
> Able to mount/umount and create/delete files on filesystem partition.
> 
> Depends on below patch in spi-next branch of git://git.secretlab.ca/git/linux-2.6.git.
> "spi/davinci: add OF support for the spi controller"
> 
> Applies on top of below patch under community review:
> http://www.mail-archive.com/davinci-linux-open-source at linux.davincidsp.com/msg25184.html

The series looks good to me except a minor comment I gave on 4/4. Patch
1/4 should be picked by Grant (ideally before v3.9-rc1). I will queue
rest of patches for v3.10.

Thanks,
Sekhar

[PATCH 0/4] Enable SPI flash support on da850-evm DT kernel

[Manjunathappa, Prakash]

On Wed, Feb 27, 2013 at 14:09:57, Nori, Sekhar wrote:
> On 2/25/2013 4:14 PM, Manjunathappa, Prakash wrote:
> > Patch enables support for m25p80 SPI flash support on
> > da850-EVM.
> > 
> > Testing information:
> > da850-evm comes with partitions specified in DT blob.
> > Able to mount/umount and create/delete files on filesystem partition.
> > 
> > Depends on below patch in spi-next branch of git://git.secretlab.ca/git/linux-2.6.git.
> > "spi/davinci: add OF support for the spi controller"
> > 

Grant,
I could not find binding documentation changes submitted with above patch.
I checked in spi-next and linux-next.

> > Applies on top of below patch under community review:
> > http://www.mail-archive.com/davinci-linux-open-source at linux.davincidsp.com/msg25184.html
> 
> The series looks good to me except a minor comment I gave on 4/4. Patch
> 1/4 should be picked by Grant (ideally before v3.9-rc1). I will queue
> rest of patches for v3.10.
> 

Thanks for review Sekhar, I will put your Acked-by for 1/4 for v2 of this series.

Regards,
Prakash

[PATCH 0/4] Enable SPI flash support on da850-evm DT kernel

[Grant Likely]

On Wed, 27 Feb 2013 11:32:39 +0000, "Manjunathappa, Prakash" <prakash.pm@ti.com> wrote:
> On Wed, Feb 27, 2013 at 14:09:57, Nori, Sekhar wrote:
> > On 2/25/2013 4:14 PM, Manjunathappa, Prakash wrote:
> > > Patch enables support for m25p80 SPI flash support on
> > > da850-EVM.
> > > 
> > > Testing information:
> > > da850-evm comes with partitions specified in DT blob.
> > > Able to mount/umount and create/delete files on filesystem partition.
> > > 
> > > Depends on below patch in spi-next branch of git://git.secretlab.ca/git/linux-2.6.git.
> > > "spi/davinci: add OF support for the spi controller"
> > > 
> 
> Grant,
> I could not find binding documentation changes submitted with above patch.
> I checked in spi-next and linux-next.

It must have been missed then. It happens sometimes. Can someone submit
a fixup patch please?

Thanks,
g.

[PATCH 0/4] Enable SPI flash support on da850-evm DT kernel

[Manjunathappa, Prakash]

Hi Grant,

On Sun, Mar 03, 2013 at 04:43:55, Grant Likely wrote:
> On Wed, 27 Feb 2013 11:32:39 +0000, "Manjunathappa, Prakash" <prakash.pm@ti.com> wrote:
> > On Wed, Feb 27, 2013 at 14:09:57, Nori, Sekhar wrote:
> > > On 2/25/2013 4:14 PM, Manjunathappa, Prakash wrote:
> > > > Patch enables support for m25p80 SPI flash support on
> > > > da850-EVM.
> > > > 
> > > > Testing information:
> > > > da850-evm comes with partitions specified in DT blob.
> > > > Able to mount/umount and create/delete files on filesystem partition.
> > > > 
> > > > Depends on below patch in spi-next branch of git://git.secretlab.ca/git/linux-2.6.git.
> > > > "spi/davinci: add OF support for the spi controller"
> > > > 
> > 
> > Grant,
> > I could not find binding documentation changes submitted with above patch.
> > I checked in spi-next and linux-next.
> 
> It must have been missed then. It happens sometimes. Can someone submit
> a fixup patch please?
> 

I have taken care in my next version of this series.

Thanks,
Prakash