From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Aug 2022 18:01:44 +0000 (-0700)
Subject: Merge tag 'pinctrl-v6.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5e2e7383b57fa03ec2b00c82bb7f49a4a707c1f7;p=linux.git

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

Pull pin control updates from Linus Walleij:
 "Outside the pinctrl driver and DT bindings we hit some Arm DT files,
  patched by the maintainers.

  Other than that it is business as usual.

  Core changes:

   - Add PINCTRL_PINGROUP() helper macro (and use it in the AMD driver).

  New drivers:

   - Intel Meteor Lake support.

   - Reneasas RZ/V2M and r8a779g0 (R-Car V4H).

   - AXP209 variants AXP221, AXP223 and AXP809.

   - Qualcomm MSM8909, PM8226, PMP8074 and SM6375.

   - Allwinner D1.

  Improvements:

   - Proper pin multiplexing in the AMD driver.

   - Mediatek MT8192 can use generic drive strength and pin bias, then
     fixes on top plus some I2C pin group fixes.

   - Have the Allwinner Sunplus SP7021 use the generic DT schema and
     make interrupts optional.

   - Handle Qualcomm SC7280 ADSP.

   - Handle Qualcomm MSM8916 CAMSS GP clock muxing.

   - High impedance bias on ZynqMP.

   - Serialize StarFive access to MMIO.

   - Immutable gpiochip for BCM2835, Ingenic, Qualcomm SPMI GPIO"

* tag 'pinctrl-v6.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (117 commits)
  dt-bindings: pinctrl: qcom,pmic-gpio: add PM8226 constraints
  pinctrl: qcom: Make PINCTRL_SM8450 depend on PINCTRL_MSM
  pinctrl: qcom: sm8250: Fix PDC map
  pinctrl: amd: Fix an unused variable
  dt-bindings: pinctrl: mt8186: Add and use drive-strength-microamp
  dt-bindings: pinctrl: mt8186: Add gpio-line-names property
  ARM: dts: imxrt1170-pinfunc: Add pinctrl binding header
  pinctrl: amd: Use unicode for debugfs output
  pinctrl: amd: Fix newline declaration in debugfs output
  pinctrl: at91: Fix typo 'the the' in comment
  dt-bindings: pinctrl: st,stm32: Correct 'resets' property name
  pinctrl: mvebu: Missing a blank line after declarations.
  pinctrl: qcom: Add SM6375 TLMM driver
  dt-bindings: pinctrl: Add DT schema for SM6375 TLMM
  dt-bindings: pinctrl: mt8195: Use drive-strength-microamp in examples
  Revert "pinctrl: qcom: spmi-gpio: make the irqchip immutable"
  pinctrl: imx93: Add MODULE_DEVICE_TABLE()
  pinctrl: sunxi: Add driver for Allwinner D1
  pinctrl: sunxi: Make some layout parameters dynamic
  pinctrl: sunxi: Refactor register/offset calculation
  ...
---

5e2e7383b57fa03ec2b00c82bb7f49a4a707c1f7
diff --cc arch/arm/boot/dts/sun6i-a31.dtsi
index 70e634b37aae0,df3330073687a..6cdadba6a3acf
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@@ -1387,9 -1385,8 +1387,8 @@@
  			interrupt-parent = <&r_intc>;
  			interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>,
  				     <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
 -			clocks = <&apb0_gates 0>, <&osc24M>, <&rtc 0>;
 +			clocks = <&apb0_gates 0>, <&osc24M>, <&rtc CLK_OSC32K>;
  			clock-names = "apb", "hosc", "losc";
- 			resets = <&apb0_rst 0>;
  			gpio-controller;
  			interrupt-controller;
  			#interrupt-cells = <3>;
diff --cc arch/arm/boot/dts/sun8i-a23-a33.dtsi
index 1a262a05fdcb2,8d3dd9e2b54e5..f630ab55bb6ad
--- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
@@@ -812,9 -810,8 +812,8 @@@
  			reg = <0x01f02c00 0x400>;
  			interrupt-parent = <&r_intc>;
  			interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
 -			clocks = <&apb0_gates 0>, <&osc24M>, <&rtc 0>;
 +			clocks = <&apb0_gates 0>, <&osc24M>, <&rtc CLK_OSC32K>;
  			clock-names = "apb", "hosc", "losc";
- 			resets = <&apb0_rst 0>;
  			gpio-controller;
  			interrupt-controller;
  			#interrupt-cells = <3>;
diff --cc drivers/pinctrl/pinctrl-ocelot.c
index 771dd1f4fbe04,349e063a04fac..c5fd154990c8b
--- a/drivers/pinctrl/pinctrl-ocelot.c
+++ b/drivers/pinctrl/pinctrl-ocelot.c
@@@ -1944,9 -1889,9 +1944,10 @@@ static const struct of_device_id ocelot
  	{ .compatible = "microchip,lan966x-pinctrl", .data = &lan966x_desc },
  	{},
  };
+ MODULE_DEVICE_TABLE(of, ocelot_pinctrl_of_match);
  
 -static struct regmap *ocelot_pinctrl_create_pincfg(struct platform_device *pdev)
 +static struct regmap *ocelot_pinctrl_create_pincfg(struct platform_device *pdev,
 +						   const struct ocelot_pinctrl *info)
  {
  	void __iomem *base;
  
diff --cc drivers/pinctrl/sunxi/pinctrl-sunxi.c
index dd928402af997,350044d4c1b55..6c04027d0dd97
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
@@@ -544,13 -602,10 +602,12 @@@ static int sunxi_pconf_set(struct pinct
  	struct sunxi_pinctrl *pctl = pinctrl_dev_get_drvdata(pctldev);
  	int i;
  
 +	pin -= pctl->desc->pin_base;
 +
  	for (i = 0; i < num_configs; i++) {
+ 		u32 arg, reg, shift, mask, val;
  		enum pin_config_param param;
  		unsigned long flags;
- 		u32 offset, shift, mask, reg;
- 		u32 arg, val;
  		int ret;
  
  		param = pinconf_to_config_param(configs[i]);