Certain EEPROMS have a size that is larger than the number of address bytes would allow, and store the MSB of the address in bit 3 of the instruction byte. This can be described in platform data using EE_INSTR_BIT3_IS_ADDR, or in DT using the obsolete legacy "at25,addr-mode" property. But currently there exists no non-deprecated way to describe this in DT. Hence extend the existing "address-width" DT property to allow specifying 9, 17, or 25 address bits, and enable support for that in the driver. Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx> --- EEPROMs using 9 address bits are common (e.g. M95040, 25AA040/25LC040). Do EEPROMs using 17 or 25 address bits, as mentioned in include/linux/spi/eeprom.h, really exist? Or should we just limit it to a single odd value (9 bits)? --- Documentation/devicetree/bindings/eeprom/at25.txt | 4 +++- drivers/misc/eeprom/at25.c | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/eeprom/at25.txt b/Documentation/devicetree/bindings/eeprom/at25.txt index 1d3447165c374f67..d00779e4ab4377b9 100644 --- a/Documentation/devicetree/bindings/eeprom/at25.txt +++ b/Documentation/devicetree/bindings/eeprom/at25.txt @@ -6,7 +6,9 @@ Required properties: - 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) +- address-width : number of address bits (one of 8, 9, 16, 17, 24, or 25). + For odd values, the MSB of the address is sent as bit 3 of the instruction + byte, before the address byte(s). Optional properties: - spi-cpha : SPI shifted clock phase, as per spi-bus bindings. diff --git a/drivers/misc/eeprom/at25.c b/drivers/misc/eeprom/at25.c index 5afe4cd165699060..a50a0f16fa0e1d1d 100644 --- a/drivers/misc/eeprom/at25.c +++ b/drivers/misc/eeprom/at25.c @@ -275,6 +275,10 @@ static int at25_fw_to_chip(struct device *dev, struct spi_eeprom *chip) "Error: missing \"address-width\" property\n"); return -ENODEV; } + if (val & 1) { + chip->flags |= EE_INSTR_BIT3_IS_ADDR; + val -= 1; + } switch (val) { case 8: chip->flags |= EE_ADDR1; -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html