diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-10-14 09:32:53 -0600 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-11-09 21:41:28 -0700 |
| commit | eae6cb31d890e2860f9ce1b8ba73c27b6005af68 (patch) | |
| tree | c0e7984b6f3a872be3a0deeb088fb402e1e06cd8 /drivers/spi/xilinx_spi.h | |
| parent | 8fd8821b62397f8ddb7bfb23c3246a22770ab2ee (diff) | |
| download | op-kernel-dev-eae6cb31d890e2860f9ce1b8ba73c27b6005af68.zip op-kernel-dev-eae6cb31d890e2860f9ce1b8ba73c27b6005af68.tar.gz | |
spi/xilinx: merge OF support code into main driver
Now that the of_platform_bus_type has been merged with the platform
bus type, a single platform driver can handle both OF and non-OF use
cases. This patch merges the OF support into the platform driver.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Tested-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'drivers/spi/xilinx_spi.h')
| -rw-r--r-- | drivers/spi/xilinx_spi.h | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/drivers/spi/xilinx_spi.h b/drivers/spi/xilinx_spi.h deleted file mode 100644 index d710a33..0000000 --- a/drivers/spi/xilinx_spi.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Xilinx SPI device driver API and platform data header file - * - * Copyright (c) 2009 Intel Corporation - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#ifndef _XILINX_SPI_H_ -#define _XILINX_SPI_H_ - -#include <linux/spi/spi.h> -#include <linux/spi/spi_bitbang.h> - -#define XILINX_SPI_NAME "xilinx_spi" - -struct spi_master *xilinx_spi_init(struct device *dev, struct resource *mem, - u32 irq, s16 bus_num, int num_cs, int little_endian, int bits_per_word); - -void xilinx_spi_deinit(struct spi_master *master); -#endif |
