arm64: dts: rockchip: replace RK_FUNC defines in rk3326-odroid-go2

The defines RK_FUNC_1 and RK_FUNC_2 are deprecated,
so replace them with the preferred form.
Restyle properties in the same line.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Link: https://lore.kernel.org/r/20200512203524.7317-1-jbx6244@gmail.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts b/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts
index cf20aac5f2fe9ad9fadb5b0be09278e7d97ed207..bd54a37738be4e28b8e792ff1d029e58aa4b1ecd 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts
@@ -543,18 +543,15 @@
                };
 
                soc_slppin_gpio: soc_slppin_gpio {
-                       rockchip,pins =
-                               <0 RK_PA4 RK_FUNC_GPIO &pcfg_output_low>;
+                       rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_output_low>;
                };
 
                soc_slppin_rst: soc_slppin_rst {
-                       rockchip,pins =
-                               <0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;
+                       rockchip,pins = <0 RK_PA4 2 &pcfg_pull_none>;
                };
 
                soc_slppin_slp: soc_slppin_slp {
-                       rockchip,pins =
-                               <0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;
+                       rockchip,pins = <0 RK_PA4 1 &pcfg_pull_none>;
                };
        };
 };