|
@@ -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:
|
|
@@ -1147,10 +1148,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)) {
|