| Message ID | 20200512203524.7317-1-jbx6244@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 213f272b754f4e27aeab9d1265c775610e612bb7 |
| Headers | show |
| Series | [1/3] arm64: dts: rockchip: replace RK_FUNC defines in rk3326-odroid-go2.dts | expand |
On Tue, 12 May 2020 22:35:22 +0200, Johan Jonker wrote: > The defines RK_FUNC_1 and RK_FUNC_2 are deprecated, > so replace them with the preferred form. > Restyle properties in the same line. Applied, thanks! [1/2] arm64: dts: rockchip: replace RK_FUNC defines in rk3326-odroid-go2 commit: 213f272b754f4e27aeab9d1265c775610e612bb7 [2/2] include: dt-bindings: rockchip: remove unused defines commit: d09855bdd8c4d4eb6e58b8546318ebb5859a513c Best regards,
diff --git a/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts b/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts index fe253669b..46826b6e2 100644 --- 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>; }; }; };
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> --- arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)