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

Commit f836b944 authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'intel-pinctrl-v4.21-1' of... 

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

intel-pinctrl for v4.21-1

Switch to generic ->probe() callbacks.
Simplify getting .driver_data.
Code formatting fixes and headers clean up.

Special case is the driver for Intel Cherryview SoC, where GPIO enabling bit
was mistakenly cleared when pin gets freed. It's fixed now.

The below commit went to v4.20-rc3, that's why duplication.

- ad774315 MAINTAINERS: Add tree link for Intel pin control driver

The following is an automated git shortlog grouped by driver:

baytrail:
 -  Code formatting fixes
 -  simplify getting .driver_data

broxton:
 -  Code formatting fixes
 -  Get rid of unneeded ->probe() stub

cannonlake:
 -  Code formatting fixes
 -  Get rid of unneeded ->probe() stub

cedarfork:
 -  Replace acpi.h with mod_devicetable.h
 -  Get rid of unneeded ->probe() stub

cherryview:
 -  Stop clearing the GPIO_EN bit from chv_gpio_disable_free
 -  Add chv_gpio_clear_triggering() helper function
 -  simplify getting .driver_data

denverton:
 -  Replace acpi.h with mod_devicetable.h
 -  Get rid of unneeded ->probe() stub

geminilake:
 -  Code formatting fixes

icelake:
 -  Code formatting fixes
 -  Get rid of unneeded ->probe() stub

intel:
 -  Unexport intel_pinctrl_probe()
 -  simplify getting .driver_data

lewisburg:
 -  Replace acpi.h with mod_devicetable.h
 -  Get rid of unneeded ->probe() stub

MAINTAINERS:
 -  Add tree link for Intel pin control driver

merrifield:
 -  include bits.h instead of bitops.h

sunrisepoint:
 -  Get rid of unneeded ->probe() stub
parents 0cef0203 1adde32a

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -11730,6 +11730,7 @@ F: Documentation/devicetree/bindings/pinctrl/fsl,* 
PIN CONTROLLER - INTEL

M:	Mika Westerberg <mika.westerberg@linux.intel.com>

M:	Andy Shevchenko <andriy.shevchenko@linux.intel.com>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git

S:	Maintained

F:	drivers/pinctrl/intel/

drivers/pinctrl/intel/pinctrl-baytrail.c

+3 −5
Original line number Diff line number Diff line
@@ -705,7 +705,7 @@ static const struct byt_pinctrl_soc_data *byt_soc_data[] = { 
	&byt_score_soc_data,

	&byt_sus_soc_data,

	&byt_ncore_soc_data,

	NULL,

	NULL

};



static struct byt_community *byt_get_community(struct byt_gpio *vg,
@@ -1838,8 +1838,7 @@ static int byt_pinctrl_probe(struct platform_device *pdev) 
#ifdef CONFIG_PM_SLEEP

static int byt_gpio_suspend(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct byt_gpio *vg = platform_get_drvdata(pdev);

	struct byt_gpio *vg = dev_get_drvdata(dev);

	int i;



	for (i = 0; i < vg->soc_data->npins; i++) {
@@ -1867,8 +1866,7 @@ static int byt_gpio_suspend(struct device *dev) 


static int byt_gpio_resume(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct byt_gpio *vg = platform_get_drvdata(pdev);

	struct byt_gpio *vg = dev_get_drvdata(dev);

	int i;



	for (i = 0; i < vg->soc_data->npins; i++) {

drivers/pinctrl/intel/pinctrl-broxton.c

+4 −9
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ static const struct intel_pinctrl_soc_data *bxt_pinctrl_soc_data[] = { 
	&bxt_west_soc_data,

	&bxt_southwest_soc_data,

	&bxt_south_soc_data,

	NULL,

	NULL

};



/* APL */
@@ -990,7 +990,7 @@ static const struct intel_pinctrl_soc_data *apl_pinctrl_soc_data[] = { 
	&apl_northwest_soc_data,

	&apl_west_soc_data,

	&apl_southwest_soc_data,

	NULL,

	NULL

};



static const struct acpi_device_id bxt_pinctrl_acpi_match[] = {
@@ -1003,18 +1003,13 @@ MODULE_DEVICE_TABLE(acpi, bxt_pinctrl_acpi_match); 
static const struct platform_device_id bxt_pinctrl_platform_ids[] = {

	{ "apollolake-pinctrl", (kernel_ulong_t)apl_pinctrl_soc_data },

	{ "broxton-pinctrl", (kernel_ulong_t)bxt_pinctrl_soc_data },

	{ },

	{ }

};



static int bxt_pinctrl_probe(struct platform_device *pdev)

{

	return intel_pinctrl_probe_by_uid(pdev);

}



static INTEL_PINCTRL_PM_OPS(bxt_pinctrl_pm_ops);



static struct platform_driver bxt_pinctrl_driver = {

	.probe = bxt_pinctrl_probe,

	.probe = intel_pinctrl_probe_by_uid,

	.driver = {

		.name = "broxton-pinctrl",

		.acpi_match_table = bxt_pinctrl_acpi_match,

drivers/pinctrl/intel/pinctrl-cannonlake.c

+2 −7
Original line number Diff line number Diff line
@@ -829,19 +829,14 @@ static const struct intel_pinctrl_soc_data cnllp_soc_data = { 
static const struct acpi_device_id cnl_pinctrl_acpi_match[] = {

	{ "INT3450", (kernel_ulong_t)&cnlh_soc_data },

	{ "INT34BB", (kernel_ulong_t)&cnllp_soc_data },

	{ },

	{ }

};

MODULE_DEVICE_TABLE(acpi, cnl_pinctrl_acpi_match);



static int cnl_pinctrl_probe(struct platform_device *pdev)

{

	return intel_pinctrl_probe_by_hid(pdev);

}



static INTEL_PINCTRL_PM_OPS(cnl_pinctrl_pm_ops);



static struct platform_driver cnl_pinctrl_driver = {

	.probe = cnl_pinctrl_probe,

	.probe = intel_pinctrl_probe_by_hid,

	.driver = {

		.name = "cannonlake-pinctrl",

		.acpi_match_table = cnl_pinctrl_acpi_match,

drivers/pinctrl/intel/pinctrl-cedarfork.c

+3 −8
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * Author: Mika Westerberg <mika.westerberg@linux.intel.com>

 */



#include <linux/acpi.h>

#include <linux/mod_devicetable.h>

#include <linux/module.h>

#include <linux/platform_device.h>
@@ -330,21 +330,16 @@ static const struct intel_pinctrl_soc_data cdf_soc_data = { 
	.ncommunities = ARRAY_SIZE(cdf_communities),

};



static int cdf_pinctrl_probe(struct platform_device *pdev)

{

	return intel_pinctrl_probe(pdev, &cdf_soc_data);

}



static INTEL_PINCTRL_PM_OPS(cdf_pinctrl_pm_ops);



static const struct acpi_device_id cdf_pinctrl_acpi_match[] = {

	{ "INTC3001" },

	{ "INTC3001", (kernel_ulong_t)&cdf_soc_data },

	{ }

};

MODULE_DEVICE_TABLE(acpi, cdf_pinctrl_acpi_match);



static struct platform_driver cdf_pinctrl_driver = {

	.probe = cdf_pinctrl_probe,

	.probe = intel_pinctrl_probe_by_hid,

	.driver = {

		.name = "cedarfork-pinctrl",

		.acpi_match_table = cdf_pinctrl_acpi_match,