* [PATCH 0/2] SPI EEPROM / device tree interaction improvements.
@ 2012-08-22 19:03 David Daney
2012-08-22 19:03 ` [PATCH 1/2] misc/at25, dt: Improve at25 SPI eeprom device tree bindings David Daney
2012-08-22 19:03 ` [PATCH 2/2] misc/at25: Add an .id_table to at25 to facilitate driver loading and binding David Daney
0 siblings, 2 replies; 6+ messages in thread
From: David Daney @ 2012-08-22 19:03 UTC (permalink / raw)
To: devicetree-discuss, Grant Likely, Rob Herring
Cc: linux-kernel, David Daney, Greg Kroah-Hartman
From: David Daney <david.daney@cavium.com>
A couple of patches that make using SPI EEPROMs Real Easy for me.
David Daney (2):
misc/at25, dt: Improve at25 SPI eeprom device tree bindings.
misc/at25: Add an .id_table to at25 to facilitate driver loading and
binding.
Documentation/devicetree/bindings/misc/at25.txt | 34 ++++++---
drivers/misc/eeprom/at25.c | 91 ++++++++++++++++++-------
2 files changed, 89 insertions(+), 36 deletions(-)
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--
1.7.11.4
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/2] misc/at25, dt: Improve at25 SPI eeprom device tree bindings. 2012-08-22 19:03 [PATCH 0/2] SPI EEPROM / device tree interaction improvements David Daney @ 2012-08-22 19:03 ` David Daney 2012-09-05 22:57 ` Rob Herring 2012-08-22 19:03 ` [PATCH 2/2] misc/at25: Add an .id_table to at25 to facilitate driver loading and binding David Daney 1 sibling, 1 reply; 6+ messages in thread From: David Daney @ 2012-08-22 19:03 UTC (permalink / raw) To: devicetree-discuss, Grant Likely, Rob Herring Cc: linux-kernel, David Daney, Alexandre Pereira da Silva, Greg Kroah-Hartman, Michael Hennerich, Axel Lin From: David Daney <david.daney@cavium.com> Commit 002176db (misc: at25: Parse dt settings) added device tree bindings the differ significantly in style from the I2C EEPROM bindings and don't seem well vetted. Here I deprecate (but still support) the "at25,*" properties, and add what I hope is a better alternative. These new bindings also happen to be deployed in the field and were previously submitted for consideration here: https://lists.ozlabs.org/pipermail/devicetree-discuss/2012-May/015556.html The advantages of the new bindings are that they are similar to the I2C EEPROMs and they don't conflate read-only and the address width modes in a binary encoded blob. Signed-off-by: David Daney <david.daney@cavium.com> Cc: Alexandre Pereira da Silva <aletes.xgr@gmail.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Michael Hennerich <michael.hennerich@analog.com> Cc: Axel Lin <axel.lin@gmail.com> --- Documentation/devicetree/bindings/misc/at25.txt | 34 +++++++--- drivers/misc/eeprom/at25.c | 83 +++++++++++++++++-------- 2 files changed, 82 insertions(+), 35 deletions(-) diff --git a/Documentation/devicetree/bindings/misc/at25.txt b/Documentation/devicetree/bindings/misc/at25.txt index ab3c327..1d34471 100644 --- a/Documentation/devicetree/bindings/misc/at25.txt +++ b/Documentation/devicetree/bindings/misc/at25.txt @@ -1,21 +1,35 @@ -Atmel AT25 eeprom +EEPROMs (SPI) compatible with Atmel at25. Required properties: - compatible : "atmel,at25". - reg : chip select number - spi-max-frequency : max spi frequency to use +- pagesize : size of the eeprom page +- size : total eeprom size in bytes +- address-width : number of address bits (one of 8, 16, or 24) +Optional properties: +- spi-cpha : SPI shifted clock phase, as per spi-bus bindings. +- spi-cpol : SPI inverse clock polarity, as per spi-bus bindings. +- read-only : this parameter-less property disables writes to the eeprom + +Obsolete legacy properties are can be used in place of "size", "pagesize", +"address-width", and "read-only": - at25,byte-len : total eeprom size in bytes - at25,addr-mode : addr-mode flags, as defined in include/linux/spi/eeprom.h - at25,page-size : size of the eeprom page -Examples: -at25@0 { - compatible = "atmel,at25"; - reg = <0> - spi-max-frequency = <5000000>; +Additional compatible properties are also allowed. + +Example: + at25@0 { + compatible = "atmel,at25", "st,m95256"; + reg = <0> + spi-max-frequency = <5000000>; + spi-cpha; + spi-cpol; - at25,byte-len = <0x8000>; - at25,addr-mode = <2>; - at25,page-size = <64>; -}; + pagesize = <64>; + size = <32768>; + address-width = <16>; + }; diff --git a/drivers/misc/eeprom/at25.c b/drivers/misc/eeprom/at25.c index 25003d6..4ed93dd 100644 --- a/drivers/misc/eeprom/at25.c +++ b/drivers/misc/eeprom/at25.c @@ -302,6 +302,61 @@ static ssize_t at25_mem_write(struct memory_accessor *mem, const char *buf, /*-------------------------------------------------------------------------*/ +static int at25_np_to_chip(struct device *dev, + struct device_node *np, + struct spi_eeprom *chip) +{ + u32 val; + + memset(chip, 0, sizeof(*chip)); + strncpy(chip->name, np->name, sizeof(chip->name)); + + if (of_property_read_u32(np, "size", &val) == 0 || + of_property_read_u32(np, "at25,byte-len", &val) == 0) { + chip->byte_len = val; + } else { + dev_err(dev, "Error: missing \"size\" property\n"); + return -ENODEV; + } + + if (of_property_read_u32(np, "pagesize", &val) == 0 || + of_property_read_u32(np, "at25,page-size", &val) == 0) { + chip->page_size = (u16)val; + } else { + dev_err(dev, "Error: missing \"pagesize\" property\n"); + return -ENODEV; + } + + if (of_property_read_u32(np, "at25,addr-mode", &val) == 0) { + chip->flags = (u16)val; + } else { + if (of_property_read_u32(np, "address-width", &val)) { + dev_err(dev, + "Error: missing \"address-width\" property\n"); + return -ENODEV; + } + switch (val) { + case 8: + chip->flags |= EE_ADDR1; + break; + case 16: + chip->flags |= EE_ADDR2; + break; + case 24: + chip->flags |= EE_ADDR3; + break; + default: + dev_err(dev, + "Error: bad \"address-width\" property: %u\n", + val); + return -ENODEV; + } + if (of_find_property(np, "read-only", NULL)) + chip->flags |= EE_READONLY; + } + return 0; +} + static int at25_probe(struct spi_device *spi) { struct at25_data *at25 = NULL; @@ -314,33 +369,11 @@ static int at25_probe(struct spi_device *spi) /* Chip description */ if (!spi->dev.platform_data) { if (np) { - u32 val; - - memset(&chip, 0, sizeof(chip)); - strncpy(chip.name, np->name, 10); - - err = of_property_read_u32(np, "at25,byte-len", &val); - if (err) { - dev_dbg(&spi->dev, "invalid chip dt description\n"); - goto fail; - } - chip.byte_len = val; - - err = of_property_read_u32(np, "at25,addr-mode", &val); - if (err) { - dev_dbg(&spi->dev, "invalid chip dt description\n"); - goto fail; - } - chip.flags = (u16)val; - - err = of_property_read_u32(np, "at25,page-size", &val); - if (err) { - dev_dbg(&spi->dev, "invalid chip dt description\n"); + err = at25_np_to_chip(&spi->dev, np, &chip); + if (err) goto fail; - } - chip.page_size = (u16)val; } else { - dev_dbg(&spi->dev, "no chip description\n"); + dev_err(&spi->dev, "Error: no chip description\n"); err = -ENODEV; goto fail; } -- 1.7.11.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] misc/at25, dt: Improve at25 SPI eeprom device tree bindings. 2012-08-22 19:03 ` [PATCH 1/2] misc/at25, dt: Improve at25 SPI eeprom device tree bindings David Daney @ 2012-09-05 22:57 ` Rob Herring 0 siblings, 0 replies; 6+ messages in thread From: Rob Herring @ 2012-09-05 22:57 UTC (permalink / raw) To: David Daney Cc: devicetree-discuss, Grant Likely, Michael Hennerich, David Daney, Greg Kroah-Hartman, linux-kernel, Axel Lin, Alexandre Pereira da Silva On 08/22/2012 02:03 PM, David Daney wrote: > From: David Daney <david.daney@cavium.com> > > Commit 002176db (misc: at25: Parse dt settings) added device tree > bindings the differ significantly in style from the I2C EEPROM > bindings and don't seem well vetted. Here I deprecate (but still > support) the "at25,*" properties, and add what I hope is a better > alternative. These new bindings also happen to be deployed in the > field and were previously submitted for consideration here: > > https://lists.ozlabs.org/pipermail/devicetree-discuss/2012-May/015556.html > > The advantages of the new bindings are that they are similar to the > I2C EEPROMs and they don't conflate read-only and the address width > modes in a binary encoded blob. > > Signed-off-by: David Daney <david.daney@cavium.com> > Cc: Alexandre Pereira da Silva <aletes.xgr@gmail.com> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: Michael Hennerich <michael.hennerich@analog.com> > Cc: Axel Lin <axel.lin@gmail.com> Acked-by: Rob Herring <rob.herring@calxeda.com> > --- > Documentation/devicetree/bindings/misc/at25.txt | 34 +++++++--- > drivers/misc/eeprom/at25.c | 83 +++++++++++++++++-------- > 2 files changed, 82 insertions(+), 35 deletions(-) > > diff --git a/Documentation/devicetree/bindings/misc/at25.txt b/Documentation/devicetree/bindings/misc/at25.txt > index ab3c327..1d34471 100644 > --- a/Documentation/devicetree/bindings/misc/at25.txt > +++ b/Documentation/devicetree/bindings/misc/at25.txt > @@ -1,21 +1,35 @@ > -Atmel AT25 eeprom > +EEPROMs (SPI) compatible with Atmel at25. > > Required properties: > - compatible : "atmel,at25". > - reg : chip select number > - spi-max-frequency : max spi frequency to use > +- pagesize : size of the eeprom page > +- size : total eeprom size in bytes > +- address-width : number of address bits (one of 8, 16, or 24) > > +Optional properties: > +- spi-cpha : SPI shifted clock phase, as per spi-bus bindings. > +- spi-cpol : SPI inverse clock polarity, as per spi-bus bindings. > +- read-only : this parameter-less property disables writes to the eeprom > + > +Obsolete legacy properties are can be used in place of "size", "pagesize", > +"address-width", and "read-only": > - at25,byte-len : total eeprom size in bytes > - at25,addr-mode : addr-mode flags, as defined in include/linux/spi/eeprom.h > - at25,page-size : size of the eeprom page > > -Examples: > -at25@0 { > - compatible = "atmel,at25"; > - reg = <0> > - spi-max-frequency = <5000000>; > +Additional compatible properties are also allowed. > + > +Example: > + at25@0 { > + compatible = "atmel,at25", "st,m95256"; > + reg = <0> > + spi-max-frequency = <5000000>; > + spi-cpha; > + spi-cpol; > > - at25,byte-len = <0x8000>; > - at25,addr-mode = <2>; > - at25,page-size = <64>; > -}; > + pagesize = <64>; > + size = <32768>; > + address-width = <16>; > + }; > diff --git a/drivers/misc/eeprom/at25.c b/drivers/misc/eeprom/at25.c > index 25003d6..4ed93dd 100644 > --- a/drivers/misc/eeprom/at25.c > +++ b/drivers/misc/eeprom/at25.c > @@ -302,6 +302,61 @@ static ssize_t at25_mem_write(struct memory_accessor *mem, const char *buf, > > /*-------------------------------------------------------------------------*/ > > +static int at25_np_to_chip(struct device *dev, > + struct device_node *np, > + struct spi_eeprom *chip) > +{ > + u32 val; > + > + memset(chip, 0, sizeof(*chip)); > + strncpy(chip->name, np->name, sizeof(chip->name)); > + > + if (of_property_read_u32(np, "size", &val) == 0 || > + of_property_read_u32(np, "at25,byte-len", &val) == 0) { > + chip->byte_len = val; > + } else { > + dev_err(dev, "Error: missing \"size\" property\n"); > + return -ENODEV; > + } > + > + if (of_property_read_u32(np, "pagesize", &val) == 0 || > + of_property_read_u32(np, "at25,page-size", &val) == 0) { > + chip->page_size = (u16)val; > + } else { > + dev_err(dev, "Error: missing \"pagesize\" property\n"); > + return -ENODEV; > + } > + > + if (of_property_read_u32(np, "at25,addr-mode", &val) == 0) { > + chip->flags = (u16)val; > + } else { > + if (of_property_read_u32(np, "address-width", &val)) { > + dev_err(dev, > + "Error: missing \"address-width\" property\n"); > + return -ENODEV; > + } > + switch (val) { > + case 8: > + chip->flags |= EE_ADDR1; > + break; > + case 16: > + chip->flags |= EE_ADDR2; > + break; > + case 24: > + chip->flags |= EE_ADDR3; > + break; > + default: > + dev_err(dev, > + "Error: bad \"address-width\" property: %u\n", > + val); > + return -ENODEV; > + } > + if (of_find_property(np, "read-only", NULL)) > + chip->flags |= EE_READONLY; > + } > + return 0; > +} > + > static int at25_probe(struct spi_device *spi) > { > struct at25_data *at25 = NULL; > @@ -314,33 +369,11 @@ static int at25_probe(struct spi_device *spi) > /* Chip description */ > if (!spi->dev.platform_data) { > if (np) { > - u32 val; > - > - memset(&chip, 0, sizeof(chip)); > - strncpy(chip.name, np->name, 10); > - > - err = of_property_read_u32(np, "at25,byte-len", &val); > - if (err) { > - dev_dbg(&spi->dev, "invalid chip dt description\n"); > - goto fail; > - } > - chip.byte_len = val; > - > - err = of_property_read_u32(np, "at25,addr-mode", &val); > - if (err) { > - dev_dbg(&spi->dev, "invalid chip dt description\n"); > - goto fail; > - } > - chip.flags = (u16)val; > - > - err = of_property_read_u32(np, "at25,page-size", &val); > - if (err) { > - dev_dbg(&spi->dev, "invalid chip dt description\n"); > + err = at25_np_to_chip(&spi->dev, np, &chip); > + if (err) > goto fail; > - } > - chip.page_size = (u16)val; > } else { > - dev_dbg(&spi->dev, "no chip description\n"); > + dev_err(&spi->dev, "Error: no chip description\n"); > err = -ENODEV; > goto fail; > } > ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] misc/at25: Add an .id_table to at25 to facilitate driver loading and binding. 2012-08-22 19:03 [PATCH 0/2] SPI EEPROM / device tree interaction improvements David Daney 2012-08-22 19:03 ` [PATCH 1/2] misc/at25, dt: Improve at25 SPI eeprom device tree bindings David Daney @ 2012-08-22 19:03 ` David Daney 2012-09-17 7:49 ` Ivo Sieben 1 sibling, 1 reply; 6+ messages in thread From: David Daney @ 2012-08-22 19:03 UTC (permalink / raw) To: devicetree-discuss, Grant Likely, Rob Herring; +Cc: linux-kernel, David Daney From: David Daney <david.daney@cavium.com> With this patch we get automatic driver loading and binding for device tree specified hardware typologies. Also recognize "st,m95256" devices as being compatible with the driver. Signed-off-by: David Daney <david.daney@cavium.com> --- drivers/misc/eeprom/at25.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/misc/eeprom/at25.c b/drivers/misc/eeprom/at25.c index 4ed93dd..bd4a6c7 100644 --- a/drivers/misc/eeprom/at25.c +++ b/drivers/misc/eeprom/at25.c @@ -470,12 +470,19 @@ static int __devexit at25_remove(struct spi_device *spi) } /*-------------------------------------------------------------------------*/ +static const struct spi_device_id at25_id[] = { + {"at25", 0}, + {"m95256", 0}, + { } +}; +MODULE_DEVICE_TABLE(spi, at25_id); static struct spi_driver at25_driver = { .driver = { .name = "at25", .owner = THIS_MODULE, }, + .id_table = at25_id, .probe = at25_probe, .remove = __devexit_p(at25_remove), }; @@ -485,4 +492,3 @@ module_spi_driver(at25_driver); MODULE_DESCRIPTION("Driver for most SPI EEPROMs"); MODULE_AUTHOR("David Brownell"); MODULE_LICENSE("GPL"); -MODULE_ALIAS("spi:at25"); -- 1.7.11.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] misc/at25: Add an .id_table to at25 to facilitate driver loading and binding. 2012-08-22 19:03 ` [PATCH 2/2] misc/at25: Add an .id_table to at25 to facilitate driver loading and binding David Daney @ 2012-09-17 7:49 ` Ivo Sieben 2012-09-17 17:06 ` David Daney 0 siblings, 1 reply; 6+ messages in thread From: Ivo Sieben @ 2012-09-17 7:49 UTC (permalink / raw) To: David Daney Cc: devicetree-discuss, Grant Likely, Rob Herring, linux-kernel, David Daney Hi, 2012/8/22 David Daney <ddaney.cavm@gmail.com>: > From: David Daney <david.daney@cavium.com> > > /*-------------------------------------------------------------------------*/ > +static const struct spi_device_id at25_id[] = { > + {"at25", 0}, > + {"m95256", 0}, > + { } > +}; > +MODULE_DEVICE_TABLE(spi, at25_id); I use this driver for the ST M95040, M95020 & M95010 eeprom devices. So wouldn't it be better to use the "famliy" name for these chips ("m95" instead of "m95256"). Regards, Ivo Sieben ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] misc/at25: Add an .id_table to at25 to facilitate driver loading and binding. 2012-09-17 7:49 ` Ivo Sieben @ 2012-09-17 17:06 ` David Daney 0 siblings, 0 replies; 6+ messages in thread From: David Daney @ 2012-09-17 17:06 UTC (permalink / raw) To: Ivo Sieben Cc: David Daney, devicetree-discuss, Grant Likely, Rob Herring, linux-kernel, David Daney On 09/17/2012 12:49 AM, Ivo Sieben wrote: > Hi, > > 2012/8/22 David Daney <ddaney.cavm@gmail.com>: >> From: David Daney <david.daney@cavium.com> >> >> /*-------------------------------------------------------------------------*/ >> +static const struct spi_device_id at25_id[] = { >> + {"at25", 0}, >> + {"m95256", 0}, >> + { } >> +}; >> +MODULE_DEVICE_TABLE(spi, at25_id); > > I use this driver for the ST M95040, M95020 & M95010 eeprom devices. > So wouldn't it be better to use the "famliy" name for these chips > ("m95" instead of "m95256"). > These are matched against device tree compatible properties. You could propose adding a generic "st,95xxx" compatible property and adding that to the at25_id list. But I don't think we want to remove "m95256", as we have deployed devices using this binding. David Daney ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-09-17 17:06 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2012-08-22 19:03 [PATCH 0/2] SPI EEPROM / device tree interaction improvements David Daney 2012-08-22 19:03 ` [PATCH 1/2] misc/at25, dt: Improve at25 SPI eeprom device tree bindings David Daney 2012-09-05 22:57 ` Rob Herring 2012-08-22 19:03 ` [PATCH 2/2] misc/at25: Add an .id_table to at25 to facilitate driver loading and binding David Daney 2012-09-17 7:49 ` Ivo Sieben 2012-09-17 17:06 ` David Daney
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).