misc: at25: Make driver OF independent again

[ Upstream commit 5b557298d7d09cce04e0565a535fbca63661724a ]

The commit f60e7074902a ("misc: at25: Make use of device property API")
made a good job by enabling the driver for non-OF platforms, but the
recent commit 604288bc6196 ("nvmem: eeprom: at25: fix type compiler warnings")
brought that back.

Restore greatness of the driver once again.

Fixes: eab61fb1cc2e ("nvmem: eeprom: at25: fram discovery simplification")
Fixes: fd307a4ad332 ("nvmem: prepare basics for FRAM support")
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20211125212729.86585-2-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/misc/eeprom/at25.c b/drivers/misc/eeprom/at25.c
index b38978a3b3ffa4f9ab5ae8b86d366de9880fe21d..9193b812bc07e50a6b820555d22021e391b16503 100644 (file)
--- a/drivers/misc/eeprom/at25.c
+++ b/drivers/misc/eeprom/at25.c
@@ -17,8 +17,6 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/eeprom.h>
 #include <linux/property.h>
-#include <linux/of.h>
-#include <linux/of_device.h>
 #include <linux/math.h>
 
 /*
@@ -380,13 +378,14 @@ static int at25_probe(struct spi_device *spi)
        int                     sr;
        u8 id[FM25_ID_LEN];
        u8 sernum[FM25_SN_LEN];
+       bool is_fram;
        int i;
-       const struct of_device_id *match;
-       bool is_fram = 0;
 
-       match = of_match_device(of_match_ptr(at25_of_match), &spi->dev);
-       if (match && !strcmp(match->compatible, "cypress,fm25"))
-               is_fram = 1;
+       err = device_property_match_string(&spi->dev, "compatible", "cypress,fm25");
+       if (err >= 0)
+               is_fram = true;
+       else
+               is_fram = false;
 
        at25 = devm_kzalloc(&spi->dev, sizeof(struct at25_data), GFP_KERNEL);
        if (!at25)