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

Commit f05646c9 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.10/pinctrl-cells-signed' of... 

Merge tag 'omap-for-v4.10/pinctrl-cells-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Add #pinctrl-cells for pinctrl-single using dts files. This allows
us to use generic parser later on. Note that the driver supports
handling the legacy binding also with no #pinctrl-cells so these
changes can be queued separately from the driver changes.

* tag 'omap-for-v4.10/pinctrl-cells-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: dts: Add #pinctrl-cells for pinctrl-single instances

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents c60c41e8 be76fd31

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

+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,9 @@ Required properties: 


- reg : offset and length of the register set for the mux registers



- #pinctrl-cells : number of cells in addition to the index, set to 1

  for pinctrl-single,pins and 2 for pinctrl-single,bits



- pinctrl-single,register-width : pinmux register access width in bits



- pinctrl-single,function-mask : mask of allowed pinmux function bits

arch/arm/boot/dts/am33xx.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ 
				reg = <0x210000 0x2000>;

				#address-cells = <1>;

				#size-cells = <1>;

				#pinctrl-cells = <1>;

				ranges = <0 0x210000 0x2000>;



				am33xx_pinmux: pinmux@800 {
@@ -137,6 +138,7 @@ 
					reg = <0x800 0x238>;

					#address-cells = <1>;

					#size-cells = <0>;

					#pinctrl-cells = <1>;

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

					pinctrl-single,function-mask = <0x7f>;

				};

arch/arm/boot/dts/am3517.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ 
			reg = <0x480025d8 0x24>;

			#address-cells = <1>;

			#size-cells = <0>;

			#pinctrl-cells = <1>;

			#interrupt-cells = <1>;

			interrupt-controller;

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

arch/arm/boot/dts/am4372.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ 
					reg = <0x800 0x31c>;

					#address-cells = <1>;

					#size-cells = <0>;

					#pinctrl-cells = <1>;

					#interrupt-cells = <1>;

					interrupt-controller;

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

arch/arm/boot/dts/da850.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
			reg = <0x14120 0x50>;

			#address-cells = <1>;

			#size-cells = <0>;

			#pinctrl-cells = <2>;

			pinctrl-single,bit-per-mux;

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

			pinctrl-single,function-mask = <0xf>;