Commit 5b398f8f authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'intel-pinctrl-v5.10-1' of... 

Merge tag 'intel-pinctrl-v5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel into devel

intel-pinctrl for v5.10-1

* Add last part of cleanup Cherryview driver to align with other drivers
* Due to above clean up Cherryview and Baytrail drivers to use common API

The following is an automated git shortlog grouped by driver:

baytrail:
 -  Switch to use intel_pinctrl_get_soc_data()

cherryview:
 -  Preserve CHV_PADCTRL1_INVRXTX_TXDATA flag on GPIOs
 -  Switch to use intel_pinctrl_get_soc_data()
 -  Utilize temporary variable to hold device pointer
 -  Switch to use struct intel_pinctrl
 -  Move custom community members to separate data struct
 -  Drop stale comment

intel:
 -  Update header block to reflect direct dependencies
 -  Extract intel_pinctrl_get_soc_data() helper for wider use
parents e777f8c8 a0bf06dc

drivers/pinctrl/intel/Kconfig

+2 −10
Original line number Diff line number Diff line
@@ -6,11 +6,7 @@ if (X86 || COMPILE_TEST) 
config PINCTRL_BAYTRAIL

	bool "Intel Baytrail GPIO pin control"

	depends on ACPI

	select GPIOLIB

	select GPIOLIB_IRQCHIP

	select PINMUX

	select PINCONF

	select GENERIC_PINCONF

	select PINCTRL_INTEL

	help

	  driver for memory mapped GPIO functionality on Intel Baytrail

	  platforms. Supports 3 banks with 102, 28 and 44 gpios.
@@ -22,11 +18,7 @@ config PINCTRL_BAYTRAIL 
config PINCTRL_CHERRYVIEW

	tristate "Intel Cherryview/Braswell pinctrl and GPIO driver"

	depends on ACPI

	select PINMUX

	select PINCONF

	select GENERIC_PINCONF

	select GPIOLIB

	select GPIOLIB_IRQCHIP

	select PINCTRL_INTEL

	help

	  Cherryview/Braswell pinctrl driver provides an interface that

	  allows configuring of SoC pins and using them as GPIOs.

drivers/pinctrl/intel/pinctrl-baytrail.c

+5 −19
Original line number Diff line number Diff line
@@ -1635,28 +1635,14 @@ static const struct acpi_device_id byt_gpio_acpi_match[] = { 


static int byt_pinctrl_probe(struct platform_device *pdev)

{

	const struct intel_pinctrl_soc_data *soc_data = NULL;

	const struct intel_pinctrl_soc_data **soc_table;

	const struct intel_pinctrl_soc_data *soc_data;

	struct device *dev = &pdev->dev;

	struct acpi_device *acpi_dev;

	struct intel_pinctrl *vg;

	int i, ret;



	acpi_dev = ACPI_COMPANION(dev);

	if (!acpi_dev)

		return -ENODEV;



	soc_table = (const struct intel_pinctrl_soc_data **)device_get_match_data(dev);



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

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

			soc_data = soc_table[i];

			break;

		}

	}

	int ret;



	if (!soc_data)

		return -ENODEV;

	soc_data = intel_pinctrl_get_soc_data(pdev);

	if (IS_ERR(soc_data))

		return PTR_ERR(soc_data);



	vg = devm_kzalloc(dev, sizeof(*vg), GFP_KERNEL);

	if (!vg)

drivers/pinctrl/intel/pinctrl-cherryview.c

+86 −98

File changed.

Preview size limit exceeded, changes collapsed.

drivers/pinctrl/intel/pinctrl-intel.c

+18 −6
Original line number Diff line number Diff line
@@ -1414,9 +1414,6 @@ static int intel_pinctrl_probe(struct platform_device *pdev, 
	struct intel_pinctrl *pctrl;

	int i, ret, irq;



	if (!soc_data)

		return -EINVAL;



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

	if (!pctrl)

		return -ENOMEM;
@@ -1505,11 +1502,26 @@ int intel_pinctrl_probe_by_hid(struct platform_device *pdev) 
	const struct intel_pinctrl_soc_data *data;



	data = device_get_match_data(&pdev->dev);

	if (!data)

		return -ENODATA;



	return intel_pinctrl_probe(pdev, data);

}

EXPORT_SYMBOL_GPL(intel_pinctrl_probe_by_hid);



int intel_pinctrl_probe_by_uid(struct platform_device *pdev)

{

	const struct intel_pinctrl_soc_data *data;



	data = intel_pinctrl_get_soc_data(pdev);

	if (IS_ERR(data))

		return PTR_ERR(data);



	return intel_pinctrl_probe(pdev, data);

}

EXPORT_SYMBOL_GPL(intel_pinctrl_probe_by_uid);



const struct intel_pinctrl_soc_data *intel_pinctrl_get_soc_data(struct platform_device *pdev)

{

	const struct intel_pinctrl_soc_data *data = NULL;

	const struct intel_pinctrl_soc_data **table;
@@ -1532,15 +1544,15 @@ int intel_pinctrl_probe_by_uid(struct platform_device *pdev) 


		id = platform_get_device_id(pdev);

		if (!id)

			return -ENODEV;

			return ERR_PTR(-ENODEV);



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

		data = table[pdev->id];

	}



	return intel_pinctrl_probe(pdev, data);

	return data ?: ERR_PTR(-ENODATA);

}

EXPORT_SYMBOL_GPL(intel_pinctrl_probe_by_uid);

EXPORT_SYMBOL_GPL(intel_pinctrl_get_soc_data);



#ifdef CONFIG_PM_SLEEP

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

drivers/pinctrl/intel/pinctrl-intel.h

+6 −1
Original line number Diff line number Diff line
@@ -10,12 +10,15 @@ 
#ifndef PINCTRL_INTEL_H

#define PINCTRL_INTEL_H



#include <linux/bits.h>

#include <linux/compiler_types.h>

#include <linux/gpio/driver.h>

#include <linux/irq.h>

#include <linux/kernel.h>

#include <linux/pm.h>

#include <linux/pinctrl/pinctrl.h>

#include <linux/spinlock_types.h>



struct pinctrl_pin_desc;

struct platform_device;

struct device;
@@ -194,6 +197,8 @@ struct intel_pinctrl_soc_data { 
	size_t ncommunities;

};



const struct intel_pinctrl_soc_data *intel_pinctrl_get_soc_data(struct platform_device *pdev);



struct intel_pad_context;

struct intel_community_context;

CRA Git | Maintained and supported by SUSTech CRA and CCSE