Re: [PATCH v4 13/16] platform/x86: intel_cht_int33fe: Provide software nodes for the devices

Rafael J. Wysocki
2019-05-31T09:10:35Z

On Wednesday, May 29, 2019 11:30:58 AM CEST Hans de Goede wrote:
> Hi,
>
> On 5/22/19 12:51 PM, Heikki Krogerus wrote:
> > Software nodes provide two features that we will need later.
> > 1) Software nodes can have references to other software nodes.
> > 2) Software nodes can exist before a device entry is created.
> >
> > Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> > ---
> > drivers/platform/x86/intel_cht_int33fe.c | 53 ++++++++++++++++++++----
> > 1 file changed, 45 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/platform/x86/intel_cht_int33fe.c b/drivers/platform/x86/intel_cht_int33fe.c
> > index 4ab47d6df413..a4ebd1d6b5b6 100644
> > --- a/drivers/platform/x86/intel_cht_int33fe.c
> > +++ b/drivers/platform/x86/intel_cht_int33fe.c
> > @@ -27,6 +27,13 @@
> >
> > #define EXPECTED_PTYPE 4
> >
> > +enum {
> > + INT33FE_NODE_FUSB302,
> > + INT33FE_NODE_MAX17047,
> > + INT33FE_NODE_PI3USB30532,
> > + INT33FE_NODE_MAX,
> > +};
> > +
> > struct cht_int33fe_data {
> > struct i2c_client *max17047;
> > struct i2c_client *fusb302;
> > @@ -72,8 +79,13 @@ static const struct property_entry max17047_props[] = {
> >
> > static const struct property_entry fusb302_props[] = {
> > PROPERTY_ENTRY_STRING("linux,extcon-name", "cht_wcove_pwrsrc"),
> > - PROPERTY_ENTRY_U32("fcs,max-sink-microvolt", 12000000),
> > - PROPERTY_ENTRY_U32("fcs,max-sink-microamp", 3000000),
> > + { }
> > +};
> > +
> > +static const struct software_node nodes[] = {
> > + { "fusb302", NULL, fusb302_props },
> > + { "max17047", NULL, max17047_props },
> > + { "pi3usb30532" },
> > { }
> > };
> >
> > @@ -82,14 +94,17 @@ cht_int33fe_register_max17047(struct device *dev, struct cht_int33fe_data *data)
> > {
> > struct i2c_client *max17047 = NULL;
> > struct i2c_board_info board_info;
> > + struct fwnode_handle *fwnode;
> > int ret;
> >
> > + fwnode = software_node_fwnode(&nodes[INT33FE_NODE_MAX17047]);
> > + if (!fwnode)
> > + return -ENODEV;
> > +
> > i2c_for_each_dev(&max17047, cht_int33fe_check_for_max17047);
> > if (max17047) {
> > /* Pre-existing i2c-client for the max17047, add device-props */
> > - ret = device_add_properties(&max17047->dev, max17047_props);
> > - if (ret)
> > - return ret;
> > + max17047->dev.fwnode->secondary = fwnode;
>
> I believe that you should do:
> fwnode->secondary = ERR_PTR(-ENODEV);
> cht_int33fe_setup_dp
> Before this call, as you are doing in the cht_int33fe_setup_dp function.

So I'm inclined to defer this patch until it is improved and queue up the rest of the series.

I can fix up the typo in the [15/16] while handling it.