| Message ID | 20171003181922.42827-1-rajatja@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, 3 Oct 2017, Rajat Jain wrote: > The property "post-power-on-delay-ms" allows a platform to specify > the delay needed after power-on, but only via device trees currently. > Use device_property_* instead of of_* reads to allow ACPI systems to > also provide the same information. This is useful for Wacom hardware > on ACPI systems. > > Signed-off-by: Rajat Jain <rajatja@google.com> > --- > v3: introduce i2c_hid_fwnode_probe() to parse common device_properties. > Also fixup the binding doc to indicate that regulator isn't a > requirement for "post-power-on-delay-ms" > v2: Don't change any other existing logic, only read "post-power-on-delay-ms" > in i2c_hid_acpi_pdata() also. > v1: Try to unify everything using device properties, convert i2c_hid_of_probe() > to i2c_hid_fwnode_probe() and call i2c_hid_acpi_pdata() if can't get > HID register address using device_property. Queued now for 4.16 merge window.
diff --git a/Documentation/devicetree/bindings/input/hid-over-i2c.txt b/Documentation/devicetree/bindings/input/hid-over-i2c.txt index 28e8bd8b7d64..4d3da9d91de4 100644 --- a/Documentation/devicetree/bindings/input/hid-over-i2c.txt +++ b/Documentation/devicetree/bindings/input/hid-over-i2c.txt @@ -31,7 +31,7 @@ device-specific compatible properties, which should be used in addition to the - vdd-supply: phandle of the regulator that provides the supply voltage. - post-power-on-delay-ms: time required by the device after enabling its regulators - before it is ready for communication. Must be used with 'vdd-supply'. + or powering it on, before it is ready for communication. Example: diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c index 77396145d2d0..741a457dfe61 100644 --- a/drivers/hid/i2c-hid/i2c-hid.c +++ b/drivers/hid/i2c-hid/i2c-hid.c @@ -928,11 +928,6 @@ static int i2c_hid_of_probe(struct i2c_client *client, } pdata->hid_descriptor_address = val; - ret = of_property_read_u32(dev->of_node, "post-power-on-delay-ms", - &val); - if (!ret) - pdata->post_power_delay_ms = val; - return 0; } @@ -949,6 +944,16 @@ static inline int i2c_hid_of_probe(struct i2c_client *client, } #endif +static void i2c_hid_fwnode_probe(struct i2c_client *client, + struct i2c_hid_platform_data *pdata) +{ + u32 val; + + if (!device_property_read_u32(&client->dev, "post-power-on-delay-ms", + &val)) + pdata->post_power_delay_ms = val; +} + static int i2c_hid_probe(struct i2c_client *client, const struct i2c_device_id *dev_id) { @@ -992,6 +997,9 @@ static int i2c_hid_probe(struct i2c_client *client, ihid->pdata = *platform_data; } + /* Parse platform agnostic common properties from ACPI / device tree */ + i2c_hid_fwnode_probe(client, &ihid->pdata); + ihid->pdata.supply = devm_regulator_get(&client->dev, "vdd"); if (IS_ERR(ihid->pdata.supply)) { ret = PTR_ERR(ihid->pdata.supply);
The property "post-power-on-delay-ms" allows a platform to specify the delay needed after power-on, but only via device trees currently. Use device_property_* instead of of_* reads to allow ACPI systems to also provide the same information. This is useful for Wacom hardware on ACPI systems. Signed-off-by: Rajat Jain <rajatja@google.com> --- v3: introduce i2c_hid_fwnode_probe() to parse common device_properties. Also fixup the binding doc to indicate that regulator isn't a requirement for "post-power-on-delay-ms" v2: Don't change any other existing logic, only read "post-power-on-delay-ms" in i2c_hid_acpi_pdata() also. v1: Try to unify everything using device properties, convert i2c_hid_of_probe() to i2c_hid_fwnode_probe() and call i2c_hid_acpi_pdata() if can't get HID register address using device_property. .../devicetree/bindings/input/hid-over-i2c.txt | 2 +- drivers/hid/i2c-hid/i2c-hid.c | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-)