Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79df8d27 authored by AnilKumar Ch's avatar AnilKumar Ch Committed by Greg Kroah-Hartman
Browse files

drivers/misc/lis3lv02d/lis3lv02d_spi.c: add lis3lv02d device tree init 



Add lis3lv02d device tree initialization code/API to take pdata from
device node.  Also remove CONFIG_OF ifdef from the driver, if CONFIG_OF is
not defined then OF APIs returns 0.

[akpm@linux-foundation.org: fix CONFIG_OF=n build[
Signed-off-by: default avatarAnilKumar Ch <anilkumar@ti.com>
Cc: Eric Piel <eric.piel@tremplin-utc.net>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0c83adba

drivers/misc/lis3lv02d/lis3lv02d_spi.c

+6 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/pm.h>

#include <linux/of.h>

#include <linux/of_platform.h>

#include <linux/of_device.h>



#include "lis3lv02d.h"
@@ -87,10 +88,13 @@ static int __devinit lis302dl_spi_probe(struct spi_device *spi) 
	lis3_dev.pdata		= spi->dev.platform_data;



#ifdef CONFIG_OF

	if (of_match_device(lis302dl_spi_dt_ids, &spi->dev))

	if (of_match_device(lis302dl_spi_dt_ids, &spi->dev)) {

		lis3_dev.of_node = spi->dev.of_node;

		ret = lis3lv02d_init_dt(&lis3_dev);

		if (ret)

			return ret;

	}

#endif



	spi_set_drvdata(spi, &lis3_dev);



	return lis3lv02d_init_device(&lis3_dev);