-
Notifications
You must be signed in to change notification settings - Fork 853
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.
+97
−9
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
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
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