Commit 924cf800 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Walleij
Browse files

pinctrl: intel: Introduce intel_pinctrl_probe_by_uid() internal API 



Introduce intel_pinctrl_probe_by_uid() internal API to simplify drivers,
which are using ACPI _UID to distinguish which SoC data needs to be used
when being probed.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 5624bf96

drivers/pinctrl/intel/pinctrl-intel.c

+38 −0
Original line number Diff line number Diff line
@@ -7,11 +7,14 @@ 
 *          Mika Westerberg <mika.westerberg@linux.intel.com>

 */



#include <linux/acpi.h>

#include <linux/module.h>

#include <linux/interrupt.h>

#include <linux/gpio/driver.h>

#include <linux/log2.h>

#include <linux/platform_device.h>

#include <linux/property.h>



#include <linux/pinctrl/pinctrl.h>

#include <linux/pinctrl/pinmux.h>

#include <linux/pinctrl/pinconf.h>
@@ -1415,6 +1418,41 @@ int intel_pinctrl_probe(struct platform_device *pdev, 
}

EXPORT_SYMBOL_GPL(intel_pinctrl_probe);



int intel_pinctrl_probe_by_uid(struct platform_device *pdev)

{

	const struct intel_pinctrl_soc_data *data = NULL;

	const struct intel_pinctrl_soc_data **table;

	struct acpi_device *adev;

	unsigned int i;



	adev = ACPI_COMPANION(&pdev->dev);

	if (adev) {

		const void *match = device_get_match_data(&pdev->dev);



		table = (const struct intel_pinctrl_soc_data **)match;

		for (i = 0; table[i]; i++) {

			if (!strcmp(adev->pnp.unique_id, table[i]->uid)) {

				data = table[i];

				break;

			}

		}

	} else {

		const struct platform_device_id *id;



		id = platform_get_device_id(pdev);

		if (!id)

			return -ENODEV;



		table = (const struct intel_pinctrl_soc_data **)id->driver_data;

		data = table[pdev->id];

	}

	if (!data)

		return -ENODEV;



	return intel_pinctrl_probe(pdev, data);

}

EXPORT_SYMBOL_GPL(intel_pinctrl_probe_by_uid);



#ifdef CONFIG_PM_SLEEP

static bool intel_pinctrl_should_save(struct intel_pinctrl *pctrl, unsigned pin)

{

drivers/pinctrl/intel/pinctrl-intel.h

+2 −0
Original line number Diff line number Diff line
@@ -173,6 +173,8 @@ struct intel_pinctrl_soc_data { 


int intel_pinctrl_probe(struct platform_device *pdev,

			const struct intel_pinctrl_soc_data *soc_data);

int intel_pinctrl_probe_by_uid(struct platform_device *pdev);



#ifdef CONFIG_PM_SLEEP

int intel_pinctrl_suspend(struct device *dev);

int intel_pinctrl_resume(struct device *dev);