| Message ID | 20210329105047.51033-7-heikki.krogerus@linux.intel.com |
|---|---|
| State | Accepted |
| Commit | 3a3438e594bf8b2d8fcfd11f3aa2a93e215b92b7 |
| Headers | show |
| Series | i2c: Adding support for software nodes | expand |
> What is the plan for merging this patch / this series ?
I'll take the series via I2C.
Hi, On 4/6/21 9:40 PM, Wolfram Sang wrote: > >> What is the plan for merging this patch / this series ? > > I'll take the series via I2C. Ok, that works for me. Regards, Hans
diff --git a/drivers/platform/x86/intel_cht_int33fe_microb.c b/drivers/platform/x86/intel_cht_int33fe_microb.c index 20b11e0d9a758..673f41cd14b52 100644 --- a/drivers/platform/x86/intel_cht_int33fe_microb.c +++ b/drivers/platform/x86/intel_cht_int33fe_microb.c @@ -35,6 +35,10 @@ static const struct property_entry bq27xxx_props[] = { { } }; +static const struct software_node bq27xxx_node = { + .properties = bq27xxx_props, +}; + int cht_int33fe_microb_probe(struct cht_int33fe_data *data) { struct device *dev = data->dev; @@ -43,7 +47,7 @@ int cht_int33fe_microb_probe(struct cht_int33fe_data *data) memset(&board_info, 0, sizeof(board_info)); strscpy(board_info.type, "bq27542", ARRAY_SIZE(board_info.type)); board_info.dev_name = "bq27542"; - board_info.properties = bq27xxx_props; + board_info.swnode = &bq27xxx_node; data->battery_fg = i2c_acpi_new_device(dev, 1, &board_info); return PTR_ERR_OR_ZERO(data->battery_fg);
Additional device properties are always just a part of a software fwnode. If the device properties are constant, the software node can also be constant. Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Cc: Hans de Goede <hdegoede@redhat.com> --- drivers/platform/x86/intel_cht_int33fe_microb.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)