Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bf317e9 authored by Hans de Goede's avatar Hans de Goede Committed by Chanwoo Choi
Browse files

extcon: axp288: Remove unused platform data 



This is not used / set anywhere in the tree.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
parent 10887fb0

drivers/extcon/extcon-axp288.c

+1 −34
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 
#include <linux/notifier.h>

#include <linux/extcon-provider.h>

#include <linux/regmap.h>

#include <linux/gpio.h>

#include <linux/gpio/consumer.h>

#include <linux/mfd/axp20x.h>



/* Power source status register */
@@ -79,11 +77,6 @@ enum axp288_extcon_reg { 
	AXP288_BC_DET_STAT_REG		= 0x2f,

};



enum axp288_mux_select {

	EXTCON_GPIO_MUX_SEL_PMIC = 0,

	EXTCON_GPIO_MUX_SEL_SOC,

};



enum axp288_extcon_irq {

	VBUS_FALLING_IRQ = 0,

	VBUS_RISING_IRQ,
@@ -104,7 +97,6 @@ struct axp288_extcon_info { 
	struct device *dev;

	struct regmap *regmap;

	struct regmap_irq_chip_data *regmap_irqc;

	struct gpio_desc *gpio_mux_cntl;

	int irq[EXTCON_IRQ_END];

	struct extcon_dev *edev;

	unsigned int previous_cable;
@@ -196,15 +188,6 @@ static int axp288_handle_chrg_det_event(struct axp288_extcon_info *info) 
	}



no_vbus:

	/*

	 * If VBUS is absent Connect D+/D- lines to PMIC for BC

	 * detection. Else connect them to SOC for USB communication.

	 */

	if (info->gpio_mux_cntl)

		gpiod_set_value(info->gpio_mux_cntl,

			vbus_attach ? EXTCON_GPIO_MUX_SEL_SOC

					: EXTCON_GPIO_MUX_SEL_PMIC);



	extcon_set_state_sync(info->edev, info->previous_cable, false);

	if (info->previous_cable == EXTCON_CHG_USB_SDP)

		extcon_set_state_sync(info->edev, EXTCON_USB, false);
@@ -252,8 +235,7 @@ static int axp288_extcon_probe(struct platform_device *pdev) 
{

	struct axp288_extcon_info *info;

	struct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent);

	struct axp288_extcon_pdata *pdata = pdev->dev.platform_data;

	int ret, i, pirq, gpio;

	int ret, i, pirq;



	info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);

	if (!info)
@@ -263,8 +245,6 @@ static int axp288_extcon_probe(struct platform_device *pdev) 
	info->regmap = axp20x->regmap;

	info->regmap_irqc = axp20x->regmap_irqc;

	info->previous_cable = EXTCON_NONE;

	if (pdata)

		info->gpio_mux_cntl = pdata->gpio_mux_cntl;



	platform_set_drvdata(pdev, info);
@@ -285,19 +265,6 @@ static int axp288_extcon_probe(struct platform_device *pdev) 
		return ret;

	}



	/* Set up gpio control for USB Mux */

	if (info->gpio_mux_cntl) {

		gpio = desc_to_gpio(info->gpio_mux_cntl);

		ret = devm_gpio_request(&pdev->dev, gpio, "USB_MUX");

		if (ret < 0) {

			dev_err(&pdev->dev,

				"failed to request the gpio=%d\n", gpio);

			return ret;

		}

		gpiod_direction_output(info->gpio_mux_cntl,

						EXTCON_GPIO_MUX_SEL_PMIC);

	}



	for (i = 0; i < EXTCON_IRQ_END; i++) {

		pirq = platform_get_irq(pdev, i);

		if (pirq < 0)

include/linux/mfd/axp20x.h

+0 −5
Original line number Diff line number Diff line
@@ -645,11 +645,6 @@ struct axp20x_dev { 
	const struct regmap_irq_chip	*regmap_irq_chip;

};



struct axp288_extcon_pdata {

	/* GPIO pin control to switch D+/D- lines b/w PMIC and SOC */

	struct gpio_desc *gpio_mux_cntl;

};



/* generic helper function for reading 9-16 bit wide regs */

static inline int axp20x_read_variable_width(struct regmap *regmap,

	unsigned int reg, unsigned int width)