projects/linux·commit cf0c97f1

Merge tag 'pinctrl-v5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

cf0c97f1 · Linus Torvalds <[email protected]> · 2020-06-07 16:13:43 -07:00

Pull pin control updates from Linus Walleij:
 "This is the bulk of pin control changes for the v5.8 kernel cycle.

  It's just really boring this time. Zero core changes. Just linear
  development, cleanups and misc noncritical fixes. Some new drivers for
  very new Qualcomm and Intel chips.

  New drivers:

   - Intel Jasper Lake support.

   - NXP Freescale i.MX8DXL support.

   - Qualcomm SM8250 support.

   - Renesas R8A7742 SH-PFC support.

  Driver improvements:

   - Severe cleanup and modernization of the MCP23s08 driver.

   - Mediatek driver modularized.

   - Setting config supported in the Meson driver.

   - Wakeup support for the Broadcom BCM7211"

* tag 'pinctrl-v5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (72 commits)
  pinctrl: sprd: Fix the incorrect pull-up definition
  pinctrl: pxa: pxa2xx: Remove 'pxa2xx_pinctrl_exit()' which is unused and broken
  pinctrl: freescale: imx: Use 'devm_of_iomap()' to avoid a resource leak in case of error in 'imx_pinctrl_probe()'
  pinctrl: freescale: imx: Fix an error handling path in 'imx_pinctrl_probe()'
  pinctrl: sirf: add missing put_device() call in sirfsoc_gpio_probe()
  pinctrl: imxl: Fix an error handling path in 'imx1_pinctrl_core_probe()'
  pinctrl: bcm2835: Add support for wake-up interrupts
  pinctrl: bcm2835: Match BCM7211 compatible string
  dt-bindings: pinctrl: Document optional BCM7211 wake-up interrupts
  dt-bindings: pinctrl: Document 7211 compatible for brcm, bcm2835-gpio.txt
  dt-bindings: pinctrl: stm32: Add missing interrupts property
  pinctrl: at91-pio4: Add COMPILE_TEST support
  pinctrl: Fix return value about devm_platform_ioremap_resource()
  MAINTAINERS: Renesas Pin Controllers are supported
  dt-bindings: pinctrl: ocelot: Add Sparx5 SoC support
  pinctrl: ocelot: Fix GPIO interrupt decoding on Jaguar2
  pinctrl: ocelot: Remove instance number from pin functions
  pinctrl: ocelot: Always register GPIO driver
  dt-bindings: pinctrl: rockchip: update example
  pinctrl: amd: Add ACPI dependency
  ...
Commit
cf0c97f148e9e50aa5a7ddd1984a604dd2bde4af
Parents
e8dff03a · 94873f6b

Merge commit. Changes below are compared with the first parent: e8dff03a.

Changes

71 files changed · +4147 −1314

FileStatusAddDelContent
Documentation/devicetree/bindings/arm/freescale/fsl,scu.txtmodified+4−2View file
Documentation/devicetree/bindings/pinctrl/brcm,bcm2835-gpio.txtmodified+4−1View file
Documentation/devicetree/bindings/pinctrl/mscc,ocelot-pinctrl.txtmodified+2−2View file
Documentation/devicetree/bindings/pinctrl/qcom,sm8250-pinctrl.yamladded+147−0View file
Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txtmodified+1−0View file
Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txtmodified+2−2View file
Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.yamlmodified+3−0View file
MAINTAINERSmodified+2−1View file
drivers/pinctrl/Kconfigmodified+13−4View file
drivers/pinctrl/Makefilemodified+2−0View file
drivers/pinctrl/bcm/pinctrl-bcm281xx.cmodified+1−1View file
drivers/pinctrl/bcm/pinctrl-bcm2835.cmodified+79−1View file
drivers/pinctrl/freescale/Kconfigmodified+7−0View file
drivers/pinctrl/freescale/Makefilemodified+1−0View file
drivers/pinctrl/freescale/pinctrl-imx.cmodified+6−20View file
drivers/pinctrl/freescale/pinctrl-imx1-core.cmodified+1−2View file
drivers/pinctrl/freescale/pinctrl-imx8dxl.cadded+193−0View file
drivers/pinctrl/intel/Kconfigmodified+8−0View file
drivers/pinctrl/intel/Makefilemodified+1−0View file
drivers/pinctrl/intel/pinctrl-baytrail.cmodified+4−5View file
drivers/pinctrl/intel/pinctrl-cannonlake.cmodified+28−30View file
drivers/pinctrl/intel/pinctrl-cherryview.cmodified+105−173View file
drivers/pinctrl/intel/pinctrl-icelake.cmodified+14−16View file
drivers/pinctrl/intel/pinctrl-intel.cmodified+16−6View file
drivers/pinctrl/intel/pinctrl-intel.hmodified+20−7View file
drivers/pinctrl/intel/pinctrl-jasperlake.cadded+344−0View file
drivers/pinctrl/intel/pinctrl-lynxpoint.cmodified+5−5View file
drivers/pinctrl/intel/pinctrl-tigerlake.cmodified+15−17View file
drivers/pinctrl/mediatek/Kconfigmodified+10−3View file
drivers/pinctrl/mediatek/Makefilemodified+3−2View file
drivers/pinctrl/mediatek/mtk-eint.cmodified+9−0View file
drivers/pinctrl/mediatek/pinctrl-mt6765.cmodified+4−0View file
drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.cmodified+28−0View file
drivers/pinctrl/mediatek/pinctrl-paris.cmodified+6−0View file
drivers/pinctrl/meson/pinctrl-meson.cmodified+14−0View file
drivers/pinctrl/nomadik/pinctrl-ab8505.cmodified+1−0View file
drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.cmodified+5−1View file
drivers/pinctrl/nomadik/pinctrl-nomadik.cmodified+1−3View file
drivers/pinctrl/pinctrl-at91-pio4.cmodified+1−1View file
drivers/pinctrl/pinctrl-bm1880.cmodified+1−0View file
drivers/pinctrl/pinctrl-ingenic.cmodified+21−0View file
drivers/pinctrl/pinctrl-lantiq.cmodified+1−1View file
drivers/pinctrl/pinctrl-mcp23s08.cmodified+19−495View file
drivers/pinctrl/pinctrl-mcp23s08.hadded+52−0View file
drivers/pinctrl/pinctrl-mcp23s08_i2c.cadded+124−0View file
drivers/pinctrl/pinctrl-mcp23s08_spi.cadded+262−0View file
drivers/pinctrl/pinctrl-ocelot.cmodified+47−80View file
drivers/pinctrl/pinctrl-rk805.cmodified+2−2View file
drivers/pinctrl/pinctrl-rockchip.cmodified+6−5View file
drivers/pinctrl/pinctrl-rza1.cmodified+2−2View file
drivers/pinctrl/pinctrl-stmfx.cmodified+1−5View file
drivers/pinctrl/pinctrl-sx150x.cmodified+1−1View file
drivers/pinctrl/pxa/pinctrl-pxa2xx.cmodified+0−9View file
drivers/pinctrl/qcom/Kconfigmodified+9−0View file
drivers/pinctrl/qcom/Makefilemodified+1−0View file
drivers/pinctrl/qcom/pinctrl-msm.cmodified+0−1View file
drivers/pinctrl/qcom/pinctrl-sm8250.cadded+1361−0View file
drivers/pinctrl/samsung/pinctrl-exynos.cmodified+58−24View file
drivers/pinctrl/sh-pfc/Kconfigmodified+4−0View file
drivers/pinctrl/sh-pfc/Makefilemodified+1−0View file
drivers/pinctrl/sh-pfc/core.cmodified+6−0View file
drivers/pinctrl/sh-pfc/pfc-r8a7790.cmodified+392−352View file
drivers/pinctrl/sh-pfc/pfc-sh7269.cmodified+3−2View file
drivers/pinctrl/sh-pfc/sh_pfc.hmodified+1−0View file
drivers/pinctrl/sirf/pinctrl-sirf.cmodified+14−6View file
drivers/pinctrl/sprd/pinctrl-sprd.cmodified+2−2View file
drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.cmodified+5−2View file
drivers/pinctrl/tegra/pinctrl-tegra-xusb.cmodified+1−1View file
drivers/pinctrl/zte/pinctrl-zx.cmodified+1−1View file
include/dt-bindings/pinctrl/pads-imx8dxl.hadded+639−0View file
include/linux/spi/mcp23s08.hdeleted+0−18View before deletion

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt

View file
diff --git a/Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt b/Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
index 623fedf..7150474 100644
--- a/Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
+++ b/Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
@@ -108,7 +108,8 @@ This binding uses the i.MX common pinctrl binding[3].
Required properties:
- compatible: Should be one of:
"fsl,imx8qm-iomuxc",
- "fsl,imx8qxp-iomuxc".
+ "fsl,imx8qxp-iomuxc",
+ "fsl,imx8dxl-iomuxc".
Required properties for Pinctrl sub nodes:
- fsl,pins: Each entry consists of 3 integers which represents
@@ -116,7 +117,8 @@ Required properties for Pinctrl sub nodes:
integers <pin_id mux_mode> are specified using a
PIN_FUNC_ID macro, which can be found in
<dt-bindings/pinctrl/pads-imx8qm.h>,
- <dt-bindings/pinctrl/pads-imx8qxp.h>.
+ <dt-bindings/pinctrl/pads-imx8qxp.h>,
+ <dt-bindings/pinctrl/pads-imx8dxl.h>.
The last integer CONFIG is the pad setting value like
pull-up on this pin.

Documentation/devicetree/bindings/pinctrl/brcm,bcm2835-gpio.txt

View file
diff --git a/Documentation/devicetree/bindings/pinctrl/brcm,bcm2835-gpio.txt b/Documentation/devicetree/bindings/pinctrl/brcm,bcm2835-gpio.txt
index 3cab733..5682b20 100644
--- a/Documentation/devicetree/bindings/pinctrl/brcm,bcm2835-gpio.txt
+++ b/Documentation/devicetree/bindings/pinctrl/brcm,bcm2835-gpio.txt
@@ -9,13 +9,16 @@ Required properties:
"brcm,bcm2835-gpio" - BCM2835 compatible pinctrl
"brcm,bcm7211-gpio" - BCM7211 compatible pinctrl
"brcm,bcm2711-gpio" - BCM2711 compatible pinctrl
+ "brcm,bcm7211-gpio" - BCM7211 compatible pinctrl
- reg: Should contain the physical address of the GPIO module's registers.
- gpio-controller: Marks the device node as a GPIO controller.
- #gpio-cells : Should be two. The first cell is the pin number and the
second cell is used to specify optional parameters:
- bit 0 specifies polarity (0 for normal, 1 for inverted)
- interrupts : The interrupt outputs from the controller. One interrupt per
- individual bank followed by the "all banks" interrupt.
+ individual bank followed by the "all banks" interrupt. For BCM7211, an
+ additional set of per-bank interrupt line and an "all banks" wake-up
+ interrupt may be specified.
- interrupt-controller: Marks the device node as an interrupt controller.
- #interrupt-cells : Should be 2.
The first cell is the GPIO number.

Documentation/devicetree/bindings/pinctrl/mscc,ocelot-pinctrl.txt

View file
diff --git a/Documentation/devicetree/bindings/pinctrl/mscc,ocelot-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/mscc,ocelot-pinctrl.txt
index 32a8a8f..0091244 100644
--- a/Documentation/devicetree/bindings/pinctrl/mscc,ocelot-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/mscc,ocelot-pinctrl.txt
@@ -2,8 +2,8 @@ Microsemi Ocelot pin controller Device Tree Bindings
----------------------------------------------------
Required properties:
- - compatible : Should be "mscc,ocelot-pinctrl" or
- "mscc,jaguar2-pinctrl"
+ - compatible : Should be "mscc,ocelot-pinctrl",
+ "mscc,jaguar2-pinctrl" or "microchip,sparx5-pinctrl"
- reg : Address and length of the register set for the device
- gpio-controller : Indicates this device is a GPIO controller
- #gpio-cells : Must be 2.

Documentation/devicetree/bindings/pinctrl/qcom,sm8250-pinctrl.yaml

View file
diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,sm8250-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/qcom,sm8250-pinctrl.yaml
new file mode 100644
index 0000000..6dc3b52
--- /dev/null
+++ b/Documentation/devicetree/bindings/pinctrl/qcom,sm8250-pinctrl.yaml
@@ -0,0 +1,147 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/pinctrl/qcom,sm8250-pinctrl.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Qualcomm Technologies, Inc. SM8250 TLMM block
+
+maintainers:
+ - Bjorn Andersson <[email protected]>
+
+description: |
+ This binding describes the Top Level Mode Multiplexer block found in the
+ SM8250 platform.
+
+properties:
+ compatible:
+ const: qcom,sm8250-pinctrl
+
+ reg:
+ minItems: 3
+ maxItems: 3
+
+ reg-names:
+ items:
+ - const: "west"
+ - const: "south"
+ - const: "north"
+
+ interrupts:
+ description: Specifies the TLMM summary IRQ
+ maxItems: 1
+
+ interrupt-controller: true
+
+ '#interrupt-cells':
+ description:
+ Specifies the PIN numbers and Flags, as defined in defined in
+ include/dt-bindings/interrupt-controller/irq.h
+ const: 2
+
+ gpio-controller: true
+
+ '#gpio-cells':
+ description: Specifying the pin number and flags, as defined in
+ include/dt-bindings/gpio/gpio.h
+ const: 2
+
+ gpio-ranges:
+ maxItems: 1
+
+ wakeup-parent:
+ maxItems: 1
+
+#PIN CONFIGURATION NODES
+patternProperties:
+ '^.*$':
+ if:
+ type: object
+ then:
+ properties:
+ pins:
+ description:
+ List of gpio pins affected by the properties specified in this
+ subnode.
+ items:
+ oneOf:
+ - pattern: "^gpio([0-9]|[1-9][0-9]|1[0-7][0-9])$"
+ - enum: [ sdc2_clk, sdc2_cmd, sdc2_data, ufs_reset ]
+ minItems: 1
+ maxItems: 36
+
+ function:
+ description:
+ Specify the alternative function to be configured for the specified
+ pins.
+
+ enum: [ aoss_cti, atest, audio_ref, cam_mclk, cci_async, cci_i2c,
+ cci_timer0, cci_timer1, cci_timer2, cci_timer3, cci_timer4, cri_trng,
+ cri_trng0, cri_trng1, dbg_out, ddr_bist, ddr_pxi0, ddr_pxi1,
+ ddr_pxi2, ddr_pxi3, dp_hot, dp_lcd, gcc_gp1, gcc_gp2, gcc_gp3, gpio,
+ ibi_i3c, jitter_bist, lpass_slimbus, mdp_vsync, mdp_vsync0,
+ mdp_vsync1, mdp_vsync2, mdp_vsync3, mi2s0_data0, mi2s0_data1,
+ mi2s0_sck, mi2s0_ws, mi2s1_data0, mi2s1_data1, mi2s1_sck, mi2s1_ws,
+ mi2s2_data0, mi2s2_data1, mi2s2_sck, mi2s2_ws, pci_e0, pci_e1,
+ pci_e2, phase_flag, pll_bist, pll_bypassnl, pll_clk, pll_reset,
+ pri_mi2s, prng_rosc, qdss_cti, qdss_gpio, qspi0, qspi1, qspi2, qspi3,
+ qspi_clk, qspi_cs, qup0, qup1, qup10, qup11, qup12, qup13, qup14,
+ qup15, qup16, qup17, qup18, qup19, qup2, qup3, qup4, qup5, qup6,
+ qup7, qup8, qup9, qup_l4, qup_l5, qup_l6, sd_write, sdc40, sdc41,
+ sdc42, sdc43, sdc4_clk, sdc4_cmd, sec_mi2s, sp_cmu, tgu_ch0, tgu_ch1,
+ tgu_ch2, tgu_ch3, tsense_pwm1, tsense_pwm2, tsif0_clk, tsif0_data,
+ tsif0_en, tsif0_error, tsif0_sync, tsif1_clk, tsif1_data, tsif1_en,
+ tsif1_error, tsif1_sync, usb2phy_ac, usb_phy, vsense_trigger ]
+
+ drive-strength:
+ enum: [2, 4, 6, 8, 10, 12, 14, 16]
+ default: 2
+ description:
+ Selects the drive strength for the specified pins, in mA.
+
+ bias-pull-down: true
+
+ bias-pull-up: true
+
+ bias-disable: true
+
+ output-high: true
+
+ output-low: true
+
+ required:
+ - pins
+ - function
+
+ additionalProperties: false
+
+required:
+ - compatible
+ - reg
+ - reg-names
+ - interrupts
+ - interrupt-controller
+ - '#interrupt-cells'
+ - gpio-controller
+ - '#gpio-cells'
+ - gpio-ranges
+
+additionalProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+ pinctrl@1f00000 {
+ compatible = "qcom,sm8250-pinctrl";
+ reg = <0x0f100000 0x300000>,
+ <0x0f500000 0x300000>,
+ <0x0f900000 0x300000>;
+ reg-names = "west", "south", "north";
+ interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ gpio-ranges = <&tlmm 0 0 180>;
+ wakeup-parent = <&pdc>;
+ };

Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt

View file
diff --git a/Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt
index 6eada23..b686131 100644
--- a/Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt
@@ -13,6 +13,7 @@ Required Properties:
- "renesas,pfc-emev2": for EMEV2 (EMMA Mobile EV2) compatible pin-controller.
- "renesas,pfc-r8a73a4": for R8A73A4 (R-Mobile APE6) compatible pin-controller.
- "renesas,pfc-r8a7740": for R8A7740 (R-Mobile A1) compatible pin-controller.
+ - "renesas,pfc-r8a7742": for R8A7742 (RZ/G1H) compatible pin-controller.
- "renesas,pfc-r8a7743": for R8A7743 (RZ/G1M) compatible pin-controller.
- "renesas,pfc-r8a7744": for R8A7744 (RZ/G1N) compatible pin-controller.
- "renesas,pfc-r8a7745": for R8A7745 (RZ/G1E) compatible pin-controller.

Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt

View file
diff --git a/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt
index 2113cfa..d3eae61 100644
--- a/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt
@@ -110,8 +110,8 @@ pinctrl@20008000 {
uart2 {
uart2_xfer: uart2-xfer {
- rockchip,pins = <RK_GPIO1 8 1 &pcfg_pull_default>,
- <RK_GPIO1 9 1 &pcfg_pull_default>;
+ rockchip,pins = <1 RK_PB0 1 &pcfg_pull_default>,
+ <1 RK_PB1 1 &pcfg_pull_default>;
};
};
};

Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.yaml

View file
diff --git a/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.yaml
index 1f6e518..0857cbe 100644
--- a/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.yaml
+++ b/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.yaml
@@ -36,6 +36,9 @@ properties:
pins-are-numbered: true
hwlocks: true
+ interrupts:
+ maxItems: 1
+
st,syscfg:
description: Should be phandle/offset/mask
- Phandle to the syscon node which includes IRQ mux selection.

MAINTAINERS

View file
diff --git a/MAINTAINERS b/MAINTAINERS
index 464f452..f08f290 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13496,8 +13496,9 @@ F: drivers/pinctrl/qcom/
PIN CONTROLLER - RENESAS
M: Geert Uytterhoeven <[email protected]>
-S: Maintained
+S: Supported
T: git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git sh-pfc
+F: Documentation/devicetree/bindings/pinctrl/renesas,*
F: drivers/pinctrl/pinctrl-rz*
F: drivers/pinctrl/sh-pfc/

drivers/pinctrl/Kconfig

View file
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 834c599..8828613 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -82,7 +82,7 @@ config PINCTRL_AT91
config PINCTRL_AT91PIO4
bool "AT91 PIO4 pinctrl driver"
depends on OF
- depends on ARCH_AT91
+ depends on ARCH_AT91 || COMPILE_TEST
select PINMUX
select GENERIC_PINCONF
select GPIOLIB
@@ -95,6 +95,7 @@ config PINCTRL_AT91PIO4
config PINCTRL_AMD
tristate "AMD GPIO pin control"
depends on HAS_IOMEM
+ depends on ACPI || COMPILE_TEST
select GPIOLIB
select GPIOLIB_IRQCHIP
select PINMUX
@@ -172,15 +173,22 @@ config PINCTRL_GEMINI
select GENERIC_PINCONF
select MFD_SYSCON
+config PINCTRL_MCP23S08_I2C
+ tristate
+ select REGMAP_I2C
+
+config PINCTRL_MCP23S08_SPI
+ tristate
+ select REGMAP_SPI
+
config PINCTRL_MCP23S08
tristate "Microchip MCP23xxx I/O expander"
depends on SPI_MASTER || I2C
- depends on I2C || I2C=n
select GPIOLIB
select GPIOLIB_IRQCHIP
- select REGMAP_I2C if I2C
- select REGMAP_SPI if SPI_MASTER
select GENERIC_PINCONF
+ select PINCTRL_MCP23S08_I2C if I2C
+ select PINCTRL_MCP23S08_SPI if SPI_MASTER
help
SPI/I2C driver for Microchip MCP23S08 / MCP23S17 / MCP23S18 /
MCP23008 / MCP23017 / MCP23018 I/O expanders.
@@ -435,6 +443,7 @@ config PINCTRL_TB10X
config PINCTRL_EQUILIBRIUM
tristate "Generic pinctrl and GPIO driver for Intel Lightning Mountain SoC"
depends on OF && HAS_IOMEM
+ depends on X86 || COMPILE_TEST
select PINMUX
select PINCONF
select GPIOLIB

drivers/pinctrl/Makefile

View file
diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
index 0b36a1c..1731b21 100644
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@ -21,6 +21,8 @@ obj-$(CONFIG_PINCTRL_DIGICOLOR) += pinctrl-digicolor.o
obj-$(CONFIG_PINCTRL_FALCON) += pinctrl-falcon.o
obj-$(CONFIG_PINCTRL_GEMINI) += pinctrl-gemini.o
obj-$(CONFIG_PINCTRL_MAX77620) += pinctrl-max77620.o
+obj-$(CONFIG_PINCTRL_MCP23S08_I2C) += pinctrl-mcp23s08_i2c.o
+obj-$(CONFIG_PINCTRL_MCP23S08_SPI) += pinctrl-mcp23s08_spi.o
obj-$(CONFIG_PINCTRL_MCP23S08) += pinctrl-mcp23s08.o
obj-$(CONFIG_PINCTRL_MESON) += meson/
obj-$(CONFIG_PINCTRL_OXNAS) += pinctrl-oxnas.o

drivers/pinctrl/bcm/pinctrl-bcm281xx.c

View file
diff --git a/drivers/pinctrl/bcm/pinctrl-bcm281xx.c b/drivers/pinctrl/bcm/pinctrl-bcm281xx.c
index f690fc5..71e6661 100644
--- a/drivers/pinctrl/bcm/pinctrl-bcm281xx.c
+++ b/drivers/pinctrl/bcm/pinctrl-bcm281xx.c
@@ -1406,7 +1406,7 @@ static int __init bcm281xx_pinctrl_probe(struct platform_device *pdev)
pdata->reg_base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(pdata->reg_base)) {
dev_err(&pdev->dev, "Failed to ioremap MEM resource\n");
- return -ENODEV;
+ return PTR_ERR(pdata->reg_base);
}
/* Initialize the dynamic part of pinctrl_desc */

drivers/pinctrl/bcm/pinctrl-bcm2835.c

View file
diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
index 06bd2b7..1d21129 100644
--- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
+++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
@@ -19,6 +19,7 @@
#include <linux/irq.h>
#include <linux/irqdesc.h>
#include <linux/init.h>
+#include <linux/interrupt.h>
#include <linux/of_address.h>
#include <linux/of.h>
#include <linux/of_irq.h>
@@ -76,6 +77,7 @@
struct bcm2835_pinctrl {
struct device *dev;
void __iomem *base;
+ int *wake_irq;
/* note: locking assumes each bank will have its own unsigned long */
unsigned long enabled_irq_map[BCM2835_NUM_BANKS];
@@ -435,6 +437,11 @@ static void bcm2835_gpio_irq_handler(struct irq_desc *desc)
chained_irq_exit(host_chip, desc);
}
+static irqreturn_t bcm2835_gpio_wake_irq_handler(int irq, void *dev_id)
+{
+ return IRQ_HANDLED;
+}
+
static inline void __bcm2835_gpio_irq_config(struct bcm2835_pinctrl *pc,
unsigned reg, unsigned offset, bool enable)
{
@@ -634,6 +641,34 @@ static void bcm2835_gpio_irq_ack(struct irq_data *data)
bcm2835_gpio_set_bit(pc, GPEDS0, gpio);
}
+static int bcm2835_gpio_irq_set_wake(struct irq_data *data, unsigned int on)
+{
+ struct gpio_chip *chip = irq_data_get_irq_chip_data(data);
+ struct bcm2835_pinctrl *pc = gpiochip_get_data(chip);
+ unsigned gpio = irqd_to_hwirq(data);
+ unsigned int irqgroup;
+ int ret = -EINVAL;
+
+ if (!pc->wake_irq)
+ return ret;
+
+ if (gpio <= 27)
+ irqgroup = 0;
+ else if (gpio >= 28 && gpio <= 45)
+ irqgroup = 1;
+ else if (gpio >= 46 && gpio <= 57)
+ irqgroup = 2;
+ else
+ return ret;
+
+ if (on)
+ ret = enable_irq_wake(pc->wake_irq[irqgroup]);
+ else
+ ret = disable_irq_wake(pc->wake_irq[irqgroup]);
+
+ return ret;
+}
+
static struct irq_chip bcm2835_gpio_irq_chip = {
.name = MODULE_NAME,
.irq_enable = bcm2835_gpio_irq_enable,
@@ -642,6 +677,8 @@ static struct irq_chip bcm2835_gpio_irq_chip = {
.irq_ack = bcm2835_gpio_irq_ack,
.irq_mask = bcm2835_gpio_irq_disable,
.irq_unmask = bcm2835_gpio_irq_enable,
+ .irq_set_wake = bcm2835_gpio_irq_set_wake,
+ .flags = IRQCHIP_MASK_ON_SUSPEND,
};
static int bcm2835_pctl_get_groups_count(struct pinctrl_dev *pctldev)
@@ -1137,6 +1174,10 @@ static const struct of_device_id bcm2835_pinctrl_match[] = {
.compatible = "brcm,bcm2711-gpio",
.data = &bcm2711_plat_data,
},
+ {
+ .compatible = "brcm,bcm7211-gpio",
+ .data = &bcm2711_plat_data,
+ },
{}
};
@@ -1150,6 +1191,7 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev)
struct resource iomem;
int err, i;
const struct of_device_id *match;
+ int is_7211 = 0;
BUILD_BUG_ON(ARRAY_SIZE(bcm2835_gpio_pins) != BCM2711_NUM_GPIOS);
BUILD_BUG_ON(ARRAY_SIZE(bcm2835_gpio_groups) != BCM2711_NUM_GPIOS);
@@ -1176,6 +1218,7 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev)
return -EINVAL;
pdata = match->data;
+ is_7211 = of_device_is_compatible(np, "brcm,bcm7211-gpio");
pc->gpio_chip = *pdata->gpio_chip;
pc->gpio_chip.parent = dev;
@@ -1210,6 +1253,15 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev)
GFP_KERNEL);
if (!girq->parents)
return -ENOMEM;
+
+ if (is_7211) {
+ pc->wake_irq = devm_kcalloc(dev, BCM2835_NUM_IRQS,
+ sizeof(*pc->wake_irq),
+ GFP_KERNEL);
+ if (!pc->wake_irq)
+ return -ENOMEM;
+ }
+
/*
* Use the same handler for all groups: this is necessary
* since we use one gpiochip to cover all lines - the
@@ -1217,8 +1269,34 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev)
* bank that was firing the IRQ and look up the per-group
* and bank data.
*/
- for (i = 0; i < BCM2835_NUM_IRQS; i++)
+ for (i = 0; i < BCM2835_NUM_IRQS; i++) {
+ int len;
+ char *name;
+
girq->parents[i] = irq_of_parse_and_map(np, i);
+ if (!is_7211)
+ continue;
+
+ /* Skip over the all banks interrupts */
+ pc->wake_irq[i] = irq_of_parse_and_map(np, i +
+ BCM2835_NUM_IRQS + 1);
+
+ len = strlen(dev_name(pc->dev)) + 16;
+ name = devm_kzalloc(pc->dev, len, GFP_KERNEL);
+ if (!name)
+ return -ENOMEM;
+
+ snprintf(name, len, "%s:bank%d", dev_name(pc->dev), i);
+
+ /* These are optional interrupts */
+ err = devm_request_irq(dev, pc->wake_irq[i],
+ bcm2835_gpio_wake_irq_handler,
+ IRQF_SHARED, name, pc);
+ if (err)
+ dev_warn(dev, "unable to request wake IRQ %d\n",
+ pc->wake_irq[i]);
+ }
+
girq->default_type = IRQ_TYPE_NONE;
girq->handler = handle_level_irq;

drivers/pinctrl/freescale/Kconfig

View file
diff --git a/drivers/pinctrl/freescale/Kconfig b/drivers/pinctrl/freescale/Kconfig
index c784663..4ca44dd 100644
--- a/drivers/pinctrl/freescale/Kconfig
+++ b/drivers/pinctrl/freescale/Kconfig
@@ -165,6 +165,13 @@ config PINCTRL_IMX8QXP
help
Say Y here to enable the imx8qxp pinctrl driver
+config PINCTRL_IMX8DXL
+ bool "IMX8DXL pinctrl driver"
+ depends on IMX_SCU && ARCH_MXC && ARM64
+ select PINCTRL_IMX_SCU
+ help
+ Say Y here to enable the imx8dxl pinctrl driver
+
config PINCTRL_VF610
bool "Freescale Vybrid VF610 pinctrl driver"
depends on SOC_VF610

drivers/pinctrl/freescale/Makefile

View file
diff --git a/drivers/pinctrl/freescale/Makefile b/drivers/pinctrl/freescale/Makefile
index 0ebd3af..c617225 100644
--- a/drivers/pinctrl/freescale/Makefile
+++ b/drivers/pinctrl/freescale/Makefile
@@ -24,6 +24,7 @@ obj-$(CONFIG_PINCTRL_IMX8MP) += pinctrl-imx8mp.o
obj-$(CONFIG_PINCTRL_IMX8MQ) += pinctrl-imx8mq.o
obj-$(CONFIG_PINCTRL_IMX8QM) += pinctrl-imx8qm.o
obj-$(CONFIG_PINCTRL_IMX8QXP) += pinctrl-imx8qxp.o
+obj-$(CONFIG_PINCTRL_IMX8DXL) += pinctrl-imx8dxl.o
obj-$(CONFIG_PINCTRL_VF610) += pinctrl-vf610.o
obj-$(CONFIG_PINCTRL_MXS) += pinctrl-mxs.o
obj-$(CONFIG_PINCTRL_IMX23) += pinctrl-imx23.o

drivers/pinctrl/freescale/pinctrl-imx.c

View file
diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c
index 9f42036..cb7e0f0 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx.c
@@ -774,16 +774,6 @@ static int imx_pinctrl_probe_dt(struct platform_device *pdev,
return 0;
}
-/*
- * imx_free_resources() - free memory used by this driver
- * @info: info driver instance
- */
-static void imx_free_resources(struct imx_pinctrl *ipctl)
-{
- if (ipctl->pctl)
- pinctrl_unregister(ipctl->pctl);
-}
-
int imx_pinctrl_probe(struct platform_device *pdev,
const struct imx_pinctrl_soc_info *info)
{
@@ -834,12 +824,13 @@ int imx_pinctrl_probe(struct platform_device *pdev,
return -EINVAL;
}
- ipctl->input_sel_base = of_iomap(np, 0);
+ ipctl->input_sel_base = devm_of_iomap(&pdev->dev, np,
+ 0, NULL);
of_node_put(np);
- if (!ipctl->input_sel_base) {
+ if (IS_ERR(ipctl->input_sel_base)) {
dev_err(&pdev->dev,
"iomuxc input select base address not found\n");
- return -ENOMEM;
+ return PTR_ERR(ipctl->input_sel_base);
}
}
}
@@ -874,23 +865,18 @@ int imx_pinctrl_probe(struct platform_device *pdev,
&ipctl->pctl);
if (ret) {
dev_err(&pdev->dev, "could not register IMX pinctrl driver\n");
- goto free;
+ return ret;
}
ret = imx_pinctrl_probe_dt(pdev, ipctl);
if (ret) {
dev_err(&pdev->dev, "fail to probe dt properties\n");
- goto free;
+ return ret;
}
dev_info(&pdev->dev, "initialized IMX pinctrl driver\n");
return pinctrl_enable(ipctl->pctl);
-
-free:
- imx_free_resources(ipctl);
-
- return ret;
}
static int __maybe_unused imx_pinctrl_suspend(struct device *dev)

drivers/pinctrl/freescale/pinctrl-imx1-core.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/freescale/pinctrl-imx8dxl.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/intel/Kconfig

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/intel/Makefile

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/intel/pinctrl-baytrail.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/intel/pinctrl-cannonlake.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/intel/pinctrl-cherryview.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/intel/pinctrl-icelake.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/intel/pinctrl-intel.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/intel/pinctrl-intel.h

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/intel/pinctrl-jasperlake.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/intel/pinctrl-lynxpoint.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/intel/pinctrl-tigerlake.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/mediatek/Kconfig

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/mediatek/Makefile

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/mediatek/mtk-eint.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/mediatek/pinctrl-mt6765.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/mediatek/pinctrl-paris.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/meson/pinctrl-meson.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/nomadik/pinctrl-ab8505.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/nomadik/pinctrl-nomadik.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/pinctrl-at91-pio4.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/pinctrl-bm1880.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/pinctrl-ingenic.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/pinctrl-lantiq.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/pinctrl-mcp23s08.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/pinctrl-mcp23s08.h

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/pinctrl-mcp23s08_i2c.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/pinctrl-mcp23s08_spi.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/pinctrl-ocelot.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/pinctrl-rk805.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/pinctrl-rockchip.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/pinctrl-rza1.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/pinctrl-stmfx.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/pinctrl-sx150x.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/pxa/pinctrl-pxa2xx.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/qcom/Kconfig

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/qcom/Makefile

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/qcom/pinctrl-msm.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/qcom/pinctrl-sm8250.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/samsung/pinctrl-exynos.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/sh-pfc/Kconfig

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/sh-pfc/Makefile

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/sh-pfc/core.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/sh-pfc/pfc-r8a7790.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/sh-pfc/pfc-sh7269.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/sh-pfc/sh_pfc.h

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/sirf/pinctrl-sirf.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/sprd/pinctrl-sprd.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/tegra/pinctrl-tegra-xusb.c

View file

This diff is incomplete. Download the complete patch.

drivers/pinctrl/zte/pinctrl-zx.c

View file

This diff is incomplete. Download the complete patch.

include/dt-bindings/pinctrl/pads-imx8dxl.h

View file

This diff is incomplete. Download the complete patch.

include/linux/spi/mcp23s08.h

View before deletion

This diff is incomplete. Download the complete patch.