From: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
To: cw00.choi@samsung.com
Cc: myungjoo.ham@samsung.com, linux-kernel@vger.kernel.org,
patches@opensource.wolfsonmicro.com
Subject: [PATCH v3 2/7] extcon: arizona: Update to use the new device properties API
Date: Fri, 19 Jun 2015 11:24:22 +0100 [thread overview]
Message-ID: <1434709467-28147-3-git-send-email-ckeepax@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1434709467-28147-1-git-send-email-ckeepax@opensource.wolfsonmicro.com>
The device properties API will load data from both device tree and ACPI,
update the binding to use this API instead of the OF API.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
drivers/extcon/extcon-arizona.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index e31613a..d990495 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -24,6 +24,7 @@
#include <linux/input.h>
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
+#include <linux/property.h>
#include <linux/regulator/consumer.h>
#include <linux/extcon.h>
@@ -1110,12 +1111,12 @@ static void arizona_micd_set_level(struct arizona *arizona, int index,
regmap_update_bits(arizona->regmap, reg, mask, level);
}
-static int arizona_extcon_of_get_pdata(struct arizona *arizona)
+static int arizona_extcon_device_get_pdata(struct arizona *arizona)
{
struct arizona_pdata *pdata = &arizona->pdata;
unsigned int val = ARIZONA_ACCDET_MODE_HPL;
- of_property_read_u32(arizona->dev->of_node, "wlf,hpdet-channel", &val);
+ device_property_read_u32(arizona->dev, "wlf,hpdet-channel", &val);
switch (val) {
case ARIZONA_ACCDET_MODE_HPL:
case ARIZONA_ACCDET_MODE_HPR:
@@ -1148,10 +1149,8 @@ static int arizona_extcon_probe(struct platform_device *pdev)
if (!info)
return -ENOMEM;
- if (IS_ENABLED(CONFIG_OF)) {
- if (!dev_get_platdata(arizona->dev))
- arizona_extcon_of_get_pdata(arizona);
- }
+ if (!dev_get_platdata(arizona->dev))
+ arizona_extcon_device_get_pdata(arizona);
info->micvdd = devm_regulator_get(&pdev->dev, "MICVDD");
if (IS_ERR(info->micvdd)) {
--
1.7.2.5
next prev parent reply other threads:[~2015-06-19 10:38 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-19 10:24 [PATCH v3 0/7] Add basic microphone detection bindings Charles Keepax
2015-06-19 10:24 ` [PATCH v3 1/7] extcon: arizona: Factor out initial GPIO state Charles Keepax
2015-06-19 12:29 ` Chanwoo Choi
2015-06-19 12:54 ` Charles Keepax
2015-06-19 10:24 ` Charles Keepax [this message]
2015-06-19 10:24 ` [PATCH v3 3/7] extcon: arizona: Add basic microphone detection DT/ACPI bindings Charles Keepax
2015-06-19 10:24 ` [PATCH v3 4/7] extcon: arizona: Convert to gpiod Charles Keepax
2015-06-19 10:24 ` [PATCH v3 5/7] extcon: arizona: Ensure variables are set for headphone detection Charles Keepax
2015-06-19 10:24 ` [PATCH v3 6/7] mfd: arizona: Update DT doc for new mic detection bindings Charles Keepax
2015-06-24 14:15 ` Lee Jones
2015-06-24 15:41 ` Charles Keepax
2015-06-25 8:53 ` Lee Jones
2015-06-25 8:53 ` Lee Jones
2015-06-19 10:24 ` [PATCH v3 7/7] mfd: arizona: Update several pdata members to unsigned Charles Keepax
2015-06-24 14:16 ` Lee Jones
2015-06-19 10:46 ` [PATCH v3 0/7] Add basic microphone detection bindings Charles Keepax
-- strict thread matches above, loose matches on Subject: below --
2015-06-19 10:33 Charles Keepax
2015-06-19 10:33 ` [PATCH v3 2/7] extcon: arizona: Update to use the new device properties API Charles Keepax
2015-06-19 10:33 ` Charles Keepax
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1434709467-28147-3-git-send-email-ckeepax@opensource.wolfsonmicro.com \
--to=ckeepax@opensource.wolfsonmicro.com \
--cc=cw00.choi@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=myungjoo.ham@samsung.com \
--cc=patches@opensource.wolfsonmicro.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.