Pull SPI changes from Grant Likely: "Bug fixes and new features for SPI device drivers. Also move device tree support code out of drivers/of and into drivers/spi/spi.c where it makes more sense." * tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6: spi: By default setup spi_masters with 1 chipselect and dynamics bus number SPI: PRIMA2: use the newest APIs of PINCTRL to fix compiling errors spi/spi-fsl-spi: reference correct pdata in fsl_spi_cs_control spi: refactor spi-coldfire-qspi to use SPI queue framework. spi/omap2-mcspi: convert to the pump message infrastructure spi/rspi: add dmaengine support spi/topcliff: use correct __devexit_p annotation spi: Dont call prepare/unprepare transfer if not populated spi/ep93xx: clean probe/remove routines spi/devicetree: Move devicetree support code into spi directory spi: use module_pci_driver spi/omap2-mcspi: Trivial optimisation spi: omap2-mcspi: add support for pm_runtime autosuspend spi/omap: Remove bus_num usage for instance index OMAP : SPI : use devm_* functions spi: omap2-mcspi: convert to module_platform_driver spi: omap2-mcspi: make it behave as a module
Showing the changes to include (2 of 21 files). Show all
Unified · Split
| @@ -1,23 +0,0 @@ | ||
| 1 | −/* | |
| 2 | − * OpenFirmware SPI support routines | |
| 3 | − * Copyright (C) 2008 Secret Lab Technologies Ltd. | |
| 4 | − * | |
| 5 | − * Support routines for deriving SPI device attachments from the device | |
| 6 | − * tree. | |
| 7 | − */ | |
| 8 | − | |
| 9 | −#ifndef __LINUX_OF_SPI_H | |
| 10 | −#define __LINUX_OF_SPI_H | |
| 11 | − | |
| 12 | −#include <linux/spi/spi.h> | |
| 13 | − | |
| 14 | −#if defined(CONFIG_OF_SPI) || defined(CONFIG_OF_SPI_MODULE) | |
| 15 | −extern void of_register_spi_devices(struct spi_master *master); | |
| 16 | −#else | |
| 17 | −static inline void of_register_spi_devices(struct spi_master *master) | |
| 18 | −{ | |
| 19 | − return; | |
| 20 | −} | |
| 21 | −#endif /* CONFIG_OF_SPI */ | |
| 22 | − | |
| 23 | −#endif /* __LINUX_OF_SPI */ | |
| @@ -0,0 +1,31 @@ | ||
| 1 | +/* | |
| 2 | + * Renesas SPI driver | |
| 3 | + * | |
| 4 | + * Copyright (C) 2012 Renesas Solutions Corp. | |
| 5 | + * | |
| 6 | + * This program is free software; you can redistribute it and/or modify | |
| 7 | + * it under the terms of the GNU General Public License as published by | |
| 8 | + * the Free Software Foundation; version 2 of the License. | |
| 9 | + * | |
| 10 | + * This program is distributed in the hope that it will be useful, | |
| 11 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 13 | + * GNU General Public License for more details. | |
| 14 | + * | |
| 15 | + * You should have received a copy of the GNU General Public License | |
| 16 | + * along with this program; if not, write to the Free Software | |
| 17 | + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | |
| 18 | + * | |
| 19 | + */ | |
| 20 | + | |
| 21 | +#ifndef __LINUX_SPI_RENESAS_SPI_H__ | |
| 22 | +#define __LINUX_SPI_RENESAS_SPI_H__ | |
| 23 | + | |
| 24 | +struct rspi_plat_data { | |
| 25 | + unsigned int dma_tx_id; | |
| 26 | + unsigned int dma_rx_id; | |
| 27 | + | |
| 28 | + unsigned dma_width_16bit:1; /* DMAC read/write width = 16-bit */ | |
| 29 | +}; | |
| 30 | + | |
| 31 | +#endif | |