--- v2
+++ v4
@@ -1,24 +1,131 @@
-According to fsl,mc13xxx.yaml, the node name for led-control is
-vendor prefixed. Change it accordingly.
+Add OF support for the mc13783-pwrbutton so that it can be used with
+modern DT based systems.
Signed-off-by: Alexander Kurz <akurz@blala.de>
---
- drivers/leds/leds-mc13783.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ drivers/input/misc/mc13783-pwrbutton.c | 82 ++++++++++++++++++++++++--
+ 1 file changed, 76 insertions(+), 6 deletions(-)
-diff --git a/drivers/leds/leds-mc13783.c b/drivers/leds/leds-mc13783.c
-index e22f09d13798..11add1fd24ce 100644
---- a/drivers/leds/leds-mc13783.c
-+++ b/drivers/leds/leds-mc13783.c
-@@ -127,7 +127,7 @@ static struct mc13xxx_leds_platform_data __init *mc13xxx_led_probe_dt(
- if (!parent)
- return ERR_PTR(-ENODATA);
+diff --git a/drivers/input/misc/mc13783-pwrbutton.c b/drivers/input/misc/mc13783-pwrbutton.c
+index 08618c59197f..46bef0af46ee 100644
+--- a/drivers/input/misc/mc13783-pwrbutton.c
++++ b/drivers/input/misc/mc13783-pwrbutton.c
+@@ -27,6 +27,7 @@
+ #include <linux/interrupt.h>
+ #include <linux/platform_device.h>
+ #include <linux/mfd/mc13783.h>
++#include <linux/property.h>
+ #include <linux/sched.h>
+ #include <linux/slab.h>
-- ret = of_property_read_u32_array(parent, "led-control",
-+ ret = of_property_read_u32_array(parent, "fsl,led-control",
- pdata->led_control,
- leds->devtype->num_regs);
- if (ret)
+@@ -88,8 +89,74 @@ static irqreturn_t button_irq(int irq, void *_priv)
+ return IRQ_HANDLED;
+ }
+
+-static int mc13783_pwrbutton_probe(struct platform_device *pdev)
++static struct mc13xxx_buttons_platform_data __init *mc13xxx_pwrbutton_probe_dt(
++ struct platform_device *pdev)
+ {
++ struct mc13xxx_buttons_platform_data *pdata;
++ struct fwnode_handle *child;
++ struct device *dev = &pdev->dev;
++ struct mc13xxx_button_devtype *devtype =
++ (struct mc13xxx_button_devtype *)platform_get_device_id(pdev)->driver_data;
++
++ pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
++ if (!pdata)
++ return ERR_PTR(-ENOMEM);
++
++ struct fwnode_handle *parent __free(fwnode_handle) =
++ device_get_named_child_node(dev->parent, "buttons");
++ if (!parent)
++ return ERR_PTR(-ENODATA);
++
++ fwnode_for_each_named_child_node(parent, child, "onkey") {
++ u32 idx;
++ u8 dbnc = MC13783_BUTTON_DBNC_30MS;
++ u16 dbnc_ms;
++
++ if (fwnode_property_read_u32(child, "reg", &idx))
++ continue;
++
++ if (idx > devtype->button_id_max) {
++ dev_warn(dev, "reg out of range\n");
++ continue;
++ }
++
++ fwnode_property_read_u16(child, "debounce-delay-ms", &dbnc_ms);
++ switch (dbnc_ms) {
++ case 0:
++ dbnc = MC13783_BUTTON_DBNC_0MS;
++ break;
++ case 30:
++ dbnc = MC13783_BUTTON_DBNC_30MS;
++ break;
++ case 150:
++ dbnc = MC13783_BUTTON_DBNC_150MS;
++ break;
++ case 750:
++ dbnc = MC13783_BUTTON_DBNC_750MS;
++ break;
++ default:
++ dev_warn(dev, "invalid debounce-delay-ms value\n");
++ continue;
++ }
++
++ if (fwnode_property_read_u32(child, "linux,code", &pdata->b_on_key[idx]))
++ continue;
++
++ if (fwnode_property_read_bool(child, "active-low"))
++ pdata->b_on_flags[idx] |= MC13783_BUTTON_POL_INVERT;
++
++ if (fwnode_property_read_bool(child, "fsl,enable-reset"))
++ pdata->b_on_flags[idx] |= MC13783_BUTTON_RESET_EN;
++
++ pdata->b_on_flags[idx] |= MC13783_BUTTON_ENABLE | dbnc;
++ }
++
++ return pdata;
++}
++
++static int __init mc13783_pwrbutton_probe(struct platform_device *pdev)
++{
++ struct device *dev = &pdev->dev;
+ const struct mc13xxx_buttons_platform_data *pdata;
+ struct mc13xxx *mc13783 = dev_get_drvdata(pdev->dev.parent);
+ struct mc13xxx_button_devtype *devtype =
+@@ -101,9 +168,13 @@ static int mc13783_pwrbutton_probe(struct platform_device *pdev)
+ int irq = 0;
+
+ pdata = dev_get_platdata(&pdev->dev);
+- if (!pdata) {
+- dev_err(&pdev->dev, "missing platform data\n");
+- return -ENODEV;
++ if (dev->parent->of_node) {
++ pdata = mc13xxx_pwrbutton_probe_dt(pdev);
++ if (IS_ERR(pdata))
++ return PTR_ERR(pdata);
++ } else if (!pdata) {
++ dev_err(dev, "missing platform data\n");
++ return -ENODATA;
+ }
+
+ pwr = devm_input_allocate_device(&pdev->dev);
+@@ -214,13 +285,12 @@ static const struct platform_device_id mc13xxx_pwrbutton_idtable[] = {
+
+ static struct platform_driver mc13783_pwrbutton_driver = {
+ .id_table = mc13xxx_pwrbutton_idtable,
+- .probe = mc13783_pwrbutton_probe,
+ .driver = {
+ .name = "mc13783-pwrbutton",
+ },
+ };
+
+-module_platform_driver(mc13783_pwrbutton_driver);
++module_platform_driver_probe(mc13783_pwrbutton_driver, mc13783_pwrbutton_probe);
+
+ MODULE_ALIAS("platform:mc13783-pwrbutton");
+ MODULE_DESCRIPTION("MC13783 Power Button");
--
2.39.5