| Message ID | 20200512203524.7317-2-jbx6244@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 5d590738521e25b183172c32aab6ee71b9366dca |
| 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 update the example as well. > > Signed-off-by: Johan Jonker <jbx6244@gmail.com> This patch applied to the pinctrl tree. Yours, Linus Walleij
diff --git a/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt index 2113cfaa2..d3eae61a3 100644 --- a/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt @@ -110,8 +110,8 @@ pinctrl@20008000 { uart2 { uart2_xfer: uart2-xfer { - rockchip,pins = <RK_GPIO1 8 1 &pcfg_pull_default>, - <RK_GPIO1 9 1 &pcfg_pull_default>; + rockchip,pins = <1 RK_PB0 1 &pcfg_pull_default>, + <1 RK_PB1 1 &pcfg_pull_default>; }; }; };
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 update the example as well. Signed-off-by: Johan Jonker <jbx6244@gmail.com> --- Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)