spi/xilinx: fold platform_driver support into main body
This patch merges the platform driver support into the main body of xilinx_spi.c in preparation for merging the OF and non-OF support code. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Tested-by: Michal Simek <monstr@monstr.eu>
This commit is contained in:
Grant Likely
Родитель
91565c4068
Коммит
8fd8821b62
|
|
@ -368,13 +368,6 @@ config SPI_XILINX_OF
|
|||
help
|
||||
This is the OF driver for the SPI controller IP from the Xilinx EDK.
|
||||
|
||||
config SPI_XILINX_PLTFM
|
||||
tristate "Xilinx SPI controller platform device"
|
||||
depends on SPI_XILINX
|
||||
help
|
||||
This is the platform driver for the SPI controller IP
|
||||
from the Xilinx EDK.
|
||||
|
||||
config SPI_NUC900
|
||||
tristate "Nuvoton NUC900 series SPI"
|
||||
depends on ARCH_W90X900 && EXPERIMENTAL
|
||||
|
|
|
|||
|
|
@ -44,7 +44,6 @@ obj-$(CONFIG_SPI_TOPCLIFF_PCH) += spi_topcliff_pch.o
|
|||
obj-$(CONFIG_SPI_TXX9) += spi_txx9.o
|
||||
obj-$(CONFIG_SPI_XILINX) += xilinx_spi.o
|
||||
obj-$(CONFIG_SPI_XILINX_OF) += xilinx_spi_of.o
|
||||
obj-$(CONFIG_SPI_XILINX_PLTFM) += xilinx_spi_pltfm.o
|
||||
obj-$(CONFIG_SPI_SH_SCI) += spi_sh_sci.o
|
||||
obj-$(CONFIG_SPI_SH_MSIOF) += spi_sh_msiof.o
|
||||
obj-$(CONFIG_SPI_STMP3XXX) += spi_stmp.o
|
||||
|
|
|
|||
|
|
@ -1,20 +1,22 @@
|
|||
/*
|
||||
* xilinx_spi.c
|
||||
*
|
||||
* Xilinx SPI controller driver (master mode only)
|
||||
*
|
||||
* Author: MontaVista Software, Inc.
|
||||
* source@mvista.com
|
||||
*
|
||||
* 2002-2007 (c) MontaVista Software, Inc. This file is licensed under the
|
||||
* terms of the GNU General Public License version 2. This program is licensed
|
||||
* "as is" without any warranty of any kind, whether express or implied.
|
||||
* Copyright (c) 2010 Secret Lab Technologies, Ltd.
|
||||
* Copyright (c) 2009 Intel Corporation
|
||||
* 2002-2007 (c) MontaVista Software, Inc.
|
||||
|
||||
* 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.
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/interrupt.h>
|
||||
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/spi/spi.h>
|
||||
#include <linux/spi/spi_bitbang.h>
|
||||
#include <linux/io.h>
|
||||
|
|
@ -456,6 +458,71 @@ void xilinx_spi_deinit(struct spi_master *master)
|
|||
}
|
||||
EXPORT_SYMBOL(xilinx_spi_deinit);
|
||||
|
||||
static int __devinit xilinx_spi_probe(struct platform_device *dev)
|
||||
{
|
||||
struct xspi_platform_data *pdata;
|
||||
struct resource *r;
|
||||
int irq;
|
||||
struct spi_master *master;
|
||||
u8 i;
|
||||
|
||||
pdata = dev->dev.platform_data;
|
||||
if (!pdata)
|
||||
return -ENODEV;
|
||||
|
||||
r = platform_get_resource(dev, IORESOURCE_MEM, 0);
|
||||
if (!r)
|
||||
return -ENODEV;
|
||||
|
||||
irq = platform_get_irq(dev, 0);
|
||||
if (irq < 0)
|
||||
return -ENXIO;
|
||||
|
||||
master = xilinx_spi_init(&dev->dev, r, irq, dev->id,
|
||||
pdata->num_chipselect, pdata->little_endian,
|
||||
pdata->bits_per_word);
|
||||
if (!master)
|
||||
return -ENODEV;
|
||||
|
||||
for (i = 0; i < pdata->num_devices; i++)
|
||||
spi_new_device(master, pdata->devices + i);
|
||||
|
||||
platform_set_drvdata(dev, master);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devexit xilinx_spi_remove(struct platform_device *dev)
|
||||
{
|
||||
xilinx_spi_deinit(platform_get_drvdata(dev));
|
||||
platform_set_drvdata(dev, 0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* work with hotplug and coldplug */
|
||||
MODULE_ALIAS("platform:" XILINX_SPI_NAME);
|
||||
|
||||
static struct platform_driver xilinx_spi_driver = {
|
||||
.probe = xilinx_spi_probe,
|
||||
.remove = __devexit_p(xilinx_spi_remove),
|
||||
.driver = {
|
||||
.name = XILINX_SPI_NAME,
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
};
|
||||
|
||||
static int __init xilinx_spi_pltfm_init(void)
|
||||
{
|
||||
return platform_driver_register(&xilinx_spi_driver);
|
||||
}
|
||||
module_init(xilinx_spi_pltfm_init);
|
||||
|
||||
static void __exit xilinx_spi_pltfm_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&xilinx_spi_driver);
|
||||
}
|
||||
module_exit(xilinx_spi_pltfm_exit);
|
||||
|
||||
MODULE_AUTHOR("MontaVista Software, Inc. <source@mvista.com>");
|
||||
MODULE_DESCRIPTION("Xilinx SPI driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
|
|
|||
|
|
@ -1,104 +0,0 @@
|
|||
/*
|
||||
* Support for Xilinx SPI platform devices
|
||||
* 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.
|
||||
*/
|
||||
|
||||
/* Supports:
|
||||
* Xilinx SPI devices as platform devices
|
||||
*
|
||||
* Inspired by xilinx_spi.c, 2002-2007 (c) MontaVista Software, Inc.
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/platform_device.h>
|
||||
|
||||
#include <linux/spi/spi.h>
|
||||
#include <linux/spi/spi_bitbang.h>
|
||||
#include <linux/spi/xilinx_spi.h>
|
||||
|
||||
#include "xilinx_spi.h"
|
||||
|
||||
static int __devinit xilinx_spi_probe(struct platform_device *dev)
|
||||
{
|
||||
struct xspi_platform_data *pdata;
|
||||
struct resource *r;
|
||||
int irq;
|
||||
struct spi_master *master;
|
||||
u8 i;
|
||||
|
||||
pdata = dev->dev.platform_data;
|
||||
if (!pdata)
|
||||
return -ENODEV;
|
||||
|
||||
r = platform_get_resource(dev, IORESOURCE_MEM, 0);
|
||||
if (!r)
|
||||
return -ENODEV;
|
||||
|
||||
irq = platform_get_irq(dev, 0);
|
||||
if (irq < 0)
|
||||
return -ENXIO;
|
||||
|
||||
master = xilinx_spi_init(&dev->dev, r, irq, dev->id,
|
||||
pdata->num_chipselect, pdata->little_endian,
|
||||
pdata->bits_per_word);
|
||||
if (!master)
|
||||
return -ENODEV;
|
||||
|
||||
for (i = 0; i < pdata->num_devices; i++)
|
||||
spi_new_device(master, pdata->devices + i);
|
||||
|
||||
platform_set_drvdata(dev, master);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devexit xilinx_spi_remove(struct platform_device *dev)
|
||||
{
|
||||
xilinx_spi_deinit(platform_get_drvdata(dev));
|
||||
platform_set_drvdata(dev, 0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* work with hotplug and coldplug */
|
||||
MODULE_ALIAS("platform:" XILINX_SPI_NAME);
|
||||
|
||||
static struct platform_driver xilinx_spi_driver = {
|
||||
.probe = xilinx_spi_probe,
|
||||
.remove = __devexit_p(xilinx_spi_remove),
|
||||
.driver = {
|
||||
.name = XILINX_SPI_NAME,
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
};
|
||||
|
||||
static int __init xilinx_spi_pltfm_init(void)
|
||||
{
|
||||
return platform_driver_register(&xilinx_spi_driver);
|
||||
}
|
||||
module_init(xilinx_spi_pltfm_init);
|
||||
|
||||
static void __exit xilinx_spi_pltfm_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&xilinx_spi_driver);
|
||||
}
|
||||
module_exit(xilinx_spi_pltfm_exit);
|
||||
|
||||
MODULE_AUTHOR("Mocean Laboratories <info@mocean-labs.com>");
|
||||
MODULE_DESCRIPTION("Xilinx SPI platform driver");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
Загрузка…
Ссылка в новой задаче