lkml.org 
[lkml]   [2014]   [Jun]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH resend v2 3/3] arizona-mfd-codecs: Add mfd_register_supply_aliases() calls
Date
The mfd-core no longer registers the supply aliases, instead the platform
driver probe method must now call mfd_register_supply_aliases().

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
sound/soc/codecs/wm5102.c | 5 +++++
sound/soc/codecs/wm5110.c | 5 +++++
sound/soc/codecs/wm8997.c | 7 ++++++-
3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c
index 289b64d..82249c4 100644
--- a/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@ -26,6 +26,7 @@
#include <sound/initval.h>
#include <sound/tlv.h>

+#include <linux/mfd/core.h>
#include <linux/mfd/arizona/core.h>
#include <linux/mfd/arizona/registers.h>

@@ -1829,6 +1830,10 @@ static int wm5102_probe(struct platform_device *pdev)
struct wm5102_priv *wm5102;
int i, ret;

+ ret = mfd_register_supply_aliases(pdev);
+ if (ret)
+ return ret;
+
wm5102 = devm_kzalloc(&pdev->dev, sizeof(struct wm5102_priv),
GFP_KERNEL);
if (wm5102 == NULL)
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index 2e5fcb5..786a64a 100644
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -26,6 +26,7 @@
#include <sound/initval.h>
#include <sound/tlv.h>

+#include <linux/mfd/core.h>
#include <linux/mfd/arizona/core.h>
#include <linux/mfd/arizona/registers.h>

@@ -1665,6 +1666,10 @@ static int wm5110_probe(struct platform_device *pdev)
struct wm5110_priv *wm5110;
int i, ret;

+ ret = mfd_register_supply_aliases(pdev);
+ if (ret)
+ return ret;
+
wm5110 = devm_kzalloc(&pdev->dev, sizeof(struct wm5110_priv),
GFP_KERNEL);
if (wm5110 == NULL)
diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c
index bb9b47b..e7c9c4e 100644
--- a/sound/soc/codecs/wm8997.c
+++ b/sound/soc/codecs/wm8997.c
@@ -26,6 +26,7 @@
#include <sound/initval.h>
#include <sound/tlv.h>

+#include <linux/mfd/core.h>
#include <linux/mfd/arizona/core.h>
#include <linux/mfd/arizona/registers.h>

@@ -1110,7 +1111,11 @@ static int wm8997_probe(struct platform_device *pdev)
{
struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
struct wm8997_priv *wm8997;
- int i;
+ int i, ret;
+
+ ret = mfd_register_supply_aliases(pdev);
+ if (ret)
+ return ret;

wm8997 = devm_kzalloc(&pdev->dev, sizeof(struct wm8997_priv),
GFP_KERNEL);
--
2.0.0


\
 
 \ /
  Last update: 2014-06-30 17:01    [W:0.055 / U:0.124 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site