Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
S
Simple PCIe FMC carrier SPEC
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
50
Issues
50
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
Simple PCIe FMC carrier SPEC
Commits
cdba3387
Commit
cdba3387
authored
Sep 10, 2019
by
Federico Vaga
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sw:drv:spi: move this driver to general-cores
Signed-off-by:
Federico Vaga
<
federico.vaga@cern.ch
>
parent
53ed8f3a
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
835 deletions
+6
-835
Kbuild
software/kernel/Kbuild
+1
-1
Makefile
software/kernel/Makefile
+4
-1
spi-ocores.h
software/kernel/platform_data/spi-ocores.h
+0
-22
spec-core-fpga.c
software/kernel/spec-core-fpga.c
+1
-1
spi-ocores.c
software/kernel/spi-ocores.c
+0
-810
No files found.
software/kernel/Kbuild
View file @
cdba3387
...
...
@@ -17,6 +17,7 @@ ccflags-y += -Wall -Werror
ccflags-$(CONFIG_FPGA_MGR_BACKPORT) += -DCONFIG_FPGA_MGR_BACKPORT
ccflags-$(CONFIG_FPGA_MGR_BACKPORT) += $(CONFIG_FPGA_MGR_BACKPORT_INCLUDE)
ccflags-y += -I$(FMC_ABS)/include
ccflags-y += -I$(SPI_ABS)/include
# priority to I2C, FMC headers from our sources
LINUXINCLUDE := -I$(FMC_ABS)/include -I$(FMC_ABS)/include/linux -I$(I2C_ABS)/include -I$(I2C_ABS)/include/linux $(LINUXINCLUDE)
...
...
@@ -31,7 +32,6 @@ obj-m := spec-fmc-carrier.o
obj-m += gn412x-gpio.o
obj-m += gn412x-fcl.o
obj-m += spec-gn412x-dma.o
obj-m += spi-ocores.o
spec-fmc-carrier-objs := spec-core.o
spec-fmc-carrier-objs += spec-core-fpga.o
...
...
software/kernel/Makefile
View file @
cdba3387
...
...
@@ -24,15 +24,18 @@ ifeq ($(DKMS), 1)
FPGA_MGR_VERSION
?=
$(
shell
basename
$(
shell
ls
-d
$(DKMSTREE)
/fpga_mgr/
*
|
grep
-E
"
\/
[0-9]+
\.
[0-9]+
\.
[0-9]+"
|
sort
-V
|
tail
-n
1
))
FMC_VERSION
?=
$(
shell
basename
$(
shell
ls
-d
$(DKMSTREE)
/fmc/
*
|
grep
-E
"
\/
[0-9]+
\.
[0-9]+
\.
[0-9]+"
|
sort
-V
|
tail
-n
1
))
I2C_VERSION
?=
$(
shell
basename
$(
shell
ls
-d
$(DKMSTREE)
/i2c-ocores/
*
|
grep
-E
"
\/
[0-9]+
\.
[0-9]+
\.
[0-9]+"
|
sort
-V
|
tail
-n
1
))
SPI_VERSION
?=
$(
shell
basename
$(
shell
ls
-d
$(DKMSTREE)
/spi-ocores/
*
|
grep
-E
"
\/
[0-9]+
\.
[0-9]+
\.
[0-9]+"
|
sort
-V
|
tail
-n
1
))
CONFIG_FPGA_MGR_BACKPORT_PATH
:=
$(DKMSTREE)
/fpga_mgr/
$(FPGA_MGR_VERSION)
/source
FMC
:=
$(DKMSTREE)
/fmc/
$(FMC_VERSION)
/source
I2C
:=
$(DKMSTREE)
/i2c-ocores/
$(I2C_VERSION)
/source
SPI
:=
$(DKMSTREE)
/spi-ocores/
$(SPI_VERSION)
/source
endif
CONFIG_FPGA_MGR_BACKPORT_PATH_ABS
?=
$
(
abspath
$(CONFIG_FPGA_MGR_BACKPORT_PATH)
)
FMC_ABS
?=
$
(
abspath
$(FMC)
)
I2C_ABS
?=
$
(
abspath
$(I2C)
)
SPI_ABS
?=
$
(
abspath
$(SPI)
)
VERSION
=
$(
shell
git describe
--dirty
--long
--tags
)
...
...
@@ -48,7 +51,7 @@ ifeq ($(DKMS), 0)
endif
modules help install modules_install
:
spec-core-fpga.h
$(MAKE)
-C
$(LINUX)
M
=
$(
shell
pwd
)
VERSION
=
$(VERSION)
CONFIG_FPGA_MGR_BACKPORT_PATH_ABS
=
$(CONFIG_FPGA_MGR_BACKPORT_PATH_ABS)
CONFIG_FPGA_MGR_BACKPORT
=
$(CONFIG_FPGA_MGR_BACKPORT)
FMC_ABS
=
$(FMC_ABS)
I2C_ABS
=
$(I2C_ABS)
$@
$(MAKE)
-C
$(LINUX)
M
=
$(
shell
pwd
)
VERSION
=
$(VERSION)
CONFIG_FPGA_MGR_BACKPORT_PATH_ABS
=
$(CONFIG_FPGA_MGR_BACKPORT_PATH_ABS)
CONFIG_FPGA_MGR_BACKPORT
=
$(CONFIG_FPGA_MGR_BACKPORT)
FMC_ABS
=
$(FMC_ABS)
I2C_ABS
=
$(I2C_ABS)
SPI_ABS
=
$(SPI_ABS)
$@
# be able to run the "clean" rule even if $(LINUX) is not valid
clean
:
...
...
software/kernel/platform_data/spi-ocores.h
deleted
100644 → 0
View file @
53ed8f3a
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright (C) 2019 CERN (www.cern.ch)
* Author: Federico Vaga <federico.vaga@cern.ch>
*/
#ifndef __SPI_OCORES_PDATA_H__
#define __SPI_OCORES_PDATA_H__
#include <linux/spi/spi.h>
/**
* struct spi_ocores_platform_data - OpenCores SPI data
*/
struct
spi_ocores_platform_data
{
unsigned
int
big_endian
;
unsigned
int
clock_hz
;
unsigned
int
num_devices
;
struct
spi_board_info
*
devices
;
};
#endif
software/kernel/spec-core-fpga.c
View file @
cdba3387
...
...
@@ -5,6 +5,7 @@
*/
#include <linux/types.h>
#include <linux/platform_data/i2c-ocores.h>
#include <linux/platform_data/spi-ocores.h>
#include <linux/ioport.h>
#include <linux/gpio/consumer.h>
#include <linux/irqdomain.h>
...
...
@@ -18,7 +19,6 @@
#include "spec.h"
#include "spec-compat.h"
#include "platform_data/spi-ocores.h"
enum
spec_fpga_irq_lines
{
SPEC_FPGA_IRQ_FMC_I2C
=
0
,
...
...
software/kernel/spi-ocores.c
deleted
100644 → 0
View file @
53ed8f3a
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment