Commit a58bca55 authored by Federico Vaga's avatar Federico Vaga

sw:drv: re-enable SPI flash

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent bac04160
......@@ -18,10 +18,10 @@ ccflags-y += -I$(FPGA_MGR_ABS)/include
ccflags-$(CONFIG_FPGA_MGR_BACKPORT) += -DCONFIG_FPGA_MGR_BACKPORT
ccflags-y += -I$(FMC_ABS)/include
ccflags-y += -I$(I2C_ABS)/include
ccflags-y += -I$(SPI_ABS)/include
# priority to I2C headers from our sources
LINUXINCLUDE := -I$(FMC_ABS)/include -I$(FMC_ABS)/include/linux -I$(I2C_ABS)/include -I$(I2C_ABS)/include/linux $(LINUXINCLUDE)
LINUXINCLUDE := -I$(FMC_ABS)/include -I$(FMC_ABS)/include/linux -I$(I2C_ABS)/include -I$(I2C_ABS)/include/linux -I$(SPI_ABS)/include -I$(SPI_ABS)/include/linux $(LINUXINCLUDE)
ifeq ($(CONFIG_FPGA_MGR_BACKPORT), y)
FPGA_MGR_BACKPORT_INCLUDE := -I$(FPGA_MGR_ABS)/include
......
......@@ -11,6 +11,7 @@ VMEBRIDGE_ABS ?= $(abspath $(VMEBRIDGE))
FPGA_MGR_ABS ?= $(abspath $(FPGA_MGR))
FMC_ABS ?= $(abspath $(FMC))
I2C_ABS ?= $(abspath $(I2C))
SPI_ABS ?= $(abspath $(SPI))
VERSION = $(shell git describe --dirty --long --tags)
......@@ -36,4 +37,5 @@ modules help coccicheck modules_install: svec-core-fpga.h
CONFIG_FPGA_MGR_BACKPORT=$(CONFIG_FPGA_MGR_BACKPORT) \
FMC_ABS=$(FMC_ABS) \
I2C_ABS=$(I2C_ABS) \
SPI_ABS=$(SPI_ABS) \
$@
......@@ -9,6 +9,7 @@
#include <linux/fpga/fpga-mgr.h>
#include <linux/types.h>
#include <linux/platform_data/i2c-ocores.h>
#include <linux/platform_data/spi-ocores.h>
#include <linux/spi/spi.h>
#include <linux/spi/flash.h>
#include <linux/delay.h>
......@@ -260,7 +261,7 @@ static struct ocores_i2c_platform_data svec_fpga_fmc_i2c_pdata = {
.num_devices = 0,
.devices = NULL,
};
#if 0
static struct resource svec_fpga_spi_res[] = {
{
.name = "spi-ocores-mem",
......@@ -299,7 +300,6 @@ static struct spi_ocores_platform_data svec_fpga_spi_pdata = {
.devices = svec_fpga_spi_devices_info,
};
#endif
static const struct mfd_cell svec_fpga_mfd_devs[] = {
[SVEC_FPGA_MFD_FMC_I2C] = {
.name = "i2c-ohwr",
......@@ -308,7 +308,6 @@ static const struct mfd_cell svec_fpga_mfd_devs[] = {
.num_resources = ARRAY_SIZE(svec_fpga_fmc_i2c_res),
.resources = svec_fpga_fmc_i2c_res,
},
#if 0
[SVEC_FPGA_MFD_SPI] = {
.name = "spi-ocores",
.platform_data = &svec_fpga_spi_pdata,
......@@ -316,7 +315,6 @@ static const struct mfd_cell svec_fpga_mfd_devs[] = {
.num_resources = ARRAY_SIZE(svec_fpga_spi_res),
.resources = svec_fpga_spi_res,
},
#endif
};
static inline size_t __fpga_mfd_devs_size(void)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment