2 files changed, 5 insertions, 5 deletions

diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
index bb36596ea205..ed9a70af3e3f 100644
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@ -149,7 +149,7 @@
 
                         uart0 {
                                 uart0_xfer: uart0-xfer {
-                                        rockchip,pins = <RK_GPIO1 0 RK_FUNC_1 &pcfg_pull_none>,
+                                        rockchip,pins = <RK_GPIO1 0 RK_FUNC_1 &pcfg_pull_up>,
                                                         <RK_GPIO1 1 RK_FUNC_1 &pcfg_pull_none>;
                                 };
 
@@ -164,7 +164,7 @@
 
                         uart1 {
                                 uart1_xfer: uart1-xfer {
-                                        rockchip,pins = <RK_GPIO1 4 RK_FUNC_1 &pcfg_pull_none>,
+                                        rockchip,pins = <RK_GPIO1 4 RK_FUNC_1 &pcfg_pull_up>,
                                                         <RK_GPIO1 5 RK_FUNC_1 &pcfg_pull_none>;
                                 };
 
@@ -179,7 +179,7 @@
 
                         uart2 {
                                 uart2_xfer: uart2-xfer {
-                                        rockchip,pins = <RK_GPIO1 8 RK_FUNC_1 &pcfg_pull_none>,
+                                        rockchip,pins = <RK_GPIO1 8 RK_FUNC_1 &pcfg_pull_up>,
                                                         <RK_GPIO1 9 RK_FUNC_1 &pcfg_pull_none>;
                                 };
                                 /* no rts / cts for uart2 */
@@ -187,7 +187,7 @@
 
                         uart3 {
                                 uart3_xfer: uart3-xfer {
-                                        rockchip,pins = <RK_GPIO1 10 RK_FUNC_1 &pcfg_pull_none>,
+                                        rockchip,pins = <RK_GPIO1 10 RK_FUNC_1 &pcfg_pull_up>,
                                                         <RK_GPIO1 11 RK_FUNC_1 &pcfg_pull_none>;
                                 };
 
diff --git a/arch/arm/mach-rockchip/platsmp.c b/arch/arm/mach-rockchip/platsmp.c
index dbfa5a26cfff..072842f6491b 100644
--- a/arch/arm/mach-rockchip/platsmp.c
+++ b/arch/arm/mach-rockchip/platsmp.c
@@ -152,7 +152,7 @@ static void __init rockchip_smp_prepare_cpus(unsigned int max_cpus)
 
         node = of_find_compatible_node(NULL, NULL, "rockchip,rk3066-pmu");
         if (!node) {
-                pr_err("%s: could not find sram dt node\n", __func__);
+                pr_err("%s: could not find pmu dt node\n", __func__);
                 return;
         }