mfd: bd718x7: Set button press duration via dt only
Subsystems (3)
v2 cover mfd: bd718x7: Set button press duration via dt only
The reset button on imx8mm-evk is tied to PWRON_B pin of bd71847 and the long press duration is set to zero from OTP. The linux driver overrides those values and breaks reset from button.
Overwriting OTP or bootloader configuration with some hardcoded defaults is not desirable, power button should behave identically from bootloader to kernel.
Add DT properties to allow explicitly overriding press durations but don't do anything by default.
Changes since v1:
* Attempt to round to closest supporting value
* Spelling fix in PATCH 2 commit message
* Collect acks
Link to v1: https://patchwork.kernel.org/project/linux-arm-kernel/list/?series=119597
Leonard Crestez (3):
mfd: bd718x7: Remove hardcoded config for button press duration
dt-bindings: mfd: Document short/long press duration for bd718x7
mfd: bd718x7: Make power button press duration configurable
.../bindings/mfd/rohm,bd71837-pmic.txt | 8 +++ drivers/mfd/rohm-bd718x7.c | 61 ++++++++++++------- 2 files changed, 48 insertions(+), 21 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/3 mfd: bd718x7: Remove hardcoded config for button press duration
The reset button on imx8mm-evk is tied to PWRON_B pin of bd71847 and the long press duration is set to zero from OTP. The linux driver overrides those values and breaks reset from button.
Overwriting OTP or bootloader configuration with some hardcoded defaults is not desirable, keep already programmed values instead.
--- drivers/mfd/rohm-bd718x7.c | 23 ----------------------- 1 file changed, 23 deletions(-)
drivers/mfd/rohm-bd718x7.c +0 -23
@@ -115,33 +115,10 @@ static int bd718xx_i2c_probe(struct i2c_client *i2c,if (ret) {dev_err (&i2c->dev,"Failed to add irq_chip\n" );return ret; } -/* Configure short press to 10 milliseconds */ - ret =regmap_update_bits (bd718xx->regmap, -BD718XX_REG_PWRONCONFIG0 , -BD718XX_PWRBTN_PRESS_DURATION_MASK , -BD718XX_PWRBTN_SHORT_PRESS_10MS ); -if (ret) { -dev_err (&i2c->dev, -"Failed to configure button short press timeout\n" ); -return ret; - } - -/* Configure long press to 10 seconds */ - ret =regmap_update_bits (bd718xx->regmap, -BD718XX_REG_PWRONCONFIG1 , -BD718XX_PWRBTN_PRESS_DURATION_MASK , -BD718XX_PWRBTN_LONG_PRESS_10S ); - -if (ret) { -dev_err (&i2c->dev, -"Failed to configure button long press timeout\n" ); -return ret; - } - ret =regmap_irq_get_virq (bd718xx->irq_data,BD718XX_INT_PWRBTN_S );if (ret <0 ) {dev_err (&i2c->dev,"Failed to get the IRQ\n" );return ret;
Signature · 1 line
2.17.1
Lee Jones
AppliedRe: [PATCH v2 1/3] mfd: bd718x7: Remove hardcoded config for button press duration
Quoted 4 lines · Leonard Crestez
The reset button on imx8mm-evk is tied to
PWRON_Bpin of bd71847 and the long press duration is set to zero from OTP. The linux driver overrides those values and breaks reset from button.
Quoted 8 lines
Overwriting OTP or bootloader configuration with some hardcoded defaults is not desirable, keep already programmed values instead.
Signed-off-by Leonard Crestez <[email protected]>Acked-by Matti Vaittinen <[email protected]>--- drivers/mfd/rohm-bd718x7.c | 23 ----------------------- 1 file changed, 23 deletions(-)
Applied, thanks.
Signature · 9 lines
Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 2/3 dt-bindings: mfd: Document short/long press duration for bd718x7
In reply to Leonard CrestezThese values can be overwritten at probe time.
--- .../devicetree/bindings/mfd/rohm,bd71837-pmic.txt | 8 ++++++++ 1 file changed, 8 insertions(+)
Documentation/devicetree/bindings/mfd/rohm,bd71837-pmic.txt +8 -0
@@ -36,10 +36,18 @@ switched power state to SNVS. If reset is done via READY state the power outputs will be returned to HW control by OTP loading. Thus the reset target state is set to READY by default. If SNVS state is used the boot crucial regulators must have the regulator-always-on and regulator-boot-on properties set in regulator node. +- rohm,short-press-ms : Short press duration in milliseconds +- rohm,long-press-ms : Long press duration in milliseconds + +Configure the "short press" and "long press" timers for the power button. +Values are rounded to what hardware supports (500ms multiple for short and +1000ms multiple for long). If these properties are not present the existing +configuration (from bootloader or OTP) is not touched. + Example: /* external oscillator node */ osc: oscillator { compatible = "fixed-clock";
Signature · 1 line
2.17.1
Lee Jones
AppliedRe: [PATCH v2 2/3] dt-bindings: mfd: Document short/long press duration for bd718x7
Quoted 7 lines · Leonard Crestez
These values can be overwritten at probe time.
Signed-off-by Leonard Crestez <[email protected]>Acked-by Matti Vaittinen <[email protected]>--- .../devicetree/bindings/mfd/rohm,bd71837-pmic.txt | 8 ++++++++ 1 file changed, 8 insertions(+)
Applied, thanks.
Signature · 9 lines
Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Rob Herring
maintainerRe: [PATCH v2 2/3] dt-bindings: mfd: Document short/long press duration for bd718x7
In reply to Leonard CrestezQuoted 15 lines · Leonard Crestez
These values can be overwritten at probe time.
Signed-off-by Leonard Crestez <[email protected]>Acked-by Matti Vaittinen <[email protected]>--- .../devicetree/bindings/mfd/rohm,bd71837-pmic.txt | 8 ++++++++ 1 file changed, 8 insertions(+)Documentation/devicetree/bindings/mfd/rohm,bd71837-pmic.txt +0
-0@@ -36,10 +36,18 @@ switched power state to SNVS. If reset is done via READY state the power outputs will be returned to HW control by OTP loading. Thus the reset target state is set to READY by default. If SNVS state is used the boot
Documentation/devicetree/bindings/mfd/rohm,bd71837-pmic.txt switched power state to SNVS. If reset is done via READY state the power · line 47
Quoted 10 lines
Documentation/devicetree/bindings/mfd/rohm,bd71837-pmic.txt +7
-0crucial regulators must have the regulator-always-on and regulator-boot-on properties set in regulator node. +- rohm,short-press-ms : Short press duration in milliseconds +- rohm,long-press-ms : Long press duration in milliseconds + +Configure the "short press" and "long press" timers for the power button. +Values are rounded to what hardware supports (500ms multiple for short and +1000ms multiple for long). If these properties are not present the existing +configuration (from bootloader or OTP) is not touched.
We already have a standard property 'power-off-time-sec' for at least part of this assuming 'long' or 'short' causes a power off. 'long' and 'short' don't describe anything useful. The action should be described.
Rob
PATCH v2 3/3 mfd: bd718x7: Make power button press duration configurable
In reply to Leonard CrestezAllow overwriting the values in BD718XX_REG_PWRONCONFIG0 and BD718XX_REG_PWRONCONFIG1 via devicetree. Read values in milliseconds and attempt to round them to something supported by the hardware.
Keep existing values (from bootloader or OTP) if property is not present.
--- drivers/mfd/rohm-bd718x7.c | 42 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+)
drivers/mfd/rohm-bd718x7.c +42 -0
@@ -79,10 +79,48 @@ static const struct regmap_config bd718xx_regmap_config = { .volatile_table = &volatile_regs, .max_register = BD718XX_MAX_REGISTER - 1, .cache_type = REGCACHE_RBTREE, }; +static int bd718xx_init_press_duration (struct bd718xx *bd718xx) +{ +struct device * dev = bd718xx->dev; +u32 short_press_ms, long_press_ms; +u32 short_press_value, long_press_value; +int ret; + + ret =of_property_read_u32 (dev->of_node,"rohm,short-press-ms" , + &short_press_ms); +if (!ret) { + short_press_value =min (15u , (short_press_ms +250 ) /500 ); + ret =regmap_update_bits (bd718xx->regmap, +BD718XX_REG_PWRONCONFIG0 , +BD718XX_PWRBTN_PRESS_DURATION_MASK , + short_press_value); +if (ret) { +dev_err (dev,"Failed to init pwron short press\n" ); +return ret; + } + } + + ret =of_property_read_u32 (dev->of_node,"rohm,long-press-ms" , + &long_press_ms); +if (!ret) { + long_press_value =min (15u , (long_press_ms +500 ) /1000 ); + ret =regmap_update_bits (bd718xx->regmap, +BD718XX_REG_PWRONCONFIG1 , +BD718XX_PWRBTN_PRESS_DURATION_MASK , + long_press_value); +if (ret) { +dev_err (dev,"Failed to init pwron long press\n" ); +return ret; + } + } + +return 0 ; +} +static int bd718xx_i2c_probe (struct i2c_client *i2c,const struct i2c_device_id *id) {struct bd718xx *bd718xx;int ret;
@@ -115,10 +153,14 @@ static int bd718xx_i2c_probe(struct i2c_client *i2c,if (ret) {dev_err (&i2c->dev,"Failed to add irq_chip\n" );return ret; } + ret =bd718xx_init_press_duration (bd718xx); +if (ret) +return ret; + ret =regmap_irq_get_virq (bd718xx->irq_data,BD718XX_INT_PWRBTN_S );if (ret <0 ) {dev_err (&i2c->dev,"Failed to get the IRQ\n" );return ret;
Signature · 1 line
2.17.1
Lee Jones
AppliedRe: [PATCH v2 3/3] mfd: bd718x7: Make power button press duration configurable
Quoted 4 lines · Leonard Crestez
Allow overwriting the values in
BD718XX_REG_PWRONCONFIG0andBD718XX_REG_PWRONCONFIG1via devicetree. Read values in milliseconds and attempt to round them to something supported by the hardware.
Quoted 8 lines
Keep existing values (from bootloader or OTP) if property is not present.
Signed-off-by Leonard Crestez <[email protected]>Reviewed-by Matti Vaittinen <[email protected]>--- drivers/mfd/rohm-bd718x7.c | 42 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+)
Applied, thanks.
Signature · 9 lines
Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel