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

Commit d57a4282 authored by Grant Likely's avatar Grant Likely
Browse files

spi/devicetree: Move devicetree support code into spi directory 



The SPI device tree support code isn't shared by any other subsystem.  It can
be moved into the core drivers/spi directory and the exported symbol can be
removed.

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Cc: Rob Herring <rob.herring@calxeda.com>
parent 8ebb35fd

drivers/of/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -67,12 +67,6 @@ config OF_NET 
	depends on NETDEVICES

	def_bool y



config OF_SPI

	def_tristate SPI

	depends on SPI && !SPARC

	help

	  OpenFirmware SPI accessors



config OF_MDIO

	def_tristate PHYLIB

	depends on PHYLIB

drivers/of/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ obj-$(CONFIG_OF_DEVICE) += device.o platform.o 
obj-$(CONFIG_OF_GPIO)   += gpio.o

obj-$(CONFIG_OF_I2C)	+= of_i2c.o

obj-$(CONFIG_OF_NET)	+= of_net.o

obj-$(CONFIG_OF_SPI)	+= of_spi.o

obj-$(CONFIG_OF_SELFTEST) += selftest.o

obj-$(CONFIG_OF_MDIO)	+= of_mdio.o

obj-$(CONFIG_OF_PCI)	+= of_pci.o

drivers/of/of_spi.c

deleted100644 → 0
+0 −99
Original line number Diff line number Diff line 
/*

 * SPI OF support routines

 * Copyright (C) 2008 Secret Lab Technologies Ltd.

 *

 * Support routines for deriving SPI device attachments from the device

 * tree.

 */



#include <linux/module.h>

#include <linux/of.h>

#include <linux/device.h>

#include <linux/spi/spi.h>

#include <linux/of_irq.h>

#include <linux/of_spi.h>



/**

 * of_register_spi_devices - Register child devices onto the SPI bus

 * @master:	Pointer to spi_master device

 *

 * Registers an spi_device for each child node of master node which has a 'reg'

 * property.

 */

void of_register_spi_devices(struct spi_master *master)

{

	struct spi_device *spi;

	struct device_node *nc;

	const __be32 *prop;

	int rc;

	int len;



	if (!master->dev.of_node)

		return;



	for_each_child_of_node(master->dev.of_node, nc) {

		/* Alloc an spi_device */

		spi = spi_alloc_device(master);

		if (!spi) {

			dev_err(&master->dev, "spi_device alloc error for %s\n",

				nc->full_name);

			spi_dev_put(spi);

			continue;

		}



		/* Select device driver */

		if (of_modalias_node(nc, spi->modalias,

				     sizeof(spi->modalias)) < 0) {

			dev_err(&master->dev, "cannot find modalias for %s\n",

				nc->full_name);

			spi_dev_put(spi);

			continue;

		}



		/* Device address */

		prop = of_get_property(nc, "reg", &len);

		if (!prop || len < sizeof(*prop)) {

			dev_err(&master->dev, "%s has no 'reg' property\n",

				nc->full_name);

			spi_dev_put(spi);

			continue;

		}

		spi->chip_select = be32_to_cpup(prop);



		/* Mode (clock phase/polarity/etc.) */

		if (of_find_property(nc, "spi-cpha", NULL))

			spi->mode |= SPI_CPHA;

		if (of_find_property(nc, "spi-cpol", NULL))

			spi->mode |= SPI_CPOL;

		if (of_find_property(nc, "spi-cs-high", NULL))

			spi->mode |= SPI_CS_HIGH;



		/* Device speed */

		prop = of_get_property(nc, "spi-max-frequency", &len);

		if (!prop || len < sizeof(*prop)) {

			dev_err(&master->dev, "%s has no 'spi-max-frequency' property\n",

				nc->full_name);

			spi_dev_put(spi);

			continue;

		}

		spi->max_speed_hz = be32_to_cpup(prop);



		/* IRQ */

		spi->irq = irq_of_parse_and_map(nc, 0);



		/* Store a pointer to the node in the device structure */

		of_node_get(nc);

		spi->dev.of_node = nc;



		/* Register the new device */

		request_module(spi->modalias);

		rc = spi_add_device(spi);

		if (rc) {

			dev_err(&master->dev, "spi_device register error %s\n",

				nc->full_name);

			spi_dev_put(spi);

		}



	}

}

EXPORT_SYMBOL(of_register_spi_devices);

drivers/spi/spi-fsl-espi.c

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <linux/mm.h>

#include <linux/of.h>

#include <linux/of_platform.h>

#include <linux/of_spi.h>

#include <linux/interrupt.h>

#include <linux/err.h>

#include <sysdev/fsl_soc.h>

drivers/spi/spi-fsl-lib.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <linux/dma-mapping.h>

#include <linux/mm.h>

#include <linux/of_platform.h>

#include <linux/of_spi.h>

#include <linux/spi/spi.h>

#include <sysdev/fsl_soc.h>



#include "spi-fsl-lib.h"