summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2014-11-02 19:09:38 +0100
committerLee Jones <lee.jones@linaro.org>2014-11-25 17:18:48 +0100
commit1b9b46d05f887aec418b3a5f4f55abf79316fcda (patch)
tree7d9d5434346151e8a4cb2b0273fa73da31850a0a /drivers/mfd
parentmfd: rtsx: Fix PM suspend for 5227 & 5249 (diff)
downloadlinux-1b9b46d05f887aec418b3a5f4f55abf79316fcda.tar.xz
linux-1b9b46d05f887aec418b3a5f4f55abf79316fcda.zip
mfd: twl4030-power: Fix regression with missing compatible flag
Commit e7cd1d1eb16f ("mfd: twl4030-power: Add generic reset configuration") accidentally removed the compatible flag for "ti,twl4030-power" that should be there as documented in the binding. If "ti,twl4030-power" only the poweroff configuration is done by the driver. Fixes: e7cd1d1eb16f ("mfd: twl4030-power: Add generic reset configuration") Cc: stable@vger.kernel.org # v3.16+ Reported-by: "Dr. H. Nikolaus Schaller" <hns@goldelico.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/twl4030-power.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
index cf92a6d1c532..87f3ea8fd29a 100644
--- a/drivers/mfd/twl4030-power.c
+++ b/drivers/mfd/twl4030-power.c
@@ -779,6 +779,9 @@ static struct twl4030_power_data osc_off_idle = {
static struct of_device_id twl4030_power_of_match[] = {
{
+ .compatible = "ti,twl4030-power",
+ },
+ {
.compatible = "ti,twl4030-power-reset",
.data = &omap3_reset,
},