diff options
| author | Tom Rini <[email protected]> | 2020-03-26 21:39:59 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-03-26 21:39:59 -0400 |
| commit | fa041198a803f5ee44362a32431ce7373f5f4ae5 (patch) | |
| tree | 3194e75991e35b5fa8cbbc6f87946903065c01c5 /arch | |
| parent | af827140e5965e5bb2bcad1c53ca8419b428ff6d (diff) | |
| parent | e5a405583f5ce9576c5084a178622e2fdd49cb23 (diff) | |
Merge tag 'u-boot-rockchip-20200327' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- Fixed for rv1108 and elgin-rv1108 board
- Fix the keyboard from USB instead of CrOS EC
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/rv1108-elgin-r1.dts | 11 | ||||
| -rw-r--r-- | arch/arm/dts/rv1108-u-boot.dtsi | 6 |
2 files changed, 17 insertions, 0 deletions
diff --git a/arch/arm/dts/rv1108-elgin-r1.dts b/arch/arm/dts/rv1108-elgin-r1.dts index 32b95940b07..83e8b318384 100644 --- a/arch/arm/dts/rv1108-elgin-r1.dts +++ b/arch/arm/dts/rv1108-elgin-r1.dts @@ -40,9 +40,20 @@ }; &uart2 { + pinctrl-names = "default"; + pinctrl-0 = <&uart2m0_xfer_pullup>; status = "okay"; }; &usb20_otg { status = "okay"; }; + +&pinctrl { + uart2m0 { + uart2m0_xfer_pullup: uart2m0-xfer-pullup { + rockchip,pins = <2 RK_PD2 RK_FUNC_1 &pcfg_pull_up_drv_8ma>, + <2 RK_PD1 RK_FUNC_1 &pcfg_pull_up_drv_8ma>; + }; + }; +}; diff --git a/arch/arm/dts/rv1108-u-boot.dtsi b/arch/arm/dts/rv1108-u-boot.dtsi new file mode 100644 index 00000000000..41ac054b81e --- /dev/null +++ b/arch/arm/dts/rv1108-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki <[email protected]> + */ + +#include "rockchip-u-boot.dtsi" |