[v2,6/6] arm64: dts: berlin4ct: add default pinmux for uart0
diff mbox

Message ID 1442829860-4647-7-git-send-email-jszhang@marvell.com
State New
Headers show

Commit Message

Jisheng Zhang Sept. 21, 2015, 10:04 a.m. UTC
Add urt0 txd and rxd muxing setup in the dtsi because uart0 always uses
them to work, no other possibilities.

Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
---
 arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Antoine Tenart Oct. 2, 2015, 1:26 p.m. UTC | #1
Jisheng,

Please s/urt/uart/ in this patch.

Thanks!

Antoine

On Mon, Sep 21, 2015 at 06:04:20PM +0800, Jisheng Zhang wrote:
> Add urt0 txd and rxd muxing setup in the dtsi because uart0 always uses
> them to work, no other possibilities.
> 
> Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
> ---
>  arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/marvell/berlin4ct.dtsi b/arch/arm64/boot/dts/marvell/berlin4ct.dtsi
> index c374f1d..e9409ec 100644
> --- a/arch/arm64/boot/dts/marvell/berlin4ct.dtsi
> +++ b/arch/arm64/boot/dts/marvell/berlin4ct.dtsi
> @@ -288,12 +288,19 @@
>  				clocks = <&osc>;
>  				reg-shift = <2>;
>  				status = "disabled";
> +				pinctrl-0 = <&urt0_pmux>;
> +				pinctrl-names = "default";
>  			};
>  		};
>  
>  		sm_pinctrl: pinctrl@fe2200 {
>  			compatible = "marvell,berlin4ct-sm-pinctrl";
>  			reg = <0xfe2200 0xc>;
> +
> +			urt0_pmux: urt0-pmux {
> +				groups = "SM_URT0_TXD", "SM_URT0_RXD";
> +				function = "urt0";
> +			};
>  		};
>  	};
>  };
> -- 
> 2.5.3
>

Patch
diff mbox

diff --git a/arch/arm64/boot/dts/marvell/berlin4ct.dtsi b/arch/arm64/boot/dts/marvell/berlin4ct.dtsi
index c374f1d..e9409ec 100644
--- a/arch/arm64/boot/dts/marvell/berlin4ct.dtsi
+++ b/arch/arm64/boot/dts/marvell/berlin4ct.dtsi
@@ -288,12 +288,19 @@ 
 				clocks = <&osc>;
 				reg-shift = <2>;
 				status = "disabled";
+				pinctrl-0 = <&urt0_pmux>;
+				pinctrl-names = "default";
 			};
 		};
 
 		sm_pinctrl: pinctrl@fe2200 {
 			compatible = "marvell,berlin4ct-sm-pinctrl";
 			reg = <0xfe2200 0xc>;
+
+			urt0_pmux: urt0-pmux {
+				groups = "SM_URT0_TXD", "SM_URT0_RXD";
+				function = "urt0";
+			};
 		};
 	};
 };