Commit 581dbc8b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull pin control updates from Linus Walleij:
 "This is the bulk of pin control patches for the v4.5 series.

  Notably I have a patch to driver core from Stephen Boyd in the pull
  request, this has been ACKed by Greg so it should be OK.  The internal
  API needed some tweaking to allow modular Qualcomm pin controllers.

  There is a bit of development history in here but it should all add up
  nicely and has boiled in linux-next.  For example I merged in v4.4-rc5
  to get rid of some nasty merge conflicts.

  Summary:

   - New drivers:
      - PXA2xx pin controller support
      - Broadcom NSP pin controller support

   - New subdrivers:
      - Samsung EXYNOS5410 support
      - Qualcomm MSM8996 support
      - Qualcomm PM8994 support
      - Qualcomm PM8994 MPP support
      - Allwinner sunxi H3 support
      - Allwinner sunxi A80 support
      - Rockchip RK3228 support

   - Rename the Cygnus pinctrl driver to "iproc" as it is more generic
     than was originally thought.

   - A bunch of Lantiq/Xway updates especially from the OpenWRT people.

   - Several refactorings for the Super-H SH PFC pin controllers.
     Adding SCIF_CLK support.

   - Several fixes to the Atlas 7 driver.

   - Various fixes all over the place"

* tag 'pinctrl-v4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (91 commits)
  pinctrl: mediatek: Modify pinctrl bindings for mt2701
  Revert "pinctrl: qcom: make PMIC drivers bool"
  pinctrl: qcom: Use platform_irq_count() instead of of_irq_count()
  driver-core: platform: Add platform_irq_count()
  pinctrl: lantiq: 2 pins have the wrong mux list
  pinctrl: qcom: make PMIC drivers bool
  pinctrl: nsp-gpio: forever loop in nsp_gpio_get_strength()
  pinctrl: mediatek: convert to arch_initcall
  pinctrl: bcm2835: Fix memory leak in error path
  pinctrl: mediatek: add missing of_node_put
  pinctrl: rockchip: add missing of_node_put
  pinctrl: sh-pfc: add missing of_node_put
  pinctrl: sirf: add missing of_node_put
  pinctrl-tegra: add missing of_node_put
  pinctrl: sunxi: Add A80 special pin controller
  pinctrl: bcm/cygnys/iproc: fixup rebase issue
  pinctrl: fixup problematic flag
  MAINTAINERS: Add co-maintainer for Renesas Pin Controllers
  pinctrl: sh-pfc: r8a7791: add EtherAVB pin groups
  pinctrl: sh-pfc: r8a7795: Add SATA support
  ...
parents fb591fbd 14da0a91

Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt

+3 −0
Original line number Diff line number Diff line
@@ -17,7 +17,10 @@ Required properties: 
  "allwinner,sun8i-a23-pinctrl"

  "allwinner,sun8i-a23-r-pinctrl"

  "allwinner,sun8i-a33-pinctrl"

  "allwinner,sun9i-a80-pinctrl"

  "allwinner,sun9i-a80-r-pinctrl"

  "allwinner,sun8i-a83t-pinctrl"

  "allwinner,sun8i-h3-pinctrl"



- reg: Should contain the register physical address and length for the

  pin controller.

Documentation/devicetree/bindings/pinctrl/brcm,cygnus-gpio.txt→Documentation/devicetree/bindings/pinctrl/brcm,iproc-gpio.txt

+7 −2
Original line number Diff line number Diff line 
Broadcom Cygnus GPIO/PINCONF Controller

Broadcom iProc GPIO/PINCONF Controller



Required properties:
@@ -7,9 +7,12 @@ Required properties: 
    "brcm,cygnus-crmu-gpio" or "brcm,iproc-gpio"



- reg:

    Define the base and range of the I/O address space that contains the Cygnus

    Define the base and range of the I/O address space that contains SoC

GPIO/PINCONF controller registers



- ngpios:

    Total number of in-use slots in GPIO controller



- #gpio-cells:

    Must be two. The first cell is the GPIO pin number (within the

controller's pin space) and the second cell is used for the following:
@@ -57,6 +60,7 @@ Example: 
		compatible = "brcm,cygnus-ccm-gpio";

		reg = <0x1800a000 0x50>,

		      <0x0301d164 0x20>;

		ngpios = <24>;

		#gpio-cells = <2>;

		gpio-controller;

		interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
@@ -78,6 +82,7 @@ Example: 
	gpio_asiu: gpio@180a5000 {

		compatible = "brcm,cygnus-asiu-gpio";

		reg = <0x180a5000 0x668>;

		ngpios = <146>;

		#gpio-cells = <2>;

		gpio-controller;

		interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;

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

0 → 100644
+80 −0
Original line number Diff line number Diff line 
Broadcom Northstar plus (NSP) GPIO/PINCONF Controller



Required properties:

- compatible:

    Must be "brcm,nsp-gpio-a"



- reg:

    Should contain the register physical address and length for each of

    GPIO base, IO control registers



- #gpio-cells:

    Must be two. The first cell is the GPIO pin number (within the

    controller's pin space) and the second cell is used for the following:

    bit[0]: polarity (0 for active high and 1 for active low)



- gpio-controller:

    Specifies that the node is a GPIO controller



- ngpios:

    Number of gpios supported (58x25 supports 32 and 58x23 supports 24)



Optional properties:

- interrupts:

    Interrupt ID



- interrupt-controller:

    Specifies that the node is an interrupt controller



- gpio-ranges:

    Specifies the mapping between gpio controller and pin-controllers pins.

    This requires 4 fields in cells defined as -

    1. Phandle of pin-controller.

    2. GPIO base pin offset.

    3  Pin-control base pin offset.

    4. number of gpio pins which are linearly mapped from pin base.



Supported generic PINCONF properties in child nodes:

- pins:

    The list of pins (within the controller's own pin space) that properties

    in the node apply to. Pin names are "gpio-<pin>"



- bias-disable:

    Disable pin bias



- bias-pull-up:

    Enable internal pull up resistor



- bias-pull-down:

    Enable internal pull down resistor



- drive-strength:

    Valid drive strength values include 2, 4, 6, 8, 10, 12, 14, 16 (mA)



Example:



	gpioa: gpio@18000020 {

		compatible = "brcm,nsp-gpio-a";

		reg = <0x18000020 0x100>,

		      <0x1803f1c4 0x1c>;

		#gpio-cells = <2>;

		gpio-controller;

		ngpios = <32>;

		gpio-ranges = <&pinctrl 0 0 31>;

		interrupt-controller;

		interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;



		/* Hog a few default settings */

		pinctrl-names = "default";

		pinctrl-0 = <&led>;

		led: led {

			pins = "gpio-1";

			bias-pull-up;

		};



		pwr: pwr {

			gpio-hog;

			gpios = <3 1>;

			output-high;

		};

	};

Documentation/devicetree/bindings/pinctrl/lantiq,pinctrl-xway.txt

+102 −8
Original line number Diff line number Diff line 
Lantiq XWAY pinmux controller



Required properties:

- compatible: "lantiq,pinctrl-xway" or "lantiq,pinctrl-xr9"

- compatible: "lantiq,pinctrl-xway", (DEPRECATED: Use "lantiq,pinctrl-danube")

	      "lantiq,pinctrl-xr9", (DEPRECATED: Use "lantiq,xrx100-pinctrl" or

					"lantiq,xrx200-pinctrl")

	      "lantiq,pinctrl-ase", (DEPRECATED: Use "lantiq,ase-pinctrl")

	      "lantiq,<chip>-pinctrl", where <chip> is:

		"ase" (XWAY AMAZON Family)

		"danube" (XWAY DANUBE Family)

		"xrx100" (XWAY xRX100 Family)

		"xrx200" (XWAY xRX200 Family)

		"xrx300" (XWAY xRX300 Family)

- reg: Should contain the physical address and length of the gpio/pinmux

  register range
@@ -36,6 +45,7 @@ Required subnode-properties: 


Valid values for group and function names:



XWAY: (DEPRECATED: Use DANUBE)

  mux groups:

    exin0, exin1, exin2, jtag, ebu a23, ebu a24, ebu a25, ebu clk, ebu cs1,

    ebu wait, nand ale, nand cs1, nand cle, spi, spi_cs1, spi_cs2, spi_cs3,
@@ -43,12 +53,79 @@ Valid values for group and function names: 
    gpt3, clkout0, clkout1, clkout2, clkout3, gnt1, gnt2, gnt3, req1, req2,

    req3



  additional mux groups (XR9 only):

    mdio, nand rdy, nand rd, exin3, exin4, gnt4, req4

  functions:

    spi, asc, cgu, jtag, exin, stp, gpt, nmi, pci, ebu



XR9: ( DEPRECATED: Use xRX100/xRX200)

  mux groups:

    exin0, exin1, exin2, exin3, exin4, jtag, ebu a23, ebu a24, ebu a25,

    ebu clk, ebu cs1, ebu wait, nand ale, nand cs1, nand cle, nand rdy,

    nand rd, spi, spi_cs1, spi_cs2, spi_cs3, spi_cs4, spi_cs5, spi_cs6,

    asc0, asc0 cts rts, stp, nmi, gpt1, gpt2, gpt3, clkout0, clkout1,

    clkout2, clkout3, gnt1, gnt2, gnt3, gnt4, req1, req2, req3, req4, mdio,

    gphy0 led0, gphy0 led1, gphy0 led2, gphy1 led0, gphy1 led1, gphy1 led2



  functions:

    spi, asc, cgu, jtag, exin, stp, gpt, nmi, pci, ebu, mdio, gphy



AMAZON:

  mux groups:

    exin0, exin1, exin2, jtag, spi_di, spi_do, spi_clk, spi_cs1, spi_cs2,

    spi_cs3, spi_cs4, spi_cs5, spi_cs6, asc, stp, gpt1, gpt2, gpt3, clkout0,

    clkout1, clkout2, mdio, dfe led0, dfe led1, ephy led0, ephy led1, ephy led2



  functions:

    spi, asc, cgu, jtag, exin, stp, gpt, mdio, ephy, dfe



DANUBE:

  mux groups:

    exin0, exin1, exin2, jtag, ebu a23, ebu a24, ebu a25, ebu clk, ebu cs1,

    ebu wait, nand ale, nand cs1, nand cle, spi_di, spi_do, spi_clk, spi_cs1,

    spi_cs2, spi_cs3, spi_cs4, spi_cs5, spi_cs6, asc0, asc0 cts rts, stp, nmi,

    gpt1, gpt2, gpt3, clkout0, clkout1, clkout2, clkout3, gnt1, gnt2, gnt3,

    req1, req2, req3, dfe led0, dfe led1



  functions:

    spi, asc, cgu, jtag, exin, stp, gpt, nmi, pci, ebu, mdio

    spi, asc, cgu, jtag, exin, stp, gpt, nmi, pci, ebu, dfe



xRX100:

  mux groups:

    exin0, exin1, exin2, exin3, exin4, ebu a23, ebu a24, ebu a25, ebu clk,

    ebu cs1, ebu wait, nand ale, nand cs1, nand cle, nand rdy, nand rd,

    spi_di, spi_do, spi_clk, spi_cs1, spi_cs2, spi_cs3, spi_cs4, spi_cs5,

    spi_cs6, asc0, asc0 cts rts, stp, nmi, gpt1, gpt2, gpt3, clkout0, clkout1,

    clkout2, clkout3, gnt1, gnt2, gnt3, gnt4, req1, req2, req3, req4, mdio,

    dfe led0, dfe led1



  functions:

    spi, asc, cgu, exin, stp, gpt, nmi, pci, ebu, mdio, dfe



xRX200:

  mux groups:

    exin0, exin1, exin2, exin3, exin4, ebu a23, ebu a24, ebu a25, ebu clk,

    ebu cs1, ebu wait, nand ale, nand cs1, nand cle, nand rdy, nand rd,

    spi_di, spi_do, spi_clk, spi_cs1, spi_cs2, spi_cs3, spi_cs4, spi_cs5,

    spi_cs6, usif uart_rx, usif uart_tx, usif uart_rts, usif uart_cts,

    usif uart_dtr, usif uart_dsr, usif uart_dcd, usif uart_ri, usif spi_di,

    usif spi_do, usif spi_clk, usif spi_cs0, usif spi_cs1, usif spi_cs2,

    stp, nmi, gpt1, gpt2, gpt3, clkout0, clkout1, clkout2, clkout3, gnt1,

    gnt2, gnt3, gnt4, req1, req2, req3, req4, mdio, dfe led0, dfe led1,

    gphy0 led0, gphy0 led1, gphy0 led2, gphy1 led0, gphy1 led1, gphy1 led2



  functions:

    spi, usif, cgu, exin, stp, gpt, nmi, pci, ebu, mdio, dfe, gphy



xRX300:

  mux groups:

    exin0, exin1, exin2, exin4, nand ale, nand cs0, nand cs1, nand cle,

    nand rdy, nand rd, nand_d0, nand_d1, nand_d2, nand_d3, nand_d4, nand_d5,

    nand_d6, nand_d7, nand_d1, nand wr, nand wp, nand se, spi_di, spi_do,

    spi_clk, spi_cs1, spi_cs4, spi_cs6, usif uart_rx, usif uart_tx,

    usif spi_di, usif spi_do, usif spi_clk, usif spi_cs0, stp, clkout2,

    mdio, dfe led0, dfe led1, ephy0 led0, ephy0 led1, ephy1 led0, ephy1 led1



  functions:

    spi, usif, cgu, exin, stp, ebu, mdio, dfe, ephy





Definition of pin configurations:
@@ -62,15 +139,32 @@ Optional subnode-properties: 
    0: none, 1: down, 2: up.

- lantiq,open-drain: Boolean, enables open-drain on the defined pin.



Valid values for XWAY pin names:

Valid values for XWAY pin names: (DEPRECATED: Use DANUBE)

  Pinconf pins can be referenced via the names io0-io31.



Valid values for XR9 pin names:

Valid values for XR9 pin names: (DEPRECATED: Use xrX100/xRX200)

  Pinconf pins can be referenced via the names io0-io55.



Valid values for AMAZON pin names:

  Pinconf pins can be referenced via the names io0-io31.



Valid values for DANUBE pin names:

  Pinconf pins can be referenced via the names io0-io31.



Valid values for xRX100 pin names:

  Pinconf pins can be referenced via the names io0-io55.



Valid values for xRX200 pin names:

  Pinconf pins can be referenced via the names io0-io49.



Valid values for xRX300 pin names:

  Pinconf pins can be referenced via the names io0-io1,io3-io6,io8-io11,

						io13-io19,io23-io27,io34-io36,

						io42-io43,io48-io61.



Example:

	gpio: pinmux@E100B10 {

		compatible = "lantiq,pinctrl-xway";

		compatible = "lantiq,danube-pinctrl";

		pinctrl-names = "default";

		pinctrl-0 = <&state_default>;

Documentation/devicetree/bindings/pinctrl/pinctrl-mt65xx.txt

+5 −4
Original line number Diff line number Diff line
@@ -4,10 +4,11 @@ The Mediatek's Pin controller is used to control SoC pins. 


Required properties:

- compatible: value should be one of the following.

    (a) "mediatek,mt8135-pinctrl", compatible with mt8135 pinctrl.

    (b) "mediatek,mt8173-pinctrl", compatible with mt8173 pinctrl.

    (c) "mediatek,mt6397-pinctrl", compatible with mt6397 pinctrl.

    (d) "mediatek,mt8127-pinctrl", compatible with mt8127 pinctrl.

	"mediatek,mt2701-pinctrl", compatible with mt2701 pinctrl.

	"mediatek,mt6397-pinctrl", compatible with mt6397 pinctrl.

	"mediatek,mt8127-pinctrl", compatible with mt8127 pinctrl.

	"mediatek,mt8135-pinctrl", compatible with mt8135 pinctrl.

	"mediatek,mt8173-pinctrl", compatible with mt8173 pinctrl.

- pins-are-numbered: Specify the subnodes are using numbered pinmux to

  specify pins.

- gpio-controller : Marks the device node as a gpio controller.

CRA Git | Maintained and supported by SUSTech CRA and CCSE