arm64: dts: hi6220: add pinctrl for uarts and enable them

Add pinctrl for uart2 uart3 and uart4. Enable uart1 uart2 and uart3.

Signed-off-by: Guodong Xu <guodong.xu@linaro.org>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>

diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
index 3dbf51b609a16cfc4fceecacbbdd8b82b3621e59..30c92bd0855face8084811561597a557346e6bae 100644 (file)
--- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
@@ -53,6 +53,18 @@ i2c0: i2c@f7100000 {
                i2c1: i2c@f7101000 {
                        status = "ok";
                };
+
+               uart1: uart@f7111000 {
+                       status = "ok";
+               };
+
+               uart2: uart@f7112000 {
+                       status = "ok";
+               };
+
+               uart3: uart@f7113000 {
+                       status = "ok";
+               };
        };
 };
 

diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
index 3a665efd197ba8dca01789cf405428e25244caa8..e8bb81fe8479d5c746c193335c2ea4edcfa876a2 100644 (file)
--- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
@@ -266,6 +266,8 @@ uart1: uart@f7111000 {
                        clocks = <&sys_ctrl HI6220_UART1_PCLK>,
                                 <&sys_ctrl HI6220_UART1_PCLK>;
                        clock-names = "uartclk", "apb_pclk";
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&uart1_pmx_func &uart1_cfg_func1 &uart1_cfg_func2>;
                        status = "disabled";
                };
 
@@ -276,6 +278,8 @@ uart2: uart@f7112000 {
                        clocks = <&sys_ctrl HI6220_UART2_PCLK>,
                                 <&sys_ctrl HI6220_UART2_PCLK>;
                        clock-names = "uartclk", "apb_pclk";
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&uart2_pmx_func &uart2_cfg_func>;
                        status = "disabled";
                };
 
@@ -286,6 +290,9 @@ uart3: uart@f7113000 {
                        clocks = <&sys_ctrl HI6220_UART3_PCLK>,
                                 <&sys_ctrl HI6220_UART3_PCLK>;
                        clock-names = "uartclk", "apb_pclk";
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&uart3_pmx_func &uart3_cfg_func>;
+                       status = "disabled";
                };
 
                uart4: uart@f7114000 {
@@ -295,6 +302,8 @@ uart4: uart@f7114000 {
                        clocks = <&sys_ctrl HI6220_UART4_PCLK>,
                                 <&sys_ctrl HI6220_UART4_PCLK>;
                        clock-names = "uartclk", "apb_pclk";
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&uart4_pmx_func &uart4_cfg_func>;
                        status = "disabled";
                };