From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 2 May 2023 22:40:41 +0000 (-0700)
Subject: Merge tag 'pinctrl-v6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw... 
X-Git-Tag: v6.4-rc1~53
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=348551ddaf311c76b01cdcbaf61b6fef06a49144;p=tomoyo%2Ftomoyo-test1.git

Merge tag 'pinctrl-v6.4-1' of git://git./linux/kernel/git/linusw/linux-pinctrl

Pull pin control updates from Linus Walleij:
 "Mostly drivers! Nothing special: some new Qualcomm chips as usual, and
  the new NXP S32 and nVidia BlueField-3.

  Core changes:

   - Make a lot of pin controllers with GPIO and irqchips immutable,
     i.e. not living structs, but const structs. This is driving a
     changed initiated by the irqchip maintainers.

  New drivers:

   - New driver for the NXP S32 SoC pin controller

   - As part of a thorough cleanup and restructuring of the
     Ralink/Mediatek drivers, the Ralink MIPS pin control drivers were
     folded into the Mediatek directory and the family is renamed
     "mtmips". The Ralink chips live on as Mediatek MIPS family where
     new variants can be added. As part of this work also the device
     tree bindings were reworked.

   - New subdriver for the Qualcomm SM7150 SoC.

   - New subdriver for the Qualcomm IPQ9574 SoC.

   - New driver for the nVidia BlueField-3 SoC.

   - Support for the Qualcomm PMM8654AU mixed signal circuit GPIO.

   - Support for the Qualcomm PMI632 mixed signal circuit GPIO.

  Improvements:

   - Add some missing pins and generic cleanups on the Renesas r8a779g0
     and r8a779g0 pin controllers. Generic Renesas extension for power
     source selection on several SoCs.

   - Misc cleanups for the Atmel AT91 and AT91-PIO4 pin controllers

   - Make the GPIO mode work on the Qualcomm SM8550-lpass-lpi driver.

   - Several device tree binding cleanups as the binding YAML syntax is
     solidifying"

* tag 'pinctrl-v6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (153 commits)
  pinctrl-bcm2835.c: fix race condition when setting gpio dir
  dt-bindings: pinctrl: qcom,sm8150: Drop duplicate function value "atest_usb2"
  dt-bindings: pinctrl: qcom: Add few missing functions
  pinctrl: qcom: spmi-gpio: Add PMI632 support
  dt-bindings: pinctrl: qcom,pmic-gpio: add PMI632
  pinctrl: wpcm450: select MFD_SYSCON
  pinctrl: qcom ssbi-gpio: Convert to immutable irq_chip
  pinctrl: qcom ssbi-mpp: Convert to immutable irq_chip
  pinctrl: qcom spmi-mpp: Convert to immutable irq_chip
  pinctrl: plgpio: Convert to immutable irq_chip
  pinctrl: pistachio: Convert to immutable irq_chip
  pinctrl: pic32: Convert to immutable irq_chip
  pinctrl: sx150x: Convert to immutable irq_chip
  pinctrl: stmfx: Convert to immutable irq_chip
  pinctrl: st: Convert to immutable irq_chip
  pinctrl: mcp23s08: Convert to immutable irq_chip
  pinctrl: equilibrium: Convert to immutable irq_chip
  pinctrl: npcm7xx: Convert to immutable irq_chip
  pinctrl: armada-37xx: Convert to immutable irq_chip
  pinctrl: nsp: Convert to immutable irq_chip
  ...
---

348551ddaf311c76b01cdcbaf61b6fef06a49144
diff --cc drivers/pinctrl/mediatek/Kconfig
index a71874fed3d6,ee04b1af36dd..7af287252834
--- a/drivers/pinctrl/mediatek/Kconfig
+++ b/drivers/pinctrl/mediatek/Kconfig
@@@ -40,12 -44,54 +44,54 @@@ config PINCTRL_MTK_PARI
  	select GENERIC_PINCONF
  	select GPIOLIB
  	select EINT_MTK
- 	select OF_GPIO
  	select PINCTRL_MTK_V2
  
+ # For MIPS SoCs
+ config PINCTRL_MT7620
+ 	bool "MediaTek MT7620 pin control"
+ 	depends on SOC_MT7620 || COMPILE_TEST
+ 	depends on RALINK
+ 	default SOC_MT7620
+ 	select PINCTRL_MTK_MTMIPS
+ 
+ config PINCTRL_MT7621
+ 	bool "MediaTek MT7621 pin control"
+ 	depends on SOC_MT7621 || COMPILE_TEST
+ 	depends on RALINK
+ 	default SOC_MT7621
+ 	select PINCTRL_MTK_MTMIPS
+ 
+ config PINCTRL_MT76X8
+ 	bool "MediaTek MT76X8 pin control"
+ 	depends on SOC_MT7620 || COMPILE_TEST
+ 	depends on RALINK
+ 	default SOC_MT7620
+ 	select PINCTRL_MTK_MTMIPS
+ 
+ config PINCTRL_RT2880
+ 	bool "Ralink RT2880 pin control"
+ 	depends on SOC_RT288X || COMPILE_TEST
+ 	depends on RALINK
+ 	default SOC_RT288X
+ 	select PINCTRL_MTK_MTMIPS
+ 
+ config PINCTRL_RT305X
+ 	bool "Ralink RT305X pin control"
+ 	depends on SOC_RT305X || COMPILE_TEST
+ 	depends on RALINK
+ 	default SOC_RT305X
+ 	select PINCTRL_MTK_MTMIPS
+ 
+ config PINCTRL_RT3883
+ 	bool "Ralink RT3883 pin control"
+ 	depends on SOC_RT3883 || COMPILE_TEST
+ 	depends on RALINK
+ 	default SOC_RT3883
+ 	select PINCTRL_MTK_MTMIPS
+ 
  # For ARMv7 SoCs
  config PINCTRL_MT2701
 -	bool "Mediatek MT2701 pin control"
 +	bool "MediaTek MT2701 pin control"
  	depends on MACH_MT7623 || MACH_MT2701 || COMPILE_TEST
  	depends on OF
  	default MACH_MT2701
diff --cc drivers/pinctrl/pinctrl-at91-pio4.c
index c775d239444a,e40487be2038..2fe40acb6a3e
--- a/drivers/pinctrl/pinctrl-at91-pio4.c
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
@@@ -1202,10 -1197,9 +1197,8 @@@ static int atmel_pinctrl_probe(struct p
  	atmel_pioctrl->irq_domain = irq_domain_add_linear(dev->of_node,
  			atmel_pioctrl->gpio_chip->ngpio,
  			&irq_domain_simple_ops, NULL);
- 	if (!atmel_pioctrl->irq_domain) {
- 		dev_err(dev, "can't add the irq domain\n");
- 		return -ENODEV;
- 	}
+ 	if (!atmel_pioctrl->irq_domain)
+ 		return dev_err_probe(dev, -ENODEV, "can't add the irq domain\n");
 -	atmel_pioctrl->irq_domain->name = "atmel gpio";
  
  	for (i = 0; i < atmel_pioctrl->npins; i++) {
  		int irq = irq_create_mapping(atmel_pioctrl->irq_domain, i);