Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/cosmo/base.toml
Original file line number Diff line number Diff line change
Expand Up @@ -1079,7 +1079,7 @@ device = "isl68224"
description = "SP5 power controller (V1P1, V1P8, V3P3)"
power.rails = [ "V1P1_SP5_A0", "V1P8_SP5_A1", "V3P3_SP5_A1" ]
power.phases = [ [ 0, 1, 2 ], [ 3 ], [ 4 ] ]
sensors = { voltage = 3, current = 3 } # XXX add temperature sensors?
sensors = { temperature = 3, voltage = 3, current = 3 }
refdes = "U116"

################################################################################
Expand Down
6 changes: 3 additions & 3 deletions task/power/src/bsp/cosmo_ab.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ pub(crate) static CONTROLLER_CONFIG: [PowerControllerConfig;
rail_controller!(Core, raa229620A, vddcr_soc_a0, A0),
rail_controller!(Core, raa229620A, vddcr_cpu1_a0, A0),
rail_controller!(Core, raa229620A, vddio_sp5_a0, A0),
rail_controller_notemp!(Core, isl68224, v1p1_sp5_a0, A0),
rail_controller_notemp!(Core, isl68224, v1p8_sp5_a1, A0), // XXX A0 or A2?
rail_controller_notemp!(Core, isl68224, v3p3_sp5_a1, A0), // XXX A0 or A2?
rail_controller!(Core, isl68224, v1p1_sp5_a0, A0),
rail_controller!(Core, isl68224, v1p8_sp5_a1, A0), // XXX A0 or A2?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mkeeter do we know better now whether this should be A0 or A2?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it should be A2, because the chip generates the A0 rail (but is itself powered by A2 rails). We should test it, though!

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a specific way you'd suggest to test this, or just "make the change and see if a cosmo sled still boots happily about it"?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Basically! Make the change above (with A2 instead of A0), put a Cosmo sled into A2 (humility hiffy -c Sequencer.set_state -a state=A2), and confirm that it's still happily reading temperatures (with humility sensors)

rail_controller!(Core, isl68224, v3p3_sp5_a1, A0), // XXX A0 or A2?
rail_controller!(Sys, tps546B24A, v3p3_sp_a2, A2),
rail_controller!(Sys, tps546B24A, v5_sys_a2, A2),
rail_controller!(Sys, tps546B24A, v1p8_sys_a2, A2),
Expand Down
Loading