diff options
Diffstat (limited to 'drivers/net/caif')
| -rw-r--r-- | drivers/net/caif/Kconfig | 9 | ||||
| -rw-r--r-- | drivers/net/caif/Makefile | 3 | ||||
| -rw-r--r-- | drivers/net/caif/caif_serial.c | 2 | ||||
| -rw-r--r-- | drivers/net/caif/caif_shm_u5500.c | 1 | ||||
| -rw-r--r-- | drivers/net/caif/caif_shmcore.c | 2 | ||||
| -rw-r--r-- | drivers/net/caif/caif_spi.c | 5 | ||||
| -rw-r--r-- | drivers/net/caif/caif_spi_slave.c | 1 |
7 files changed, 14 insertions, 9 deletions
diff --git a/drivers/net/caif/Kconfig b/drivers/net/caif/Kconfig index 09ed3f4..abf4d7a 100644 --- a/drivers/net/caif/Kconfig +++ b/drivers/net/caif/Kconfig @@ -38,3 +38,12 @@ config CAIF_SHM default n ---help--- The CAIF shared memory protocol driver for the STE UX5500 platform. + +config CAIF_HSI + tristate "CAIF HSI transport driver" + depends on CAIF + default n + ---help--- + The caif low level driver for CAIF over HSI. + Be aware that if you enable this then you also need to + enable a low-level HSI driver. diff --git a/drivers/net/caif/Makefile b/drivers/net/caif/Makefile index 9560b9d..91dff86 100644 --- a/drivers/net/caif/Makefile +++ b/drivers/net/caif/Makefile @@ -10,3 +10,6 @@ obj-$(CONFIG_CAIF_SPI_SLAVE) += cfspi_slave.o # Shared memory caif_shm-objs := caif_shmcore.o caif_shm_u5500.o obj-$(CONFIG_CAIF_SHM) += caif_shm.o + +# HSI interface +obj-$(CONFIG_CAIF_HSI) += caif_hsi.o diff --git a/drivers/net/caif/caif_serial.c b/drivers/net/caif/caif_serial.c index 82b1802..ae286a9 100644 --- a/drivers/net/caif/caif_serial.c +++ b/drivers/net/caif/caif_serial.c @@ -4,8 +4,8 @@ * License terms: GNU General Public License (GPL) version 2 */ +#include <linux/hardirq.h> #include <linux/init.h> -#include <linux/version.h> #include <linux/module.h> #include <linux/device.h> #include <linux/types.h> diff --git a/drivers/net/caif/caif_shm_u5500.c b/drivers/net/caif/caif_shm_u5500.c index 5f771ab..89d76b7 100644 --- a/drivers/net/caif/caif_shm_u5500.c +++ b/drivers/net/caif/caif_shm_u5500.c @@ -7,7 +7,6 @@ #define pr_fmt(fmt) KBUILD_MODNAME ":" fmt -#include <linux/version.h> #include <linux/init.h> #include <linux/module.h> #include <linux/netdevice.h> diff --git a/drivers/net/caif/caif_shmcore.c b/drivers/net/caif/caif_shmcore.c index 731aa11..d4b26fb 100644 --- a/drivers/net/caif/caif_shmcore.c +++ b/drivers/net/caif/caif_shmcore.c @@ -134,7 +134,7 @@ int caif_shmdrv_rx_cb(u32 mbx_msg, void *priv) u32 avail_emptybuff = 0; unsigned long flags = 0; - pshm_drv = (struct shmdrv_layer *)priv; + pshm_drv = priv; /* Check for received buffers. */ if (mbx_msg & SHM_FULL_MASK) { diff --git a/drivers/net/caif/caif_spi.c b/drivers/net/caif/caif_spi.c index 57e6393..05e791f 100644 --- a/drivers/net/caif/caif_spi.c +++ b/drivers/net/caif/caif_spi.c @@ -5,7 +5,6 @@ * License terms: GNU General Public License (GPL) version 2. */ -#include <linux/version.h> #include <linux/init.h> #include <linux/module.h> #include <linux/device.h> @@ -665,8 +664,6 @@ int cfspi_spi_probe(struct platform_device *pdev) /* Allocate DMA buffers. */ cfspi->xfer.va_tx = dma_alloc(&cfspi->xfer.pa_tx); if (!cfspi->xfer.va_tx) { - printk(KERN_WARNING - "CFSPI: failed to allocate dma TX buffer.\n"); res = -ENODEV; goto err_dma_alloc_tx; } @@ -674,8 +671,6 @@ int cfspi_spi_probe(struct platform_device *pdev) cfspi->xfer.va_rx = dma_alloc(&cfspi->xfer.pa_rx); if (!cfspi->xfer.va_rx) { - printk(KERN_WARNING - "CFSPI: failed to allocate dma TX buffer.\n"); res = -ENODEV; goto err_dma_alloc_rx; } diff --git a/drivers/net/caif/caif_spi_slave.c b/drivers/net/caif/caif_spi_slave.c index b009e03..e139e13 100644 --- a/drivers/net/caif/caif_spi_slave.c +++ b/drivers/net/caif/caif_spi_slave.c @@ -4,7 +4,6 @@ * Author: Daniel Martensson / Daniel.Martensson@stericsson.com * License terms: GNU General Public License (GPL) version 2. */ -#include <linux/version.h> #include <linux/init.h> #include <linux/module.h> #include <linux/device.h> |