Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
reform-boundary-uboot
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
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
Jack Humbert
reform-boundary-uboot
Commits
35ecf752
Commit
35ecf752
authored
10 years ago
by
Dirk Eibach
Committed by
Tom Rini
10 years ago
Browse files
Options
Downloads
Patches
Plain Diff
board: controlcenterd: Use new API for setting i2c bus
Signed-off-by:
Dirk Eibach
<
dirk.eibach@gdsys.cc
>
parent
e9e37421
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
board/gdsys/p1022/controlcenterd-id.c
+9
-4
9 additions, 4 deletions
board/gdsys/p1022/controlcenterd-id.c
with
9 additions
and
4 deletions
board/gdsys/p1022/controlcenterd-id.c
+
9
−
4
View file @
35ecf752
...
...
@@ -86,6 +86,11 @@ enum {
ESDHC_BOOT_IMAGE_ENTRY_OFS
=
0x60
,
};
enum
{
I2C_SOC_0
=
0
,
I2C_SOC_1
=
1
,
};
struct
key_program
{
uint32_t
magic
;
uint32_t
code_crc
;
...
...
@@ -1156,7 +1161,7 @@ static void ccdm_hang(void)
int
j
;
#endif
I2C_SET_BUS
(
0
);
I2C_SET_BUS
(
I2C_SOC_
0
);
pca9698_direction_output
(
0x22
,
0
,
0
);
/* Finder */
pca9698_direction_output
(
0x22
,
4
,
0
);
/* Status */
...
...
@@ -1189,8 +1194,8 @@ int startup_ccdm_id_module(void)
int
result
=
0
;
unsigned
int
orig_i2c_bus
;
orig_i2c_bus
=
I2C_GET_BUS
();
I2C_SET_BUS
(
1
);
orig_i2c_bus
=
i2c_get_bus_num
();
i2c_set_bus_num
(
I2C_SOC_
1
);
/* goto end; */
...
...
@@ -1216,7 +1221,7 @@ int startup_ccdm_id_module(void)
failure:
result
=
1
;
end:
I2C_SET_BUS
(
orig_i2c_bus
);
i2c_set_bus_num
(
orig_i2c_bus
);
if
(
result
)
ccdm_hang
();
...
...
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