diff options
author | Olof Johansson <olof@lixom.net> | 2019-04-28 23:00:33 +0300 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2019-04-28 23:00:33 +0300 |
commit | b726e211b903a17dd03b15fffe4796f565e02992 (patch) | |
tree | 5cdf95603230feffa8ed9f87a96158cb5d9a929c /arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | |
parent | bcb84a1097ca5fc54d14f923d659eb21ffd38490 (diff) | |
parent | 798689e45190756c2eca6656ee4c624370a5012a (diff) | |
download | linux-b726e211b903a17dd03b15fffe4796f565e02992.tar.xz |
Merge tag 'v5.2-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt
Bulk conversion of remaining gpios to the helper constants, new peripherals
for the rk3328-roc-cc and some minor fixes for rk3399 and rockpro64.
* tag 'v5.2-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
arm64: dts: rockchip: fix IO domain voltage setting of APIO5 on rockpro64
arm64: dts: rockchip: fix cts, rts pin assign of UART3 for rk3399
arm64: dts: rockchip: bulk convert gpios to their constant counterparts
arm64: dts: rockchip: enable display nodes on rk3328-roc-cc
arm64: dts: rockchip: eMMC additions for rk3328-roc-cc
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi')
-rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi index 12f24d1eea81..62ea288a1a70 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi @@ -412,10 +412,10 @@ */ &i2s0_2ch_bus { rockchip,pins = - <RK_GPIO3 RK_PD0 RK_FUNC_1 &pcfg_pull_none>, - <RK_GPIO3 RK_PD2 RK_FUNC_1 &pcfg_pull_none>, - <RK_GPIO3 RK_PD3 RK_FUNC_1 &pcfg_pull_none>, - <RK_GPIO3 RK_PD7 RK_FUNC_1 &pcfg_pull_none>; + <3 RK_PD0 1 &pcfg_pull_none>, + <3 RK_PD2 1 &pcfg_pull_none>, + <3 RK_PD3 1 &pcfg_pull_none>, + <3 RK_PD7 1 &pcfg_pull_none>; }; &io_domains { @@ -439,29 +439,29 @@ i2c8 { i2c8_xfer_a: i2c8-xfer { rockchip,pins = - <RK_GPIO1 RK_PC4 RK_FUNC_1 &pcfg_pull_up>, - <RK_GPIO1 RK_PC5 RK_FUNC_1 &pcfg_pull_up>; + <1 RK_PC4 1 &pcfg_pull_up>, + <1 RK_PC5 1 &pcfg_pull_up>; }; }; leds { led_pin_module: led-module-gpio { rockchip,pins = - <RK_GPIO2 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>; + <2 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>; }; }; pmic { pmic_int_l: pmic-int-l { rockchip,pins = - <RK_GPIO1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>; + <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>; }; }; usb2 { vcc5v0_host_en: vcc5v0-host-en { rockchip,pins = - <RK_GPIO4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; + <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; }; }; }; |