On Thu, Apr 16, 2015 at 03:57:07PM +0800, Haojian Zhuang wrote:
On 15 April 2015 at 20:14, Leo Yan leo.yan@linaro.org wrote:
In the previous dts, it will set pinmux for every pin one by one; it's not easily used by the modules and difficult to maintain them.
So change to set pinmux based on module, so that we can group pins base on that. And every module can easily hook the pinmux setting.
Signed-off-by: Leo Yan leo.yan@linaro.org
arch/arm64/boot/dts/hi6220-hikey.dts | 136 +- arch/arm64/boot/dts/hi6220.dtsi | 45 +- arch/arm64/boot/dts/hikey-pinctrl.dtsi | 3228 ++++++-------------------------- 3 files changed, 565 insertions(+), 2844 deletions(-)
diff --git a/arch/arm64/boot/dts/hi6220-hikey.dts b/arch/arm64/boot/dts/hi6220-hikey.dts index 676443e..b8f07f1 100644 --- a/arch/arm64/boot/dts/hi6220-hikey.dts +++ b/arch/arm64/boot/dts/hi6220-hikey.dts @@ -48,43 +48,17 @@
uart1: uart@f7111000 { pinctrl-names = "default", "idle";
pinctrl-0 = <&UART1_CTS_N_pmx_func
&UART1_CTS_N_cfg_func
&UART1_RTS_N_pmx_func
&UART1_RTS_N_cfg_func
&UART1_RXD_pmx_func
&UART1_RXD_cfg_func
&UART1_TXD_pmx_func
&UART1_TXD_cfg_func>;
pinctrl-1 = <&UART1_CTS_N_pmx_idle
&UART1_CTS_N_cfg_idle
&UART1_RTS_N_pmx_idle
&UART1_RTS_N_cfg_idle
&UART1_RXD_pmx_idle
&UART1_RXD_cfg_idle
&UART1_TXD_pmx_idle
&UART1_TXD_cfg_idle>;
pinctrl-0 = <&uart1_pmx_func
&uart1_cfg_func1 &uart1_cfg_func2>;
pinctrl-1 = <&uart1_pmx_func
&uart1_cfg_func1 &uart1_cfg_func2>; status = "ok";
Since pinctrl-0 is same with pinctrl-1, you could drop "idle" state and pinctrl-1.
Will remove it, thanks for review.
Thanks, Leo Yan