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
ebd1e2b0
Commit
ebd1e2b0
authored
Jul 16, 2019
by
Federico Vaga
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sw:drv: assign platform_device id automatically
Signed-off-by:
Federico Vaga
<
federico.vaga@cern.ch
>
parent
b63cd010
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
12 deletions
+6
-12
spec-core-fpga.c
software/kernel/spec-core-fpga.c
+5
-9
spec-core.c
software/kernel/spec-core.c
+1
-3
No files found.
software/kernel/spec-core-fpga.c
View file @
ebd1e2b0
...
...
@@ -19,12 +19,6 @@
#include "platform_data/spi-ocores.h"
/* FIXME find better ID */
static
int
vic_id
;
static
int
mfd_id
;
static
int
app_id
;
enum
spec_fpga_mem_offsets
{
SPEC_FPGA_MEM_CSR_START
=
SPEC_CORE_FPGA
+
0x40
,
SPEC_FPGA_MEM_CSR_END
=
SPEC_CORE_FPGA
+
0x5F
,
...
...
@@ -239,7 +233,8 @@ static int spec_fpga_vic_init(struct spec_fpga *spec_fpga)
res
[
1
].
start
=
gpiod_to_irq
(
spec_gn412x
->
gpiod
[
GN4124_GPIO_IRQ1
]);
res
[
1
].
end
=
res
[
1
].
start
;
pdev
=
platform_device_register_resndata
(
&
spec_fpga
->
dev
,
"htvic-spec"
,
vic_id
++
,
"htvic-spec"
,
PLATFORM_DEVID_AUTO
,
res
,
res_n
,
NULL
,
0
);
if
(
IS_ERR
(
pdev
))
...
...
@@ -379,7 +374,8 @@ static int spec_fpga_devices_init(struct spec_fpga *spec_fpga)
fpga_mfd_devs
[
0
].
num_resources
=
1
;
/* FMC I2C */
fpga_mfd_devs
[
1
].
num_resources
=
1
;
/* SPI */
}
err
=
mfd_add_devices
(
&
spec_fpga
->
dev
,
mfd_id
++
,
err
=
mfd_add_devices
(
&
spec_fpga
->
dev
,
PLATFORM_DEVID_AUTO
,
fpga_mfd_devs
,
n_mfd
,
&
pcidev
->
resource
[
0
],
0
,
vic_domain
);
...
...
@@ -640,7 +636,7 @@ static int spec_fpga_app_init(struct spec_fpga *spec_fpga)
spec_fpga_app_id_build
(
spec_fpga
,
SPEC_FPGA_CSR_APP_OFF
,
app_name
,
SPEC_FPGA_APP_NAME_MAX
);
pdev
=
platform_device_register_resndata
(
&
spec_fpga
->
dev
,
app_name
,
app_id
++
,
app_name
,
PLATFORM_DEVID_AUTO
,
res
,
res_n
,
NULL
,
0
);
if
(
IS_ERR
(
pdev
))
...
...
software/kernel/spec-core.c
View file @
ebd1e2b0
...
...
@@ -20,8 +20,6 @@
#include "spec.h"
#include "spec-compat.h"
static
int
mfd_id
;
/* FIXME look for something better */
static
char
*
spec_fw_name_45t
=
"spec-golden-45T.bin"
;
static
char
*
spec_fw_name_100t
=
"spec-golden-100T.bin"
;
static
char
*
spec_fw_name_150t
=
"spec-golden-150T.bin"
;
...
...
@@ -601,7 +599,7 @@ static int spec_probe(struct pci_dev *pdev,
}
pci_set_master
(
pdev
);
err
=
mfd_add_devices
(
&
pdev
->
dev
,
mfd_id
++
,
err
=
mfd_add_devices
(
&
pdev
->
dev
,
PLATFORM_DEVID_AUTO
,
spec_mfd_devs
,
ARRAY_SIZE
(
spec_mfd_devs
),
&
pdev
->
resource
[
4
],
pdev
->
irq
,
NULL
);
...
...
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