Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
F
FMC DEL 1ns 4cha - Software
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
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
FMC DEL 1ns 4cha - Software
Commits
b451392c
Commit
b451392c
authored
Oct 24, 2012
by
Alessandro Rubini
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kernel: a few trivial things, no change in fact
Signed-off-by:
Alessandro Rubini
<
rubini@gnudd.com
>
parent
f820b71c
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
acam.c
kernel/acam.c
+1
-1
calibrate.c
kernel/calibrate.c
+1
-2
fd-zio.c
kernel/fd-zio.c
+5
-1
No files found.
kernel/acam.c
View file @
b451392c
...
...
@@ -112,7 +112,7 @@ void acam_writel(struct fd_dev *fd, int val, int reg)
static
void
acam_set_bypass
(
struct
fd_dev
*
fd
,
int
on
)
{
/*
FIXME: this zeroes all other GCR bits
*/
/*
warning: this clears the "input enable" bit: call at init only
*/
fd_writel
(
fd
,
on
?
FD_GCR_BYPASS
:
0
,
FD_REG_GCR
);
}
...
...
kernel/calibrate.c
View file @
b451392c
...
...
@@ -21,10 +21,9 @@
#include "hw/acam_gpx.h"
#include "hw/fd_channel_regs.h"
/* T
EMP!
*/
/* T
his is the same as in ./acam.c: use only at init time
*/
static
void
acam_set_bypass
(
struct
fd_dev
*
fd
,
int
on
)
{
/* FIXME: this zeroes all other GCR bits */
fd_writel
(
fd
,
on
?
FD_GCR_BYPASS
:
0
,
FD_REG_GCR
);
}
...
...
kernel/fd-zio.c
View file @
b451392c
...
...
@@ -158,6 +158,9 @@ static int fd_zio_info_output(struct device *dev, struct zio_attribute *zattr,
static
int
fd_wr_mode
(
struct
fd_dev
*
fd
,
int
on
)
{
unsigned
long
flags
;
spin_lock_irqsave
(
&
fd
->
lock
,
flags
);
if
(
on
)
{
fd_writel
(
fd
,
FD_TCR_WR_ENABLE
,
FD_REG_TCR
);
set_bit
(
FD_FLAG_WR_MODE
,
&
fd
->
flags
);
...
...
@@ -165,6 +168,7 @@ static int fd_wr_mode(struct fd_dev *fd, int on)
fd_writel
(
fd
,
0
,
FD_REG_TCR
);
clear_bit
(
FD_FLAG_WR_MODE
,
&
fd
->
flags
);
}
spin_unlock_irqrestore
(
&
fd
->
lock
,
flags
);
return
0
;
}
...
...
@@ -448,7 +452,7 @@ static int fd_read_fifo(struct fd_dev *fd, struct zio_channel *chan)
if
(
!
chan
->
active_block
)
return
-
EAGAIN
;
/*
Advance to the next fifo entry
*/
/*
Fecth the fifo entry to registers, so we can read them
*/
fd_writel
(
fd
,
FD_TSBR_ADVANCE_ADV
,
FD_REG_TSBR_ADVANCE
);
/* First, read input data into a local struct to fix the offset */
...
...
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