[PATCH] mtd: spi-nor: Decouple SPI NOR's device_node from controller device

[Marek Vasut]

On Friday, August 21, 2015 at 04:15:11 PM, Jonas Gorski wrote:
> Hi,

Hi,

> On Fri, Aug 21, 2015 at 11:09 AM, Marek Vasut <marex at denx.de> wrote:
> > The problem this patch is trying to address is such, that SPI NOR flash
> > devices attached to a dedicated SPI NOR controller cannot read their
> > properties from the associated struct device_node.
> > 
> > A couple of facts first:
> > 1) Each SPI NOR flash has a struct spi_nor associated with it.
> > 2) Each SPI NOR flash has certain device properties associated
> > 
> >    with it, for example the OF property 'm25p,fast-read' is a
> >    good pick. These properties are used by the SPI NOR core to
> >    select which opcodes are sent to such SPI NOR flash. These
> >    properties are coming from spi_nor .dev->device_node .
> 
> dev->of_node

Guh, right, thanks :)

> > The problem is, that for SPI NOR controllers, the struct spi_nor .dev
> > element points to the struct device of the SPI NOR controller, not the
> > SPI NOR flash. Therefore, the associated dev->device_node also is the
> 
> dev->of_node

Yep, thanks :)

> > one of the controller and therefore the SPI NOR core code is trying to
> > parse the SPI NOR controller's properties, not the properties of the
> > SPI NOR flash.
> > 
> > Note: The m25p80 driver is not affected, because the controller and
> > 
> >       the flash are the same device, so the associated device_node
> >       of the controller and the flash are the same.
> > 
> > This patch adjusts the SPI NOR core such that the device_node is not
> > picked from spi_nor .dev directly, but from a new separate spi_nor .dn
> > element. This let's the SPI NOR controller drivers set up a different
> > spi_nor .dn element for each SPI NOR flash.
> > 
> > This patch also fixes the controller drivers to be compatible with
> > this modification and correctly set the spi_nor .dn element.
> > 
> > This patch is inspired by 5844feeaa4154d1c46d3462c7a4653d22356d8b4
> > mtd: nand: add common DT init code
> 
> I know that this commit named it dn for nand, but IMHO "dn" isn't a
> very readable member name, so I would suggest using something with
> "node" in it (just using of_node as well seems to be common). I see no
> place where the name length might become an issue.

I thought .dn was supposed to be abbrev for device_node ;-)

> > Signed-off-by: Marek Vasut <marex at denx.de>
> > Cc: Brian Norris <computersforpeace at gmail.com>
> > ---
> > 
> >  drivers/mtd/devices/m25p80.c      | 1 +
> >  drivers/mtd/spi-nor/fsl-quadspi.c | 1 +
> >  drivers/mtd/spi-nor/nxp-spifi.c   | 1 +
> >  include/linux/mtd/spi-nor.h       | 3 +++
> >  4 files changed, 6 insertions(+)
> > 
> > diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
> > index 9cd3631..725320f 100644
> > --- a/drivers/mtd/devices/m25p80.c
> > +++ b/drivers/mtd/devices/m25p80.c
> > @@ -202,6 +202,7 @@ static int m25p_probe(struct spi_device *spi)
> > 
> >         nor->dev = &spi->dev;
> >         nor->mtd = &flash->mtd;
> > 
> > +       nor->dn = &spi->dev.of_node;
> 
> drivers/mtd/devices/m25p80.c: In function 'm25p_probe':
> drivers/mtd/devices/m25p80.c:221:5: warning: assignment from
> incompatible pointer type [enabled by default]
> 
> this needs to be ... = spi->dev.of_node;

Right, thanks!

I'll wait for a bit to figure out if this approach is sensible and then
repost with the fixes.