Skip to content

Commit 68556dd

Browse files
acgzxmmind
authored andcommitted
ARM: dts: rockchip: fix the pinctrl bias settings for rk3036
The pinctrl gpio pull up/down is incorrect since the rk3036 SoCs can't set the status in the internal. We should keep the default status for enable the gpio status, In fact, the pull_none is the disable the gpio pull up/down. Signed-off-by: Xing Zheng <[email protected]> Signed-off-by: Caesar Wang <[email protected]> Reviewed-by: Kees Cook <[email protected]> Signed-off-by: Heiko Stuebner <[email protected]>
1 parent 4b0d98a commit 68556dd

File tree

1 file changed

+15
-19
lines changed

1 file changed

+15
-19
lines changed

arch/arm/boot/dts/rk3036.dtsi

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -427,12 +427,8 @@
427427
#interrupt-cells = <2>;
428428
};
429429

430-
pcfg_pull_up: pcfg-pull-up {
431-
bias-pull-up;
432-
};
433-
434-
pcfg_pull_down: pcfg-pull-down {
435-
bias-pull-down;
430+
pcfg_pull_default: pcfg_pull_default {
431+
bias-pull-pin-default;
436432
};
437433

438434
pcfg_pull_none: pcfg-pull-none {
@@ -473,18 +469,18 @@
473469
};
474470

475471
emmc_cmd: emmc-cmd {
476-
rockchip,pins = <2 1 RK_FUNC_2 &pcfg_pull_none>;
472+
rockchip,pins = <2 1 RK_FUNC_2 &pcfg_pull_default>;
477473
};
478474

479475
emmc_bus8: emmc-bus8 {
480-
rockchip,pins = <1 24 RK_FUNC_2 &pcfg_pull_none>,
481-
<1 25 RK_FUNC_2 &pcfg_pull_none>,
482-
<1 26 RK_FUNC_2 &pcfg_pull_none>,
483-
<1 27 RK_FUNC_2 &pcfg_pull_none>,
484-
<1 28 RK_FUNC_2 &pcfg_pull_none>,
485-
<1 29 RK_FUNC_2 &pcfg_pull_none>,
486-
<1 30 RK_FUNC_2 &pcfg_pull_none>,
487-
<1 31 RK_FUNC_2 &pcfg_pull_none>;
476+
rockchip,pins = <1 24 RK_FUNC_2 &pcfg_pull_default>,
477+
<1 25 RK_FUNC_2 &pcfg_pull_default>,
478+
<1 26 RK_FUNC_2 &pcfg_pull_default>,
479+
<1 27 RK_FUNC_2 &pcfg_pull_default>,
480+
<1 28 RK_FUNC_2 &pcfg_pull_default>,
481+
<1 29 RK_FUNC_2 &pcfg_pull_default>,
482+
<1 30 RK_FUNC_2 &pcfg_pull_default>,
483+
<1 31 RK_FUNC_2 &pcfg_pull_default>;
488484
};
489485
};
490486

@@ -522,12 +518,12 @@
522518

523519
uart0 {
524520
uart0_xfer: uart0-xfer {
525-
rockchip,pins = <0 16 RK_FUNC_1 &pcfg_pull_up>,
521+
rockchip,pins = <0 16 RK_FUNC_1 &pcfg_pull_default>,
526522
<0 17 RK_FUNC_1 &pcfg_pull_none>;
527523
};
528524

529525
uart0_cts: uart0-cts {
530-
rockchip,pins = <0 18 RK_FUNC_1 &pcfg_pull_up>;
526+
rockchip,pins = <0 18 RK_FUNC_1 &pcfg_pull_default>;
531527
};
532528

533529
uart0_rts: uart0-rts {
@@ -537,15 +533,15 @@
537533

538534
uart1 {
539535
uart1_xfer: uart1-xfer {
540-
rockchip,pins = <2 22 RK_FUNC_1 &pcfg_pull_none>,
536+
rockchip,pins = <2 22 RK_FUNC_1 &pcfg_pull_default>,
541537
<2 23 RK_FUNC_1 &pcfg_pull_none>;
542538
};
543539
/* no rts / cts for uart1 */
544540
};
545541

546542
uart2 {
547543
uart2_xfer: uart2-xfer {
548-
rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_none>,
544+
rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_default>,
549545
<1 19 RK_FUNC_2 &pcfg_pull_none>;
550546
};
551547
/* no rts / cts for uart2 */

0 commit comments

Comments
 (0)