diff options
| author | Rob Herring <robh@kernel.org> | 2014-05-13 19:34:35 -0400 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2014-05-13 19:34:35 -0400 |
| commit | eafd370dfe487facfdef499057f4eac9aa0b4bf5 (patch) | |
| tree | 0925a67cd658cdf4811f49b4cd2073f663166bd0 /arch/arm/boot/dts/rk3188.dtsi | |
| parent | c3fc952d2fbe3ec78defd70cf73d5d76d27092ec (diff) | |
| parent | fb2caa50fbacd21719a90dd66b617ce3cb4fd6d7 (diff) | |
Merge branch 'dt-bus-name' into for-next
Diffstat (limited to 'arch/arm/boot/dts/rk3188.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/rk3188.dtsi | 8 |
1 files changed, 4 insertions, 4 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 @@ | |||
| 149 | 149 | ||
| 150 | uart0 { | 150 | uart0 { |
| 151 | uart0_xfer: uart0-xfer { | 151 | uart0_xfer: uart0-xfer { |
| 152 | rockchip,pins = <RK_GPIO1 0 RK_FUNC_1 &pcfg_pull_none>, | 152 | rockchip,pins = <RK_GPIO1 0 RK_FUNC_1 &pcfg_pull_up>, |
| 153 | <RK_GPIO1 1 RK_FUNC_1 &pcfg_pull_none>; | 153 | <RK_GPIO1 1 RK_FUNC_1 &pcfg_pull_none>; |
| 154 | }; | 154 | }; |
| 155 | 155 | ||
| @@ -164,7 +164,7 @@ | |||
| 164 | 164 | ||
| 165 | uart1 { | 165 | uart1 { |
| 166 | uart1_xfer: uart1-xfer { | 166 | uart1_xfer: uart1-xfer { |
| 167 | rockchip,pins = <RK_GPIO1 4 RK_FUNC_1 &pcfg_pull_none>, | 167 | rockchip,pins = <RK_GPIO1 4 RK_FUNC_1 &pcfg_pull_up>, |
| 168 | <RK_GPIO1 5 RK_FUNC_1 &pcfg_pull_none>; | 168 | <RK_GPIO1 5 RK_FUNC_1 &pcfg_pull_none>; |
| 169 | }; | 169 | }; |
| 170 | 170 | ||
| @@ -179,7 +179,7 @@ | |||
| 179 | 179 | ||
| 180 | uart2 { | 180 | uart2 { |
| 181 | uart2_xfer: uart2-xfer { | 181 | uart2_xfer: uart2-xfer { |
| 182 | rockchip,pins = <RK_GPIO1 8 RK_FUNC_1 &pcfg_pull_none>, | 182 | rockchip,pins = <RK_GPIO1 8 RK_FUNC_1 &pcfg_pull_up>, |
| 183 | <RK_GPIO1 9 RK_FUNC_1 &pcfg_pull_none>; | 183 | <RK_GPIO1 9 RK_FUNC_1 &pcfg_pull_none>; |
| 184 | }; | 184 | }; |
| 185 | /* no rts / cts for uart2 */ | 185 | /* no rts / cts for uart2 */ |
| @@ -187,7 +187,7 @@ | |||
| 187 | 187 | ||
| 188 | uart3 { | 188 | uart3 { |
| 189 | uart3_xfer: uart3-xfer { | 189 | uart3_xfer: uart3-xfer { |
| 190 | rockchip,pins = <RK_GPIO1 10 RK_FUNC_1 &pcfg_pull_none>, | 190 | rockchip,pins = <RK_GPIO1 10 RK_FUNC_1 &pcfg_pull_up>, |
| 191 | <RK_GPIO1 11 RK_FUNC_1 &pcfg_pull_none>; | 191 | <RK_GPIO1 11 RK_FUNC_1 &pcfg_pull_none>; |
| 192 | }; | 192 | }; |
| 193 | 193 | ||