-
Notifications
You must be signed in to change notification settings - Fork 845
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
hwmon: (pmbus/adp1050): Support adp1051 and adp1055 #2629
Open
actorreno
wants to merge
2
commits into
main
Choose a base branch
from
dev/adp1050_support
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,16 +10,24 @@ maintainers: | |
- Radu Sabau <[email protected]> | ||
|
||
description: | | ||
The ADP1050 is used to monitor system voltages, currents and temperatures. | ||
The ADP1050 and similar devices are used to monitor system voltages, | ||
currents, power, and temperatures. | ||
|
||
Through the PMBus interface, the ADP1050 targets isolated power supplies | ||
and has four individual monitors for input/output voltage, input current | ||
and temperature. | ||
Datasheet: | ||
https://www.analog.com/en/products/adp1050.html | ||
https://www.analog.com/en/products/adp1051.html | ||
https://www.analog.com/en/products/adp1055.html | ||
|
||
properties: | ||
|
||
compatible: | ||
const: adi,adp1050 | ||
enum: | ||
- adi,adp1050 | ||
- adi,adp1051 | ||
- adi,adp1055 | ||
|
||
reg: | ||
maxItems: 1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,18 +13,33 @@ Supported chips: | |
|
||
Datasheet: https://www.analog.com/media/en/technical-documentation/data-sheets/ADP1050.pdf | ||
|
||
* Analog Devices ADP1051 | ||
|
||
Prefix: 'adp1051' | ||
|
||
Addresses scanned: I2C 0x70 - 0x77 | ||
|
||
Datasheet: https://www.analog.com/media/en/technical-documentation/data-sheets/ADP1051.pdf | ||
|
||
* Analog Devices ADP1055 | ||
|
||
Prefix: 'adp1055' | ||
|
||
Addresses scanned: I2C 0x4B - 0x77 | ||
|
||
Datasheet: https://www.analog.com/media/en/technical-documentation/data-sheets/ADP1055.pdf | ||
|
||
Authors: | ||
|
||
- Radu Sabau <[email protected]> | ||
|
||
|
||
Description | ||
----------- | ||
|
||
This driver supprts hardware monitoring for Analog Devices ADP1050 Digital | ||
Controller for Isolated Power Supply with PMBus interface. | ||
This driver supports hardware monitoring for Analog Devices ADP1050, ADP1051, and | ||
ADP1055 Digital Controller for Isolated Power Supply with PMBus interface. | ||
|
||
The ADP1050 is an advanced digital controller with a PMBus™ | ||
The ADP105X is an advanced digital controller with a PMBus™ | ||
interface targeting high density, high efficiency dc-to-dc power | ||
conversion used to monitor system temperatures, voltages and currents. | ||
Through the PMBus interface, the device can monitor input/output voltages, | ||
|
@@ -49,16 +64,45 @@ Sysfs Attributes | |
in1_label "vin" | ||
in1_input Measured input voltage | ||
in1_alarm Input voltage alarm | ||
in1_crit Critical maximum input voltage | ||
in1_crit_alarm Input voltage high alarm | ||
in1_lcrit Critical minimum input voltage | ||
in1_lcrit_alarm Input voltage critical low alarm | ||
in2_label "vout1" | ||
in2_input Measured output voltage | ||
in2_crit Critical maximum output voltage | ||
in2_crit_alarm Output voltage high alarm | ||
in2_lcrit Critical minimum output voltage | ||
in2_lcrit_alarm Output voltage critical low alarm | ||
in2_max Critical maximum output voltage | ||
in2_max_alarm Output voltage critical max alarm | ||
in2_min Critical minimum output voltage | ||
in2_min_alarm Output voltage critical min alarm | ||
curr1_label "iin" | ||
curr1_input Measured input current. | ||
curr1_alarm Input current alarm | ||
curr1_crit Critical maximum input current | ||
curr1_crit_alarm Input current high alarm | ||
curr2_label "iout1" | ||
curr2_input Measured output current | ||
curr2_crit Critical maximum output current | ||
curr2_crit_alarm Output current high alarm | ||
curr2_lcrit Critical minimum output current | ||
curr2_lcrit_alarm Output current critical low alarm | ||
curr2_max Critical maximum output current | ||
curr2_max_alarm Output current critical max alarm | ||
power1_label "pout1" | ||
power1_input Measured output power | ||
power1_crit Critical maximum output power | ||
power1_crit_alarm Output power high alarm | ||
temp1_input Measured temperature | ||
temp1_crit Critical high temperature | ||
temp1_crit_alarm Chip temperature critical high alarm | ||
temp1_max Critical maximum temperature | ||
temp1_max_alarm Temperature critical max alarm | ||
temp2_input Measured temperature | ||
temp2_crit Critical high temperature | ||
temp2_crit_alarm Chip temperature critical high alarm | ||
temp2_max Critical maximum temperature | ||
temp2_max_alarm Temperature critical max alarm | ||
================= ======================================== |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,21 +23,57 @@ static struct pmbus_driver_info adp1050_info = { | |
| PMBUS_HAVE_STATUS_TEMP, | ||
}; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Also unrelated change. I would drop it (or add it in a different patch) |
||
|
||
static struct pmbus_driver_info adp1051_info = { | ||
.pages = 1, | ||
.format[PSC_VOLTAGE_IN] = linear, | ||
.format[PSC_VOLTAGE_OUT] = linear, | ||
.format[PSC_CURRENT_IN] = linear, | ||
.format[PSC_TEMPERATURE] = linear, | ||
.func[0] = PMBUS_HAVE_VIN | PMBUS_HAVE_IIN | PMBUS_HAVE_VOUT | ||
| PMBUS_HAVE_IOUT | PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_VOUT | ||
| PMBUS_HAVE_STATUS_IOUT | PMBUS_HAVE_STATUS_INPUT | ||
| PMBUS_HAVE_STATUS_TEMP, | ||
}; | ||
|
||
static struct pmbus_driver_info adp1055_info = { | ||
.pages = 1, | ||
.format[PSC_VOLTAGE_IN] = linear, | ||
.format[PSC_VOLTAGE_OUT] = linear, | ||
.format[PSC_CURRENT_IN] = linear, | ||
.format[PSC_TEMPERATURE] = linear, | ||
.func[0] = PMBUS_HAVE_VIN | PMBUS_HAVE_IIN | PMBUS_HAVE_VOUT | ||
| PMBUS_HAVE_IOUT | PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3 | ||
| PMBUS_HAVE_POUT | PMBUS_HAVE_STATUS_VOUT | ||
| PMBUS_HAVE_STATUS_IOUT | PMBUS_HAVE_STATUS_INPUT | ||
| PMBUS_HAVE_STATUS_TEMP, | ||
}; | ||
|
||
/* 6.1 probe() function still uses the second struct i2c_device_id argument */ | ||
static int adp1050_probe(struct i2c_client *client, | ||
const struct i2c_device_id *id) | ||
{ | ||
return pmbus_do_probe(client, &adp1050_info); | ||
const struct pmbus_driver_info *info; | ||
|
||
info = device_get_match_data(&client->dev); | ||
if (!info) | ||
return -ENODEV; | ||
|
||
return pmbus_do_probe(client, info); | ||
} | ||
|
||
static const struct i2c_device_id adp1050_id[] = { | ||
{"adp1050", 0}, | ||
{ .name = "adp1050", .driver_data = (kernel_ulong_t)&adp1050_info}, | ||
{ .name = "adp1051", .driver_data = (kernel_ulong_t)&adp1051_info}, | ||
{ .name = "adp1055", .driver_data = (kernel_ulong_t)&adp1055_info}, | ||
{} | ||
}; | ||
|
||
MODULE_DEVICE_TABLE(i2c, adp1050_id); | ||
|
||
static const struct of_device_id adp1050_of_match[] = { | ||
{ .compatible = "adi,adp1050"}, | ||
{ .compatible = "adi,adp1050", .data = &adp1050_info}, | ||
{ .compatible = "adi,adp1051", .data = &adp1051_info}, | ||
{ .compatible = "adi,adp1055", .data = &adp1055_info}, | ||
{} | ||
}; | ||
MODULE_DEVICE_TABLE(of, adp1050_of_match); | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just add here the links to new datasheets