From mboxrd@z Thu Jan 1 00:00:00 1970 From: Shawn Guo Subject: [PATCH] mtd/m25p80: add device tree probe support Date: Mon, 25 Jul 2011 21:37:43 +0800 Message-ID: <1311601063-16581-1-git-send-email-shawn.guo@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org Sender: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org To: linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org Cc: Artem Bityutskiy , patches-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org List-Id: devicetree@vger.kernel.org It adds device tree probe support for m25p80 driver. Signed-off-by: Shawn Guo Cc: Grant Likely Cc: Artem Bityutskiy --- Documentation/devicetree/bindings/mtd/st-m25p.txt | 14 ++++++++++++++ drivers/mtd/devices/m25p80.c | 12 ++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) create mode 100644 Documentation/devicetree/bindings/mtd/st-m25p.txt diff --git a/Documentation/devicetree/bindings/mtd/st-m25p.txt b/Documentation/devicetree/bindings/mtd/st-m25p.txt new file mode 100644 index 0000000..a8c0485 --- /dev/null +++ b/Documentation/devicetree/bindings/mtd/st-m25p.txt @@ -0,0 +1,14 @@ +* STMicroelectronics SPI Flash + +Required properties: +- compatible : "st,", "st,m25p". + +Examples: + +flash: m25p32@1 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "st,m25p32", "st,m25p"; + spi-max-frequency = <20000000>; + reg = <1>; +}; diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index e6ba034..d9d4101 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -767,6 +768,16 @@ static const struct spi_device_id m25p_ids[] = { }; MODULE_DEVICE_TABLE(spi, m25p_ids); +#ifdef CONFIG_OF +static const struct of_device_id m25p_dt_ids[] = { + { .compatible = "st,m25p", }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, m25p_dt_ids); +#else +#define m25p_dt_ids NULL +#endif + static const struct spi_device_id *__devinit jedec_probe(struct spi_device *spi) { int tmp; @@ -986,6 +997,7 @@ static struct spi_driver m25p80_driver = { .name = "m25p80", .bus = &spi_bus_type, .owner = THIS_MODULE, + .of_match_table = m25p_dt_ids, }, .id_table = m25p_ids, .probe = m25p_probe, -- 1.7.4.1