Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
MMC U-Boot Custodian Tree
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Analyze
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
U-Boot
Custodians
MMC U-Boot Custodian Tree
Commits
5f902cf1
Commit
5f902cf1
authored
13 years ago
by
Wolfgang Denk
Browse files
Options
Downloads
Plain Diff
Merge branch 'spi' of
git://git.denx.de/u-boot-blackfin
parents
a01ebd96
6c3eb43a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
drivers/spi/bfin_spi.c
+19
-13
19 additions, 13 deletions
drivers/spi/bfin_spi.c
include/spi.h
+8
-0
8 additions, 0 deletions
include/spi.h
with
27 additions
and
13 deletions
drivers/spi/bfin_spi.c
+
19
−
13
View file @
5f902cf1
...
...
@@ -138,13 +138,29 @@ static const unsigned short cs_pins[][7] = {
#endif
};
void
spi_set_speed
(
struct
spi_slave
*
slave
,
uint
hz
)
{
struct
bfin_spi_slave
*
bss
=
to_bfin_spi_slave
(
slave
);
ulong
sclk
;
u32
baud
;
sclk
=
get_sclk
();
baud
=
sclk
/
(
2
*
hz
);
/* baud should be rounded up */
if
(
sclk
%
(
2
*
hz
))
baud
+=
1
;
if
(
baud
<
2
)
baud
=
2
;
else
if
(
baud
>
(
u16
)
-
1
)
baud
=
-
1
;
bss
->
baud
=
baud
;
}
struct
spi_slave
*
spi_setup_slave
(
unsigned
int
bus
,
unsigned
int
cs
,
unsigned
int
max_hz
,
unsigned
int
mode
)
{
struct
bfin_spi_slave
*
bss
;
ulong
sclk
;
u32
mmr_base
;
u32
baud
;
if
(
!
spi_cs_is_valid
(
bus
,
cs
))
return
NULL
;
...
...
@@ -166,16 +182,6 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
default:
return
NULL
;
}
sclk
=
get_sclk
();
baud
=
sclk
/
(
2
*
max_hz
);
/* baud should be rounded up */
if
(
sclk
%
(
2
*
max_hz
))
baud
+=
1
;
if
(
baud
<
2
)
baud
=
2
;
else
if
(
baud
>
(
u16
)
-
1
)
baud
=
-
1
;
bss
=
malloc
(
sizeof
(
*
bss
));
if
(
!
bss
)
return
NULL
;
...
...
@@ -187,8 +193,8 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
if
(
mode
&
SPI_CPHA
)
bss
->
ctl
|=
CPHA
;
if
(
mode
&
SPI_CPOL
)
bss
->
ctl
|=
CPOL
;
if
(
mode
&
SPI_LSB_FIRST
)
bss
->
ctl
|=
LSBF
;
bss
->
baud
=
baud
;
bss
->
flg
=
mode
&
SPI_CS_HIGH
?
1
:
0
;
spi_set_speed
(
&
bss
->
slave
,
max_hz
);
debug
(
"%s: bus:%i cs:%i mmr:%x ctl:%x baud:%i flg:%i
\n
"
,
__func__
,
bus
,
cs
,
mmr_base
,
bss
->
ctl
,
baud
,
bss
->
flg
);
...
...
This diff is collapsed.
Click to expand it.
include/spi.h
+
8
−
0
View file @
5f902cf1
...
...
@@ -175,6 +175,14 @@ void spi_cs_activate(struct spi_slave *slave);
*/
void
spi_cs_deactivate
(
struct
spi_slave
*
slave
);
/*-----------------------------------------------------------------------
* Set transfer speed.
* This sets a new speed to be applied for next spi_xfer().
* slave: The SPI slave
* hz: The transfer speed
*/
void
spi_set_speed
(
struct
spi_slave
*
slave
,
uint
hz
);
/*-----------------------------------------------------------------------
* Write 8 bits, then read 8 bits.
* slave: The SPI slave we're communicating with
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment