[PATCH 1/2] ARM: imx6q-sabrelite.dts: Add SPI NOR support

[PATCH 1/2] ARM: imx6q-sabrelite.dts: Add SPI NOR support

[Fabio Estevam]

mx6qsabrelite has a sst25vf016b SPI NOR flash connected to eCSPI1.

Add support for it.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 arch/arm/boot/dts/imx6q-sabrelite.dts |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/imx6q-sabrelite.dts b/arch/arm/boot/dts/imx6q-sabrelite.dts
index 4663a4e..35be687 100644
--- a/arch/arm/boot/dts/imx6q-sabrelite.dts
+++ b/arch/arm/boot/dts/imx6q-sabrelite.dts
@@ -22,6 +22,23 @@
 	};
 
 	soc {
+		aips-bus at 02000000 { /* AIPS1 */
+			spba-bus at 02000000 {
+				ecspi at 02008000 { /* eCSPI1 */
+					fsl,spi-num-chipselects = <1>;
+					cs-gpios = <&gpio3 19 0>;
+					status = "okay";
+
+					flash: m25p80 at 0 {
+						compatible = "sst,sst25vf016b";
+						spi-max-frequency = <20000000>;
+						reg = <0>;
+					};
+				};
+			};
+
+		};
+
 		aips-bus at 02100000 { /* AIPS2 */
 			enet at 02188000 {
 				phy-mode = "rgmii";
-- 
1.7.1

[PATCH 2/2] ARM: imx_v6_v7_defconfig: Add SPI NOR support

[Fabio Estevam]

Add SPI NOR support in defconfig.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 arch/arm/configs/imx_v6_v7_defconfig |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index ff562c9..0a0eacb 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -64,6 +64,13 @@ CONFIG_IPV6=y
 # CONFIG_WIRELESS is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_MTD=y
+CONFIG_MTD_OF_PARTS=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_DATAFLASH=y
+CONFIG_MTD_M25P80=y
+CONFIG_M25PXX_USE_FAST_READ=y
+CONFIG_MTD_SST25L=y
 # CONFIG_STANDALONE is not set
 CONFIG_CONNECTOR=y
 CONFIG_BLK_DEV_LOOP=y
-- 
1.7.1

[PATCH 2/2] ARM: imx_v6_v7_defconfig: Add SPI NOR support

[Shawn Guo]

On Tue, Apr 24, 2012 at 08:35:37PM -0300, Fabio Estevam wrote:
> Add SPI NOR support in defconfig.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
>  arch/arm/configs/imx_v6_v7_defconfig |    7 +++++++
>  1 files changed, 7 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
> index ff562c9..0a0eacb 100644
> --- a/arch/arm/configs/imx_v6_v7_defconfig
> +++ b/arch/arm/configs/imx_v6_v7_defconfig
> @@ -64,6 +64,13 @@ CONFIG_IPV6=y
>  # CONFIG_WIRELESS is not set
>  CONFIG_DEVTMPFS=y
>  CONFIG_DEVTMPFS_MOUNT=y
> +CONFIG_MTD=y
> +CONFIG_MTD_OF_PARTS=y
> +CONFIG_MTD_CHAR=y
> +CONFIG_MTD_DATAFLASH=y
> +CONFIG_MTD_M25P80=y
> +CONFIG_M25PXX_USE_FAST_READ=y

I did not see this line in my savedefconfig generated from the .config
with your patch applied.

Regards,
Shawn

> +CONFIG_MTD_SST25L=y
>  # CONFIG_STANDALONE is not set
>  CONFIG_CONNECTOR=y
>  CONFIG_BLK_DEV_LOOP=y
> -- 
> 1.7.1

[PATCH 1/2] ARM: imx6q-sabrelite.dts: Add SPI NOR support

[Sascha Hauer]

On Tue, Apr 24, 2012 at 08:35:36PM -0300, Fabio Estevam wrote:
> mx6qsabrelite has a sst25vf016b SPI NOR flash connected to eCSPI1.
> 
> Add support for it.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Shawn, are you ok with this? If yes I would take this into my queue

Sascha

> ---
>  arch/arm/boot/dts/imx6q-sabrelite.dts |   17 +++++++++++++++++
>  1 files changed, 17 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/imx6q-sabrelite.dts b/arch/arm/boot/dts/imx6q-sabrelite.dts
> index 4663a4e..35be687 100644
> --- a/arch/arm/boot/dts/imx6q-sabrelite.dts
> +++ b/arch/arm/boot/dts/imx6q-sabrelite.dts
> @@ -22,6 +22,23 @@
>  	};
>  
>  	soc {
> +		aips-bus at 02000000 { /* AIPS1 */
> +			spba-bus at 02000000 {
> +				ecspi at 02008000 { /* eCSPI1 */
> +					fsl,spi-num-chipselects = <1>;
> +					cs-gpios = <&gpio3 19 0>;
> +					status = "okay";
> +
> +					flash: m25p80 at 0 {
> +						compatible = "sst,sst25vf016b";
> +						spi-max-frequency = <20000000>;
> +						reg = <0>;
> +					};
> +				};
> +			};
> +
> +		};
> +
>  		aips-bus at 02100000 { /* AIPS2 */
>  			enet at 02188000 {
>  				phy-mode = "rgmii";
> -- 
> 1.7.1
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

[PATCH 1/2] ARM: imx6q-sabrelite.dts: Add SPI NOR support

[Shawn Guo]

On Thu, Apr 26, 2012 at 10:16:37AM +0200, Sascha Hauer wrote:
> On Tue, Apr 24, 2012 at 08:35:36PM -0300, Fabio Estevam wrote:
> > mx6qsabrelite has a sst25vf016b SPI NOR flash connected to eCSPI1.
> > 
> > Add support for it.
> > 
> > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> 
> Shawn, are you ok with this? If yes I would take this into my queue
> 
Then please take the pull request below. It contains my collecting of
imx dts changes.

Regards,
Shawn

---

The following changes since commit dd775ae2549217d3ae09363e3edb305d0fa19928:

  Linux 3.4-rc1 (2012-03-31 16:24:09 -0700)

are available in the git repository at:
  git://git.linaro.org/people/shawnguo/linux-2.6.git imx/dt

Fabio Estevam (3):
      ARM: dts: imx: Remove bootargs field
      ARM: imx6q-arm2: Remove hardcoded mac address
      ARM: dts: Add basic support for imx6q-sabresd

Shawn Guo (1):
      ARM: imx: rename uart and fec device tree nodes

Ying-Chun Liu (PaulLiu) (1):
      ARM: dts: imx6q: add anatop regulators

 Documentation/devicetree/bindings/arm/fsl.txt      |    4 +
 Documentation/devicetree/bindings/net/fsl-fec.txt  |    2 +-
 .../bindings/tty/serial/fsl-imx-uart.txt           |    2 +-
 arch/arm/boot/dts/imx27-phytec-phycore.dts         |    8 +-
 arch/arm/boot/dts/imx27.dtsi                       |   14 ++--
 arch/arm/boot/dts/imx51-babbage.dts                |   12 +--
 arch/arm/boot/dts/imx51.dtsi                       |    8 +-
 arch/arm/boot/dts/imx53-ard.dts                    |    6 +-
 arch/arm/boot/dts/imx53-evk.dts                    |    8 +--
 arch/arm/boot/dts/imx53-qsb.dts                    |    8 +--
 arch/arm/boot/dts/imx53-smd.dts                    |   12 +--
 arch/arm/boot/dts/imx53.dtsi                       |   12 ++--
 arch/arm/boot/dts/imx6q-arm2.dts                   |    9 +--
 arch/arm/boot/dts/imx6q-sabrelite.dts              |    4 +-
 arch/arm/boot/dts/imx6q-sabresd.dts                |   53 +++++++++++
 arch/arm/boot/dts/imx6q.dtsi                       |   96 ++++++++++++++++++--
 arch/arm/mach-imx/Makefile.boot                    |    3 +-
 arch/arm/mach-imx/clock-imx6q.c                    |   12 ++--
 arch/arm/mach-imx/mach-imx6q.c                     |    1 +
 19 files changed, 196 insertions(+), 78 deletions(-)
 create mode 100644 arch/arm/boot/dts/imx6q-sabresd.dts

[PATCH 1/2] ARM: imx6q-sabrelite.dts: Add SPI NOR support

[Shawn Guo]

On Tue, Apr 24, 2012 at 08:35:36PM -0300, Fabio Estevam wrote:
> mx6qsabrelite has a sst25vf016b SPI NOR flash connected to eCSPI1.
> 
> Add support for it.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Acked-by: Shawn Guo <shawn.guo@linaro.org>

One question below though:

I applied both patches and see the following modprobe error message
with my testing.  Any relevance, or I missed something?

spi_imx 2008000.ecspi: master is unqueued, this is deprecated
modprobe: FATAL: Could not load /lib/modules/3.4.0-rc4+/modules.dep: No such fil
e or directory

m25p80 spi32766.0: sst25vf016b (2048 Kbytes)
modprobe: FATAL: Could not load /lib/modules/3.4.0-rc4+/modules.dep: No such fil
e or directory

Regards,
Shawn

[PATCH 1/2] ARM: imx6q-sabrelite.dts: Add SPI NOR support

[Fabio Estevam]

On Fri, Apr 27, 2012 at 12:44 AM, Shawn Guo <shawn.guo@linaro.org> wrote:

> I applied both patches and see the following modprobe error message
> with my testing. ?Any relevance, or I missed something?
>
> spi_imx 2008000.ecspi: master is unqueued, this is deprecated

This happens in imx-spi driver and I have reported it in the spi-devel list:
http://www.mail-archive.com/spi-devel-general at lists.sourceforge.net/msg08019.html

> modprobe: FATAL: Could not load /lib/modules/3.4.0-rc4+/modules.dep: No such fil

I have only tested it as built-in.

Regards,

Fabio Estevam

[PATCH 1/2] ARM: imx6q-sabrelite.dts: Add SPI NOR support

[Shawn Guo]

On Fri, Apr 27, 2012 at 12:51:01AM -0300, Fabio Estevam wrote:
> On Fri, Apr 27, 2012 at 12:44 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
> 
> > I applied both patches and see the following modprobe error message
> > with my testing. ?Any relevance, or I missed something?
> >
> > spi_imx 2008000.ecspi: master is unqueued, this is deprecated
> 
> This happens in imx-spi driver and I have reported it in the spi-devel list:
> http://www.mail-archive.com/spi-devel-general at lists.sourceforge.net/msg08019.html
> 
I'm fine with that, since it's an info printed by spi core to draw
people's attention on purpose.

> > modprobe: FATAL: Could not load /lib/modules/3.4.0-rc4+/modules.dep: No such fil
> 
> I have only tested it as built-in.
> 
The problem is we do not have this error message before applying these
two patches, while we are seeing the message with your patches applied.
What I am saying is your changes on defconfig should not introduce any
message like that.

-- 
Regards,
Shawn

[PATCH 1/2] ARM: imx6q-sabrelite.dts: Add SPI NOR support

[Uwe Kleine-König]

On Fri, Apr 27, 2012 at 01:05:51PM +0800, Shawn Guo wrote:
> On Fri, Apr 27, 2012 at 12:51:01AM -0300, Fabio Estevam wrote:
> > On Fri, Apr 27, 2012 at 12:44 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
> > 
> > > I applied both patches and see the following modprobe error message
> > > with my testing. ?Any relevance, or I missed something?
> > >
> > > spi_imx 2008000.ecspi: master is unqueued, this is deprecated
> > 
> > This happens in imx-spi driver and I have reported it in the spi-devel list:
> > http://www.mail-archive.com/spi-devel-general at lists.sourceforge.net/msg08019.html
> > 
> I'm fine with that, since it's an info printed by spi core to draw
> people's attention on purpose.
> 
> > > modprobe: FATAL: Could not load /lib/modules/3.4.0-rc4+/modules.dep: No such fil
> > 
> > I have only tested it as built-in.
> > 
> The problem is we do not have this error message before applying these
> two patches, while we are seeing the message with your patches applied.
> What I am saying is your changes on defconfig should not introduce any
> message like that.
This seems to me to be a userspace problem? My guess is applying the
patch changed the kernel version (appends '+') and you didn't run make
modules_install and/or depmod?!

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[PATCH 1/2] ARM: imx6q-sabrelite.dts: Add SPI NOR support

[Shawn Guo]

On Fri, Apr 27, 2012 at 08:27:32AM +0200, Uwe Kleine-K?nig wrote:
> This seems to me to be a userspace problem? My guess is applying the
> patch changed the kernel version (appends '+') and you didn't run make
> modules_install and/or depmod?!
> 
Hmm, what the modules are we missing here?  That's actually my question.
Fabio, Uwe, Sascha, you do not see this error message with your testing?

-- 
Regards,
Shawn

[PATCH 1/2] ARM: imx6q-sabrelite.dts: Add SPI NOR support

[Sascha Hauer]

On Fri, Apr 27, 2012 at 03:35:48PM +0800, Shawn Guo wrote:
> On Fri, Apr 27, 2012 at 08:27:32AM +0200, Uwe Kleine-K?nig wrote:
> > This seems to me to be a userspace problem? My guess is applying the
> > patch changed the kernel version (appends '+') and you didn't run make
> > modules_install and/or depmod?!
> > 
> Hmm, what the modules are we missing here?  That's actually my question.
> Fabio, Uwe, Sascha, you do not see this error message with your testing?

Every imx spi user (in fact most spi users no matter which driver)
will see this message.

See:

commit ffbbdd21329f3e15eeca6df2d4bc11c04d9d91c0
Author: Linus Walleij <linus.walleij@linaro.org>
Date:   Wed Feb 22 10:05:38 2012 +0100

    spi: create a message queueing infrastructure
    
    This rips the message queue in the PL022 driver out and pushes
    it into (optional) common infrastructure. Drivers that want to
    use the message pumping thread will need to define the new
    per-messags transfer methods and leave the deprecated transfer()
    method as NULL.
    
    Most of the design is described in the documentation changes that
    are included in this patch.
    
    Since there is a queue that need to be stopped when the system
    is suspending/resuming, two new calls are implemented for the
    device drivers to call in their suspend()/resume() functions:
    spi_master_suspend() and spi_master_resume().
    
    ChangeLog v1->v2:
    - Remove Kconfig entry and do not make the queue support optional
      at all, instead be more agressive and have it as part of the
      compulsory infrastructure.
    - If the .transfer() method is implemented, delete print a small
      deprecation notice and do not start the transfer pump.
    - Fix a bitrotted comment.
    ChangeLog v2->v3:
    - Fix up a problematic sequence courtesy of Chris Blair.
    - Stop rather than destroy the queue on suspend() courtesy of
      Chris Blair.
    
    Signed-off-by: Chris Blair <chris.blair@stericsson.com>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Tested-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Reviewed-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Grant Likely <grant.likely@secretlab.ca>


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

[PATCH 1/2] ARM: imx6q-sabrelite.dts: Add SPI NOR support

[Sascha Hauer]

On Fri, Apr 27, 2012 at 01:05:51PM +0800, Shawn Guo wrote:
> On Fri, Apr 27, 2012 at 12:51:01AM -0300, Fabio Estevam wrote:
> > On Fri, Apr 27, 2012 at 12:44 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
> > 
> > > I applied both patches and see the following modprobe error message
> > > with my testing. ?Any relevance, or I missed something?
> > >
> > > spi_imx 2008000.ecspi: master is unqueued, this is deprecated
> > 
> > This happens in imx-spi driver and I have reported it in the spi-devel list:
> > http://www.mail-archive.com/spi-devel-general at lists.sourceforge.net/msg08019.html
> > 
> I'm fine with that, since it's an info printed by spi core to draw
> people's attention on purpose.
> 
> > > modprobe: FATAL: Could not load /lib/modules/3.4.0-rc4+/modules.dep: No such fil
> > 
> > I have only tested it as built-in.
> > 
> The problem is we do not have this error message before applying these
> two patches, while we are seeing the message with your patches applied.
> What I am saying is your changes on defconfig should not introduce any
> message like that.

This is an orthogonal issue. It should be fixed in the SPI driver, but
it shouldn't be a reason to to not turn on SPI support.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

[PATCH 1/2] ARM: imx6q-sabrelite.dts: Add SPI NOR support

[Shawn Guo]

On Fri, Apr 27, 2012 at 09:19:55AM +0200, Sascha Hauer wrote:
> This is an orthogonal issue. It should be fixed in the SPI driver, but
> it shouldn't be a reason to to not turn on SPI support.
> 
I'm asking for explanation to the error message, and I did not say we
should block turning on SPI support.  Of course not, if this is an
orthogonal issue.  But again, what's the issue exactly?

-- 
Regards,
Shawn

[PATCH 1/2] ARM: imx6q-sabrelite.dts: Add SPI NOR support

[Linus Walleij]

On Fri, Apr 27, 2012 at 5:51 AM, Fabio Estevam <festevam@gmail.com> wrote:
> On Fri, Apr 27, 2012 at 12:44 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
>
>> I applied both patches and see the following modprobe error message
>> with my testing. ?Any relevance, or I missed something?
>>
>> spi_imx 2008000.ecspi: master is unqueued, this is deprecated
>
> This happens in imx-spi driver and I have reported it in the spi-devel list:
> http://www.mail-archive.com/spi-devel-general at lists.sourceforge.net/msg08019.html

Sorry for missing to reply on your mail on how to fix it, will do that now!

Yours,
Linus Walleij

[PATCH v2 2/2] ARM: imx_v6_v7_defconfig: Add SPI NOR support

[Fabio Estevam]

Add SPI NOR support in defconfig.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v1:
- Drop CONFIG_M25PXX_USE_FAST_READ

 arch/arm/configs/imx_v6_v7_defconfig |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index ff562c9..b1d3675 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -64,6 +64,12 @@ CONFIG_IPV6=y
 # CONFIG_WIRELESS is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_MTD=y
+CONFIG_MTD_OF_PARTS=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_DATAFLASH=y
+CONFIG_MTD_M25P80=y
+CONFIG_MTD_SST25L=y
 # CONFIG_STANDALONE is not set
 CONFIG_CONNECTOR=y
 CONFIG_BLK_DEV_LOOP=y
-- 
1.7.1

[PATCH 1/2] ARM: imx6q-sabrelite.dts: Add SPI NOR support

[Shawn Guo]

On Tue, Apr 24, 2012 at 08:35:36PM -0300, Fabio Estevam wrote:
> mx6qsabrelite has a sst25vf016b SPI NOR flash connected to eCSPI1.
> 
> Add support for it.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Applied on my imx/dt branch, thanks.

Regards,
Shawn

> ---
>  arch/arm/boot/dts/imx6q-sabrelite.dts |   17 +++++++++++++++++
>  1 files changed, 17 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/imx6q-sabrelite.dts b/arch/arm/boot/dts/imx6q-sabrelite.dts
> index 4663a4e..35be687 100644
> --- a/arch/arm/boot/dts/imx6q-sabrelite.dts
> +++ b/arch/arm/boot/dts/imx6q-sabrelite.dts
> @@ -22,6 +22,23 @@
>  	};
>  
>  	soc {
> +		aips-bus at 02000000 { /* AIPS1 */
> +			spba-bus at 02000000 {
> +				ecspi at 02008000 { /* eCSPI1 */
> +					fsl,spi-num-chipselects = <1>;
> +					cs-gpios = <&gpio3 19 0>;
> +					status = "okay";
> +
> +					flash: m25p80 at 0 {
> +						compatible = "sst,sst25vf016b";
> +						spi-max-frequency = <20000000>;
> +						reg = <0>;
> +					};
> +				};
> +			};
> +
> +		};
> +
>  		aips-bus at 02100000 { /* AIPS2 */
>  			enet at 02188000 {
>  				phy-mode = "rgmii";
> -- 
> 1.7.1