Skip to content

metro: Re-enable I2C and validate tasks - #2693

Merged
jamesmunns merged 2 commits into
masterfrom
james/metro-i2c
Sep 16, 2026
Merged

jamesmunns merged 2 commits into
masterfrom
james/metro-i2c

Conversation

@jamesmunns

Copy link
Copy Markdown
Contributor

AFAICT everything is the same, EXCEPT:

  1. Cosmo's U53, "T6 temperature sensor" has been removed, no 1:1 replacement.
  2. Cosmo's U16, "12V MCIO hot plug controller" has been removed, no 1:1 replacement, see metro#17
  3. Cosmo's U123, "T6 power controller" has been removed, replaced w/ Metro's U18, see U18 below
  4. Metro's U18, "Power NIC Controller" has been added, has 2/3 rails populated, measuring V0P8_NIC_VCCINT_A0HP and V0P88_NIC_A0HP. Same mux position as cosmo's U123
  5. Cosmo's "J48/U1", "North temperature sensor", has been removed, no 1:1 replacement, see metro#120

AFAICT everything is the same, EXCEPT:

1. Cosmo's U53, "T6 temperature sensor" has been removed, no 1:1 replacement.
2. Cosmo's U16, "12V MCIO hot plug controller" has been removed, no 1:1 replacement, see metro#17
3. Cosmo's U123, "T6 power controller" has been removed, replaced w/ Metro's U18, see U18 below
4. Metro's U18, "Power NIC Controller" has been added, has 2/3 rails populated, measuring `V0P8_NIC_VCCINT_A0HP` and `V0P88_NIC_A0HP`. Same mux position as cosmo's U123
5. Cosmo's "J48/U1", "North temperature sensor", has been removed, no 1:1 replacement, see metro#120

@labbott labbott left a comment

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 added explicit comments for the diffs you hilighted in case we need to come back to this. Everything looks good to me although I couldn't quite figure out why GitHub decided to add a big jump/diff when it did (cue long discussion of the history of diff and the problems inherent or something like that)

Comment thread app/metro/base.toml
Comment on lines +1177 to +1190
[[config.i2c.devices]]
bus = "rear"
address = 0x5C
device = "isl68224"
description = "Versal power controller"
# TODO: 3rd rail is unused, but if we don't define three rails then U116 gets
# mad about it unless we define a new "flavor".
power = { rails = [
"V0P8_NIC_VCCINT_A0HP",
"V0P88_NIC_A0HP",
"V0P0_NIC_UNUSED",
] }
sensors = { voltage = 3, current = 3 } # XXX add temperature sensors?
refdes = "U18"

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.

This is new (no issue just a point of reference for future us maybe)

Comment thread app/metro/base.toml
Comment on lines -1219 to -1227
# [[config.i2c.devices]]
# bus = "rear"
# address = 0x49
# device = "tmp117"
# name = "North"
# description = "North temperature sensor"
# sensors = { temperature = 1 }
# removable = true
# refdes = ["J48", "U1"]

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.

Removed (reference only)

Comment thread app/metro/base.toml
Comment on lines -1199 to -1207
# [[config.i2c.devices]]
# bus = "rear"
# address = 0x25
# device = "tps546b24a"
# description = "T6 power controller"
# power = { rails = [ "V0P96_NIC_VDD_A0HP" ] }
# sensors = { temperature = 1, voltage = 1, current = 1 }
# refdes = "U123"
# name = "v0p96_nic"

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.

Removed

Comment thread app/metro/base.toml
Comment on lines -1072 to -1082
# # SMBUS_FPGA1_TO_NIC_THERM
# [[config.i2c.devices]]
# bus = "main"
# mux = 1
# segment = 8
# address = 0x4c
# device = "tmp451"
# name = "t6"
# sensors = { temperature = 1 }
# description = "T6 temperature sensor"
# refdes = "U53"

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.

Removed

Comment thread app/metro/base.toml
Comment on lines -1128 to -1136
# [[config.i2c.devices]]
# bus = "mid"
# address = 0x54
# device = "ltc4282"
# name = "mcio"
# description = "12V MCIO hot plug controller"
# power = { rails = ["V12_MCIO_A0HP"], pmbus = false }
# sensors = { voltage = 1, current = 1 }
# refdes = "U16"

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.

Remvoed

@jamesmunns
jamesmunns merged commit 0c0a5db into master Sep 16, 2026
196 checks passed
@jamesmunns
jamesmunns deleted the james/metro-i2c branch September 16, 2026 19:35
@jamesmunns jamesmunns mentioned this pull request Sep 16, 2026
76 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants