Commit 3b47bc03 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull pin control fixes from Linus Walleij:

 - Fix a really interesting potential core bug in the list iterator
   requireing the use of READ_ONCE() discovered when testing kernel
   compiles with clang.

 - Check devm_kcalloc() return value and an array bounds in the STM32
   driver.

 - Fix an exotic string truncation issue in the s32cc driver, found by
   the kernel test robot (impressive!)

 - Fix an undocumented struct member in the cy8c95x0 driver.

 - Fix a symbol overlap with MIPS in the Lochnagar driver, MIPS defines
   a global symbol "RST" which is a bit too generic and collide with
   stuff. OK this one should be renamed too, we will fix that as well.

 - Fix erroneous branch taking in the Realtek driver.

 - Fix the mail address in MAINTAINERS for the s32g2 driver.

* tag 'pinctrl-v6.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  dt-bindings: pinctrl: s32g2: change a maintainer email address
  pinctrl: realtek: Fix logical error when finding descriptor
  pinctrl: lochnagar: Don't build on MIPS
  pinctrl: avoid reload of p state in list iteration
  pinctrl: cy8c95x0: Fix doc warning
  pinctrl: s32cc: Avoid possible string truncation
  pinctrl: stm32: fix array read out of bound
  pinctrl: stm32: Add check for devm_kcalloc
parents 18d46e76 90785ea8

Documentation/devicetree/bindings/pinctrl/nxp,s32g2-siul2-pinctrl.yaml

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ title: NXP S32G2 pin controller 


maintainers:

  - Ghennadi Procopciuc <Ghennadi.Procopciuc@oss.nxp.com>

  - Chester Lin <clin@suse.com>

  - Chester Lin <chester62515@gmail.com>



description: |

  S32G2 pinmux is implemented in SIUL2 (System Integration Unit Lite2),

drivers/pinctrl/cirrus/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ config PINCTRL_CS42L43 


config PINCTRL_LOCHNAGAR

	tristate "Cirrus Logic Lochnagar pinctrl driver"

	depends on MFD_LOCHNAGAR

	# Avoid clash caused by MIPS defining RST, which is used in the driver

	depends on MFD_LOCHNAGAR && !MIPS

	select GPIOLIB

	select PINMUX

	select PINCONF

drivers/pinctrl/core.c

+3 −3
Original line number Diff line number Diff line
@@ -1262,17 +1262,17 @@ static void pinctrl_link_add(struct pinctrl_dev *pctldev, 
static int pinctrl_commit_state(struct pinctrl *p, struct pinctrl_state *state)

{

	struct pinctrl_setting *setting, *setting2;

	struct pinctrl_state *old_state = p->state;

	struct pinctrl_state *old_state = READ_ONCE(p->state);

	int ret;



	if (p->state) {

	if (old_state) {

		/*

		 * For each pinmux setting in the old state, forget SW's record

		 * of mux owner for that pingroup. Any pingroups which are

		 * still owned by the new state will be re-acquired by the call

		 * to pinmux_enable_setting() in the loop below.

		 */

		list_for_each_entry(setting, &p->state->settings, node) {

		list_for_each_entry(setting, &old_state->settings, node) {

			if (setting->type != PIN_MAP_TYPE_MUX_GROUP)

				continue;

			pinmux_disable_setting(setting);

drivers/pinctrl/nxp/pinctrl-s32cc.c

+2 −2
Original line number Diff line number Diff line
@@ -843,8 +843,8 @@ static int s32_pinctrl_probe_dt(struct platform_device *pdev, 
	if (!np)

		return -ENODEV;



	if (mem_regions == 0) {

		dev_err(&pdev->dev, "mem_regions is 0\n");

	if (mem_regions == 0 || mem_regions >= 10000) {

		dev_err(&pdev->dev, "mem_regions is invalid: %u\n", mem_regions);

		return -EINVAL;

	}

drivers/pinctrl/pinctrl-cy8c95x0.c

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ static const struct dmi_system_id cy8c95x0_dmi_acpi_irq_info[] = { 
 * @pinctrl_desc:   pin controller description

 * @name:           Chip controller name

 * @tpin:           Total number of pins

 * @gpio_reset:     GPIO line handler that can reset the IC

 */

struct cy8c95x0_pinctrl {

	struct regmap *regmap;