Commit feffb0cc authored by Charles Keepax's avatar Charles Keepax Committed by Chanwoo Choi
Browse files

extcon: arizona: Update to use the new device properties API 



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: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
parent 1fe189bf

drivers/extcon/extcon-arizona.c

+5 −6
Original line number Diff line number Diff line
@@ -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);

	}

		arizona_extcon_device_get_pdata(arizona);



	info->micvdd = devm_regulator_get(&pdev->dev, "MICVDD");

	if (IS_ERR(info->micvdd)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE