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

Merge tag 'intel-pinctrl-v6.12-2' of... 

Merge tag 'intel-pinctrl-v6.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel

 into fixes

intel-pinctrl for v6.12-2

Fixes a few issues with Intel pin control platform driver:
* fix missing reference counter drop of fwnode on error path
* replace comma by semicolon to follow the kernel style
* add Panther Lake to the list of supported devices

The following is an automated git shortlog grouped by driver:

intel:
 -  platform: Add Panther Lake to the list of supported
 -  platform: use semicolon instead of comma in ncommunities assignment
 -  platform: fix error path in device_for_each_child_node()
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parents 393c5540 37756257

drivers/pinctrl/intel/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ config PINCTRL_INTEL_PLATFORM 
	  of Intel PCH pins and using them as GPIOs. Currently the following

	  Intel SoCs / platforms require this to be functional:

	  - Lunar Lake

	  - Panther Lake



config PINCTRL_ALDERLAKE

	tristate "Intel Alder Lake pinctrl and GPIO driver"

drivers/pinctrl/intel/pinctrl-intel-platform.c

+2 −3
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ static int intel_platform_pinctrl_prepare_community(struct device *dev, 
						    struct intel_community *community,

						    struct intel_platform_pins *pins)

{

	struct fwnode_handle *child;

	struct intel_padgroup *gpps;

	unsigned int group;

	size_t ngpps;
@@ -131,7 +130,7 @@ static int intel_platform_pinctrl_prepare_community(struct device *dev, 
		return -ENOMEM;



	group = 0;

	device_for_each_child_node(dev, child) {

	device_for_each_child_node_scoped(dev, child) {

		struct intel_padgroup *gpp = &gpps[group];



		gpp->reg_num = group;
@@ -159,7 +158,7 @@ static int intel_platform_pinctrl_prepare_soc_data(struct device *dev, 
	int ret;



	/* Version 1.0 of the specification assumes only a single community per device node */

	ncommunities = 1,

	ncommunities = 1;

	communities = devm_kcalloc(dev, ncommunities, sizeof(*communities), GFP_KERNEL);

	if (!communities)

		return -ENOMEM;