| Message ID | 20170815200502.17339-5-hdegoede@redhat.com |
|---|---|
| State | Not Applicable |
| Headers | show |
On Tue, Aug 15, 2017 at 10:04:52PM +0200, Hans de Goede wrote: > This is board specific info so it should come from board config, such > as devicetree. > > I've chosen to prefix these with "fcs," treating them as fusb302 driver > specific for now. We may want to revisit this and replace these with > properties which are part of a (to be written) generic type-c controller > devicetree binding. > > Since this commit adds new dt-properties it also adds devicetree-bindings > documentation (which so far was absent for the fusb302 driver). > > Cc: Rob Herring <robh+dt@kernel.org> > Cc: Frank Rowand <frowand.list@gmail.com> > Cc: devicetree@vger.kernel.org > Cc: "Yueyao (Nathan) Zhu" <yueyao@google.com> > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > Changes in v2: > -Use micro... instead of mili... > -Add devicetree bindings documentation > --- > .../devicetree/bindings/usb/fcs,fusb302.txt | 29 ++++++++++++++++++++++ > drivers/staging/typec/fusb302/TODO | 4 +++ > drivers/staging/typec/fusb302/fusb302.c | 18 +++++++++++++- > 3 files changed, 50 insertions(+), 1 deletion(-) > create mode 100644 Documentation/devicetree/bindings/usb/fcs,fusb302.txt > > diff --git a/Documentation/devicetree/bindings/usb/fcs,fusb302.txt b/Documentation/devicetree/bindings/usb/fcs,fusb302.txt > new file mode 100644 > index 0000000..ffc6c87 > --- /dev/null > +++ b/Documentation/devicetree/bindings/usb/fcs,fusb302.txt > @@ -0,0 +1,29 @@ > +Fairchild FUSB302 Type-C Port controllers > + > +Required properties : > +- compatible : "fcs,fusb302" > +- reg : I2C slave address > +- interrupts : Interrupt specifier > + > +Optional properties : > +- fcs,max-snk-microvolt : Maximum voltage to negotiate when configured as sink > +- fcs,max-snk-microamp : Maximum current to negotiate when configured as sink > +- fcs,max-snk-microwatt : Maximum power to negotiate when configured as sink > + If this is less then max-snk-microvolt * > + max-snk-microamp then the configured current will > + be clamped. > +- fcs,operating-snk-microwatt : Might as well spell out sink. Otherwise, Acked-by: Rob Herring <robh@kernel.org> > + Minimum amount of power accepted from a sink > + when negotiating > + > +Example: > + > +fusb302: typec-portc@54 { > + compatible = "fcs,fusb302"; > + reg = <0x54>; > + interrupt-parent = <&nmi_intc>; > + interrupts = <0 IRQ_TYPE_LEVEL_LOW>; > + fcs,max-snk-microvolt = <12000000>; > + fcs,max-snk-microamp = <3000000>; > + fcs,max-snk-microwatt = <36000000>; > +};
Hi, On 17-08-17 23:41, Rob Herring wrote: > On Tue, Aug 15, 2017 at 10:04:52PM +0200, Hans de Goede wrote: >> This is board specific info so it should come from board config, such >> as devicetree. >> >> I've chosen to prefix these with "fcs," treating them as fusb302 driver >> specific for now. We may want to revisit this and replace these with >> properties which are part of a (to be written) generic type-c controller >> devicetree binding. >> >> Since this commit adds new dt-properties it also adds devicetree-bindings >> documentation (which so far was absent for the fusb302 driver). >> >> Cc: Rob Herring <robh+dt@kernel.org> >> Cc: Frank Rowand <frowand.list@gmail.com> >> Cc: devicetree@vger.kernel.org >> Cc: "Yueyao (Nathan) Zhu" <yueyao@google.com> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >> --- >> Changes in v2: >> -Use micro... instead of mili... >> -Add devicetree bindings documentation >> --- >> .../devicetree/bindings/usb/fcs,fusb302.txt | 29 ++++++++++++++++++++++ >> drivers/staging/typec/fusb302/TODO | 4 +++ >> drivers/staging/typec/fusb302/fusb302.c | 18 +++++++++++++- >> 3 files changed, 50 insertions(+), 1 deletion(-) >> create mode 100644 Documentation/devicetree/bindings/usb/fcs,fusb302.txt >> >> diff --git a/Documentation/devicetree/bindings/usb/fcs,fusb302.txt b/Documentation/devicetree/bindings/usb/fcs,fusb302.txt >> new file mode 100644 >> index 0000000..ffc6c87 >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/usb/fcs,fusb302.txt >> @@ -0,0 +1,29 @@ >> +Fairchild FUSB302 Type-C Port controllers >> + >> +Required properties : >> +- compatible : "fcs,fusb302" >> +- reg : I2C slave address >> +- interrupts : Interrupt specifier >> + >> +Optional properties : >> +- fcs,max-snk-microvolt : Maximum voltage to negotiate when configured as sink >> +- fcs,max-snk-microamp : Maximum current to negotiate when configured as sink >> +- fcs,max-snk-microwatt : Maximum power to negotiate when configured as sink >> + If this is less then max-snk-microvolt * >> + max-snk-microamp then the configured current will >> + be clamped. >> +- fcs,operating-snk-microwatt : > > Might as well spell out sink. Fixed for v3. > Otherwise, > > Acked-by: Rob Herring <robh@kernel.org> Thank you, added to v3 of this patch-set. Regards, Hans > >> + Minimum amount of power accepted from a sink >> + when negotiating >> + >> +Example: >> + >> +fusb302: typec-portc@54 { >> + compatible = "fcs,fusb302"; >> + reg = <0x54>; >> + interrupt-parent = <&nmi_intc>; >> + interrupts = <0 IRQ_TYPE_LEVEL_LOW>; >> + fcs,max-snk-microvolt = <12000000>; >> + fcs,max-snk-microamp = <3000000>; >> + fcs,max-snk-microwatt = <36000000>; >> +};
diff --git a/Documentation/devicetree/bindings/usb/fcs,fusb302.txt b/Documentation/devicetree/bindings/usb/fcs,fusb302.txt new file mode 100644 index 0000000..ffc6c87 --- /dev/null +++ b/Documentation/devicetree/bindings/usb/fcs,fusb302.txt @@ -0,0 +1,29 @@ +Fairchild FUSB302 Type-C Port controllers + +Required properties : +- compatible : "fcs,fusb302" +- reg : I2C slave address +- interrupts : Interrupt specifier + +Optional properties : +- fcs,max-snk-microvolt : Maximum voltage to negotiate when configured as sink +- fcs,max-snk-microamp : Maximum current to negotiate when configured as sink +- fcs,max-snk-microwatt : Maximum power to negotiate when configured as sink + If this is less then max-snk-microvolt * + max-snk-microamp then the configured current will + be clamped. +- fcs,operating-snk-microwatt : + Minimum amount of power accepted from a sink + when negotiating + +Example: + +fusb302: typec-portc@54 { + compatible = "fcs,fusb302"; + reg = <0x54>; + interrupt-parent = <&nmi_intc>; + interrupts = <0 IRQ_TYPE_LEVEL_LOW>; + fcs,max-snk-microvolt = <12000000>; + fcs,max-snk-microamp = <3000000>; + fcs,max-snk-microwatt = <36000000>; +}; diff --git a/drivers/staging/typec/fusb302/TODO b/drivers/staging/typec/fusb302/TODO index 4933a1d..19b466e 100644 --- a/drivers/staging/typec/fusb302/TODO +++ b/drivers/staging/typec/fusb302/TODO @@ -4,3 +4,7 @@ fusb302: - Find a non-hacky way to coordinate between PM and I2C access - Documentation? The FUSB302 datasheet provides information on the chip to help understand the code. But it may still be helpful to have a documentation. +- We may want to replace the "fcs,max-snk-microvolt", "fcs,max-snk-microamp", + "fcs,max-snk-microwatt" and "fcs,operating-snk-microwatt" device(tree) + properties with properties which are part of a generic type-c controller + devicetree binding. diff --git a/drivers/staging/typec/fusb302/fusb302.c b/drivers/staging/typec/fusb302/fusb302.c index 6baed06..e1efc67 100644 --- a/drivers/staging/typec/fusb302/fusb302.c +++ b/drivers/staging/typec/fusb302/fusb302.c @@ -90,6 +90,7 @@ struct fusb302_chip { struct i2c_client *i2c_client; struct tcpm_port *tcpm_port; struct tcpc_dev tcpc_dev; + struct tcpc_config tcpc_config; struct regulator *vbus; @@ -1198,7 +1199,6 @@ static const struct tcpc_config fusb302_tcpc_config = { static void init_tcpc_dev(struct tcpc_dev *fusb302_tcpc_dev) { - fusb302_tcpc_dev->config = &fusb302_tcpc_config; fusb302_tcpc_dev->init = tcpm_init; fusb302_tcpc_dev->get_vbus = tcpm_get_vbus; fusb302_tcpc_dev->set_cc = tcpm_set_cc; @@ -1684,7 +1684,9 @@ static int fusb302_probe(struct i2c_client *client, { struct fusb302_chip *chip; struct i2c_adapter *adapter; + struct device *dev = &client->dev; int ret = 0; + u32 val; adapter = to_i2c_adapter(client->dev.parent); if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_I2C_BLOCK)) { @@ -1699,8 +1701,22 @@ static int fusb302_probe(struct i2c_client *client, chip->i2c_client = client; i2c_set_clientdata(client, chip); chip->dev = &client->dev; + chip->tcpc_config = fusb302_tcpc_config; + chip->tcpc_dev.config = &chip->tcpc_config; mutex_init(&chip->lock); + if (!device_property_read_u32(dev, "fcs,max-snk-microvolt", &val)) + chip->tcpc_config.max_snk_mv = val / 1000; + + if (!device_property_read_u32(dev, "fcs,max-snk-microamp", &val)) + chip->tcpc_config.max_snk_ma = val / 1000; + + if (!device_property_read_u32(dev, "fcs,max-snk-microwatt", &val)) + chip->tcpc_config.max_snk_mw = val / 1000; + + if (!device_property_read_u32(dev, "fcs,operating-snk-microwatt", &val)) + chip->tcpc_config.operating_snk_mw = val / 1000; + ret = fusb302_debugfs_init(chip); if (ret < 0) return ret;
This is board specific info so it should come from board config, such as devicetree. I've chosen to prefix these with "fcs," treating them as fusb302 driver specific for now. We may want to revisit this and replace these with properties which are part of a (to be written) generic type-c controller devicetree binding. Since this commit adds new dt-properties it also adds devicetree-bindings documentation (which so far was absent for the fusb302 driver). Cc: Rob Herring <robh+dt@kernel.org> Cc: Frank Rowand <frowand.list@gmail.com> Cc: devicetree@vger.kernel.org Cc: "Yueyao (Nathan) Zhu" <yueyao@google.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- Changes in v2: -Use micro... instead of mili... -Add devicetree bindings documentation --- .../devicetree/bindings/usb/fcs,fusb302.txt | 29 ++++++++++++++++++++++ drivers/staging/typec/fusb302/TODO | 4 +++ drivers/staging/typec/fusb302/fusb302.c | 18 +++++++++++++- 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/usb/fcs,fusb302.txt