[PATCH] mfd: twl4030-power: Support compatible = "ti,twl4030-power" again.

From: NeilBrown
Date: Fri Nov 07 2014 - 19:22:41 EST



commit e7cd1d1eb16fcdf53001b926187a82f1f3e1a7e6
mfd: twl4030-power: Add generic reset configuration

claims:
Let's add device tree support and configure things for warm reset
as the default when compatible = "ti,twl4030-power".
and
Documentation/devicetree/bindings/mfd/twl4030-power.txt
claims that "ti,twl4030-power" is still a valid "compatible" setting.

However the current driver fails to probe with that 'compatible'
setting.
Restore the old default.

Signed-off-by: NeilBrown <neilb@xxxxxxx>

diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
index 4d3ff3771491..1a7794f6be15 100644
--- a/drivers/mfd/twl4030-power.c
+++ b/drivers/mfd/twl4030-power.c
@@ -776,6 +776,10 @@ static struct twl4030_power_data osc_off_idle = {

static struct of_device_id twl4030_power_of_match[] = {
{
+ .compatible = "ti,twl4030-power",
+ .data = NULL,
+ },
+ {
.compatible = "ti,twl4030-power-reset",
.data = &omap3_reset,
},

Attachment: pgpjSKgunsyZZ.pgp
Description: OpenPGP digital signature