Commit 0b46b049 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pinctrl-v6.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl 

Pull pin control fixes from Linus Walleij:

 - Fix the regmap settings for bcm281xx, this was missing the stride

 - NULL check for the Nuvoton npcm8xx devm_kasprintf()

 - Enable the Spacemit pin controller by default in the SoC config. The
   SoC will not boot without it so this one is pretty much required

* tag 'pinctrl-v6.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: spacemit: enable config option
  pinctrl: nuvoton: npcm8xx: Add NULL check in npcm8xx_gpio_fw
  pinctrl: bcm281xx: Fix incorrect regmap max_registers value
parents 4d872d51 7ff4faba

arch/riscv/Kconfig.socs

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ config ARCH_SOPHGO 


config ARCH_SPACEMIT

	bool "SpacemiT SoCs"

	select PINCTRL

	help

	  This enables support for SpacemiT SoC platform hardware.

drivers/pinctrl/bcm/pinctrl-bcm281xx.c

+1 −1
Original line number Diff line number Diff line
@@ -974,7 +974,7 @@ static const struct regmap_config bcm281xx_pinctrl_regmap_config = { 
	.reg_bits = 32,

	.reg_stride = 4,

	.val_bits = 32,

	.max_register = BCM281XX_PIN_VC_CAM3_SDA,

	.max_register = BCM281XX_PIN_VC_CAM3_SDA * 4,

};



static int bcm281xx_pinctrl_get_groups_count(struct pinctrl_dev *pctldev)

drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c

+3 −0
Original line number Diff line number Diff line
@@ -2374,6 +2374,9 @@ static int npcm8xx_gpio_fw(struct npcm8xx_pinctrl *pctrl) 
		pctrl->gpio_bank[id].gc.parent = dev;

		pctrl->gpio_bank[id].gc.fwnode = child;

		pctrl->gpio_bank[id].gc.label = devm_kasprintf(dev, GFP_KERNEL, "%pfw", child);

		if (pctrl->gpio_bank[id].gc.label == NULL)

			return -ENOMEM;



		pctrl->gpio_bank[id].gc.dbg_show = npcmgpio_dbg_show;

		pctrl->gpio_bank[id].direction_input = pctrl->gpio_bank[id].gc.direction_input;

		pctrl->gpio_bank[id].gc.direction_input = npcmgpio_direction_input;

drivers/pinctrl/spacemit/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -4,9 +4,10 @@ 
#



config PINCTRL_SPACEMIT_K1

	tristate "SpacemiT K1 SoC Pinctrl driver"

	bool "SpacemiT K1 SoC Pinctrl driver"

	depends on ARCH_SPACEMIT || COMPILE_TEST

	depends on OF

	default y

	select GENERIC_PINCTRL_GROUPS

	select GENERIC_PINMUX_FUNCTIONS

	select GENERIC_PINCONF

drivers/pinctrl/spacemit/pinctrl-k1.c

+1 −1
Original line number Diff line number Diff line
@@ -1044,7 +1044,7 @@ static struct platform_driver k1_pinctrl_driver = { 
		.of_match_table		= k1_pinctrl_ids,

	},

};

module_platform_driver(k1_pinctrl_driver);

builtin_platform_driver(k1_pinctrl_driver);



MODULE_AUTHOR("Yixun Lan <dlan@gentoo.org>");

MODULE_DESCRIPTION("Pinctrl driver for the SpacemiT K1 SoC");