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

Commit 334ab91d authored Jul 09, 2013 by Srinivas Kandagatla Committed by Olof Johansson Jul 22, 2013

ARM: dts: STi: Fix pinconf setup for STiH416 serial2



This patch fixes a bug in pinctrl setup of serial2 device, Some of the
pins in the pinctrl node of serial2 do not belong to that
pin-controller. This patch divides them in the pins into there
respective pin controller nodes.

Without this patch serial on StiH416-B2000 Board will not work as it
fails with:

"st-pinctrl pin-controller-rear.3: failed to get pin(99) name
st-pinctrl pin-controller-rear.3: maps: function serial2 group serial2-0
num 4
pinconfig core: failed to register map default (3): no group/pin given"

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
Signed-off-by: Olof Johansson <olof@lixom.net>

parent 3b2f64d0

arch/arm/boot/dts/stih416-pinctrl.dtsi

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -166,6 +166,15 @@
	reg = <0x9000 0x100>;		reg = <0x9000 0x100>;
	st,bank-name = "PIO31";		st,bank-name = "PIO31";
	};		};

			serial2-oe {
			pinctrl_serial2_oe: serial2-1 {
			st,pins {
			output-enable = <&PIO11 3 ALT2 OUT>;
			};
			};
			};

	};		};

	pin-controller-rear {		pin-controller-rear {
	@@ -218,7 +227,6 @@
	st,pins {		st,pins {
	tx = <&PIO17 4 ALT2 OUT>;		tx = <&PIO17 4 ALT2 OUT>;
	rx = <&PIO17 5 ALT2 IN>;		rx = <&PIO17 5 ALT2 IN>;
	output-enable = <&PIO11 3 ALT2 OUT>;
	};		};
	};		};
	};		};

arch/arm/boot/dts/stih416.dtsi

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -79,7 +79,7 @@
	interrupts = <0 197 0>;		interrupts = <0 197 0>;
	clocks = <&CLK_S_ICN_REG_0>;		clocks = <&CLK_S_ICN_REG_0>;
	pinctrl-names = "default";		pinctrl-names = "default";
	pinctrl-0 = <&pinctrl_serial2>;		pinctrl-0 = <&pinctrl_serial2 &pinctrl_serial2_oe>;
	};		};

	/* SBC_UART1 */		/* SBC_UART1 */