| Message ID | 20200512203524.7317-3-jbx6244@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | d09855bdd8c4d4eb6e58b8546318ebb5859a513c |
| Headers | show |
| Series | [1/3] arm64: dts: rockchip: replace RK_FUNC defines in rk3326-odroid-go2.dts | expand |
On Tue, May 12, 2020 at 10:35 PM Johan Jonker <jbx6244@gmail.com> wrote: > The Rockchip dtsi and dts files have been bulk-converted for the > remaining raw gpio numbers into their descriptive counterparts and > also got rid of the unhelpful RK_FUNC_x -> x and RK_GPIOx -> x > mappings, so remove the unused defines in 'rockchip.h' to prevent > that someone start using them again. > > Signed-off-by: Johan Jonker <jbx6244@gmail.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> I think patch 1 & 3 needs to be applied to the Rockchip tree. Yours, Linus Walleij
diff --git a/include/dt-bindings/pinctrl/rockchip.h b/include/dt-bindings/pinctrl/rockchip.h index 6d6bac1c2..5f291045e 100644 --- a/include/dt-bindings/pinctrl/rockchip.h +++ b/include/dt-bindings/pinctrl/rockchip.h @@ -9,13 +9,6 @@ #ifndef __DT_BINDINGS_ROCKCHIP_PINCTRL_H__ #define __DT_BINDINGS_ROCKCHIP_PINCTRL_H__ -#define RK_GPIO0 0 -#define RK_GPIO1 1 -#define RK_GPIO2 2 -#define RK_GPIO3 3 -#define RK_GPIO4 4 -#define RK_GPIO6 6 - #define RK_PA0 0 #define RK_PA1 1 #define RK_PA2 2 @@ -50,9 +43,5 @@ #define RK_PD7 31 #define RK_FUNC_GPIO 0 -#define RK_FUNC_1 1 /* deprecated */ -#define RK_FUNC_2 2 /* deprecated */ -#define RK_FUNC_3 3 /* deprecated */ -#define RK_FUNC_4 4 /* deprecated */ #endif
The Rockchip dtsi and dts files have been bulk-converted for the remaining raw gpio numbers into their descriptive counterparts and also got rid of the unhelpful RK_FUNC_x -> x and RK_GPIOx -> x mappings, so remove the unused defines in 'rockchip.h' to prevent that someone start using them again. Signed-off-by: Johan Jonker <jbx6244@gmail.com> --- include/dt-bindings/pinctrl/rockchip.h | 11 ----------- 1 file changed, 11 deletions(-)