Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9cc2c88 authored by Simon Horman's avatar Simon Horman
Browse files

Merge branches 'soc' and 'pinmux' into boards-base

parents d75bc78b a4339a9c

Documentation/devicetree/bindings/gpio/gpio.txt

+3 −3
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ announce the pinrange to the pin ctrl subsystem. For example, 
		compatible = "fsl,qe-pario-bank-e", "fsl,qe-pario-bank";

		reg = <0x1460 0x18>;

		gpio-controller;

		gpio-ranges = <&pinctrl1 20 10>, <&pinctrl2 50 20>;

		gpio-ranges = <&pinctrl1 0 20 10>, <&pinctrl2 10 50 20>;



    }
@@ -107,8 +107,8 @@ where, 


   Next values specify the base pin and number of pins for the range

   handled by 'qe_pio_e' gpio. In the given example from base pin 20 to

   pin 29 under pinctrl1 and pin 50 to pin 69 under pinctrl2 is handled

   by this gpio controller.

   pin 29 under pinctrl1 with gpio offset 0 and pin 50 to pin 69 under

   pinctrl2 with gpio offset 10 is handled by this gpio controller.



The pinctrl node must have "#gpio-range-cells" property to show number of

arguments to pass with phandle from gpio controllers node.

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

+106 −1
Original line number Diff line number Diff line 
One-register-per-pin type device tree based pinctrl driver



Required properties:

- compatible : "pinctrl-single"

- compatible : "pinctrl-single" or "pinconf-single".

  "pinctrl-single" means that pinconf isn't supported.

  "pinconf-single" means that generic pinconf is supported.



- reg : offset and length of the register set for the mux registers
@@ -14,9 +16,61 @@ Optional properties: 
- pinctrl-single,function-off : function off mode for disabled state if

  available and same for all registers; if not specified, disabling of

  pin functions is ignored



- pinctrl-single,bit-per-mux : boolean to indicate that one register controls

  more than one pin



- pinctrl-single,drive-strength : array of value that are used to configure

  drive strength in the pinmux register. They're value of drive strength

  current and drive strength mask.



		/* drive strength current, mask */

		pinctrl-single,power-source = <0x30 0xf0>;



- pinctrl-single,bias-pullup : array of value that are used to configure the

  input bias pullup in the pinmux register.



		/* input, enabled pullup bits, disabled pullup bits, mask */

		pinctrl-single,bias-pullup = <0 1 0 1>;



- pinctrl-single,bias-pulldown : array of value that are used to configure the

  input bias pulldown in the pinmux register.



		/* input, enabled pulldown bits, disabled pulldown bits, mask */

		pinctrl-single,bias-pulldown = <2 2 0 2>;



  * Two bits to control input bias pullup and pulldown: User should use

    pinctrl-single,bias-pullup & pinctrl-single,bias-pulldown. One bit means

    pullup, and the other one bit means pulldown.

  * Three bits to control input bias enable, pullup and pulldown. User should

    use pinctrl-single,bias-pullup & pinctrl-single,bias-pulldown. Input bias

    enable bit should be included in pullup or pulldown bits.

  * Although driver could set PIN_CONFIG_BIAS_DISABLE, there's no property as

    pinctrl-single,bias-disable. Because pinctrl single driver could implement

    it by calling pulldown, pullup disabled.



- pinctrl-single,input-schmitt : array of value that are used to configure

  input schmitt in the pinmux register. In some silicons, there're two input

  schmitt value (rising-edge & falling-edge) in the pinmux register.



		/* input schmitt value, mask */

		pinctrl-single,input-schmitt = <0x30 0x70>;



- pinctrl-single,input-schmitt-enable : array of value that are used to

  configure input schmitt enable or disable in the pinmux register.



		/* input, enable bits, disable bits, mask */

		pinctrl-single,input-schmitt-enable = <0x30 0x40 0 0x70>;



- pinctrl-single,gpio-range : list of value that are used to configure a GPIO

  range. They're value of subnode phandle, pin base in pinctrl device, pin

  number in this range, GPIO function value of this GPIO range.

  The number of parameters is depend on #pinctrl-single,gpio-range-cells

  property.



		/* pin base, nr pins & gpio function */

		pinctrl-single,gpio-range = <&range 0 3 0 &range 3 9 1>;



This driver assumes that there is only one register for each pin (unless the

pinctrl-single,bit-per-mux is set), and uses the common pinctrl bindings as

specified in the pinctrl-bindings.txt document in this directory.
@@ -42,6 +96,20 @@ Where 0xdc is the offset from the pinctrl register base address for the 
device pinctrl register, 0x18 is the desired value, and 0xff is the sub mask to

be used when applying this change to the register.





Optional sub-node: In case some pins could be configured as GPIO in the pinmux

register, those pins could be defined as a GPIO range. This sub-node is required

by pinctrl-single,gpio-range property.



Required properties in sub-node:

- #pinctrl-single,gpio-range-cells : the number of parameters after phandle in

  pinctrl-single,gpio-range property.



	range: gpio-range {

		#pinctrl-single,gpio-range-cells = <3>;

	};





Example:



/* SoC common file */
@@ -76,6 +144,29 @@ control_devconf0: pinmux@48002274 { 
	pinctrl-single,function-mask = <0x5F>;

};



/* third controller instance for pins in gpio domain */

pmx_gpio: pinmux@d401e000 {

	compatible = "pinconf-single";

	reg = <0xd401e000 0x0330>;

	#address-cells = <1>;

	#size-cells = <1>;

	ranges;



	pinctrl-single,register-width = <32>;

	pinctrl-single,function-mask = <7>;



	/* sparse GPIO range could be supported */

	pinctrl-single,gpio-range = <&range 0 3 0 &range 3 9 1

				&range 12 1 0 &range 13 29 1

				&range 43 1 0 &range 44 49 1

				&range 94 1 1 &range 96 2 1>;



	range: gpio-range {

		#pinctrl-single,gpio-range-cells = <3>;

	};

};





/* board specific .dts file */



&pmx_core {
@@ -96,6 +187,15 @@ control_devconf0: pinmux@48002274 { 
		>;

	};



	uart0_pins: pinmux_uart0_pins {

		pinctrl-single,pins = <

			0x208 0		/* UART0_RXD (IOCFG138) */

			0x20c 0		/* UART0_TXD (IOCFG139) */

		>;

		pinctrl-single,bias-pulldown = <0 2 2>;

		pinctrl-single,bias-pullup = <0 1 1>;

	};



	/* map uart2 pins */

	uart2_pins: pinmux_uart2_pins {

		pinctrl-single,pins = <
@@ -122,6 +222,11 @@ control_devconf0: pinmux@48002274 { 


};



&uart1 {

       pinctrl-names = "default";

       pinctrl-0 = <&uart0_pins>;

};



&uart2 {

       pinctrl-names = "default";

       pinctrl-0 = <&uart2_pins>;

arch/arm/boot/dts/spear1310.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ 
		pinmux: pinmux@e0700000 {

			compatible = "st,spear1310-pinmux";

			reg = <0xe0700000 0x1000>;

			#gpio-range-cells = <2>;

			#gpio-range-cells = <3>;

		};



		apb {
@@ -212,7 +212,7 @@ 
				interrupt-controller;

				gpio-controller;

				#gpio-cells = <2>;

				gpio-ranges = <&pinmux 0 246>;

				gpio-ranges = <&pinmux 0 0 246>;

				status = "disabled";



				st-plgpio,ngpio = <246>;

arch/arm/boot/dts/spear1340.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 
		pinmux: pinmux@e0700000 {

			compatible = "st,spear1340-pinmux";

			reg = <0xe0700000 0x1000>;

			#gpio-range-cells = <2>;

			#gpio-range-cells = <3>;

		};



		pwm: pwm@e0180000 {
@@ -127,7 +127,7 @@ 
				interrupt-controller;

				gpio-controller;

				#gpio-cells = <2>;

				gpio-ranges = <&pinmux 0 252>;

				gpio-ranges = <&pinmux 0 0 252>;

				status = "disabled";



				st-plgpio,ngpio = <250>;

arch/arm/boot/dts/spear310.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
		pinmux: pinmux@b4000000 {

			compatible = "st,spear310-pinmux";

			reg = <0xb4000000 0x1000>;

			#gpio-range-cells = <2>;

			#gpio-range-cells = <3>;

		};



		fsmc: flash@44000000 {
@@ -102,7 +102,7 @@ 
				interrupt-controller;

				gpio-controller;

				#gpio-cells = <2>;

				gpio-ranges = <&pinmux 0 102>;

				gpio-ranges = <&pinmux 0 0 102>;

				status = "disabled";



				st-plgpio,ngpio = <102>;