From 1173c20679475f39bfcbf07a2edde5ee05e197e2 Mon Sep 17 00:00:00 2001
From: Stanislav Galabov <sgalabov@FreeBSD.org>
Date: Fri, 15 Apr 2016 15:26:31 +0000
Subject: [PATCH] Make mx25l compatible with jedec,spi-nor as well

A lot of dts files define the SPI flashes supported by mx25l as
compatible with 'jedec,spi-nor', so we add this to the mx25l
compat_data.

Approved by:	adrian (mentor)
Sponsored by:	Smartcom - Bulgaria AD
Differential Revision:	https://reviews.freebsd.org/D5962
---
 sys/dev/flash/mx25l.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sys/dev/flash/mx25l.c b/sys/dev/flash/mx25l.c
index 6b71340f2b0..96fb4a4907a 100644
--- a/sys/dev/flash/mx25l.c
+++ b/sys/dev/flash/mx25l.c
@@ -432,6 +432,12 @@ mx25l_set_4b_mode(device_t dev, uint8_t command)
 	return (err);
 }
 
+static struct ofw_compat_data compat_data[] = {
+	{ "st,m25p",		1 },
+	{ "jedec,spi-nor",	1 },
+	{ NULL,			0 },
+};
+
 static int
 mx25l_probe(device_t dev)
 {
@@ -439,7 +445,7 @@ mx25l_probe(device_t dev)
 #ifdef FDT
 	if (!ofw_bus_status_okay(dev))
 		return (ENXIO);
-	if (!ofw_bus_is_compatible(dev, "st,m25p"))
+	if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0)
 		return (ENXIO);
 #endif
 	device_set_desc(dev, "M25Pxx Flash Family");