LinuxLists.cc - [PATCH 1/2] arm64: dts: rockchip: rk3399-rock-pi-4: restyle rockchip,pins

2019-10-15 21:36:06

Subject: [PATCH 1/2] arm64: dts: rockchip: rk3399-rock-pi-4: restyle rockchip,pins

The define RK_FUNC_1 is no longer used,
so restyle the rockchip,pins definitions.

Signed-off-by: Johan Jonker <[email protected]>
---
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
index 1ae1ebd4e..188d9dfc2 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
@@ -486,21 +486,18 @@

sdio0 {
sdio0_bus4: sdio0-bus4 {
- rockchip,pins =
- <2 20 RK_FUNC_1 &pcfg_pull_up_20ma>,
- <2 21 RK_FUNC_1 &pcfg_pull_up_20ma>,
- <2 22 RK_FUNC_1 &pcfg_pull_up_20ma>,
- <2 23 RK_FUNC_1 &pcfg_pull_up_20ma>;
+ rockchip,pins = <2 RK_PC4 1 &pcfg_pull_up_20ma>,
+ <2 RK_PC5 1 &pcfg_pull_up_20ma>,
+ <2 RK_PC6 1 &pcfg_pull_up_20ma>,
+ <2 RK_PC7 1 &pcfg_pull_up_20ma>;
};

sdio0_cmd: sdio0-cmd {
- rockchip,pins =
- <2 24 RK_FUNC_1 &pcfg_pull_up_20ma>;
+ rockchip,pins = <2 RK_PD0 1 &pcfg_pull_up_20ma>;
};

sdio0_clk: sdio0-clk {
- rockchip,pins =
- <2 25 RK_FUNC_1 &pcfg_pull_none_20ma>;
+ rockchip,pins = <2 RK_PD1 1 &pcfg_pull_none_20ma>;
};
};

@@ -532,8 +529,7 @@

wifi {
wifi_enable_h: wifi-enable-h {
- rockchip,pins =
- <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
+ rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
};

wifi_host_wake_l: wifi-host-wake-l {
--
2.11.0

2019-10-15 21:36:23

by Johan Jonker

[permalink] [raw]

Subject: [PATCH 2/2] include: dt-bindings: rockchip: remove RK_FUNC defines

The defines RK_FUNC_1, RK_FUNC_2, RK_FUNC_3 and RK_FUNC_4
are no longer used, so remove them to prevent
that someone start using them again.

Signed-off-by: Johan Jonker <[email protected]>
---
include/dt-bindings/pinctrl/rockchip.h | 4 ----
1 file changed, 4 deletions(-)

diff --git a/include/dt-bindings/pinctrl/rockchip.h b/include/dt-bindings/pinctrl/rockchip.h
index dc5c1c73d..2798b6c03 100644
--- a/include/dt-bindings/pinctrl/rockchip.h
+++ b/include/dt-bindings/pinctrl/rockchip.h
@@ -50,9 +50,5 @@
#define RK_PD7 31

#define RK_FUNC_GPIO 0
-#define RK_FUNC_1 1
-#define RK_FUNC_2 2
-#define RK_FUNC_3 3
-#define RK_FUNC_4 4

#endif
--
2.11.0

2019-10-16 03:36:26

by Heiko Stuebner

[permalink] [raw]

Subject: Re: [PATCH 2/2] include: dt-bindings: rockchip: remove RK_FUNC defines

Hi Johan,

Am Dienstag, 15. Oktober 2019, 21:10:00 CEST schrieb Johan Jonker:
> The defines RK_FUNC_1, RK_FUNC_2, RK_FUNC_3 and RK_FUNC_4
> are no longer used, so remove them to prevent
> that someone start using them again.

That won't work. Devicetree provides a slightly flexible promise of
backwards compatibilty. So a new kernel should still work old devicetrees.
(not exactly sure if this means dt-binaries and sources or only binaries)

So while I think RK_FUNC_0-n should not be used anymore, we should
probably just mark them as "deprecated" in a first step.

Heiko

> Signed-off-by: Johan Jonker <[email protected]>
> ---
> include/dt-bindings/pinctrl/rockchip.h | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/include/dt-bindings/pinctrl/rockchip.h b/include/dt-bindings/pinctrl/rockchip.h
> index dc5c1c73d..2798b6c03 100644
> --- a/include/dt-bindings/pinctrl/rockchip.h
> +++ b/include/dt-bindings/pinctrl/rockchip.h
> @@ -50,9 +50,5 @@
> #define RK_PD7 31
>
> #define RK_FUNC_GPIO 0
> -#define RK_FUNC_1 1
> -#define RK_FUNC_2 2
> -#define RK_FUNC_3 3
> -#define RK_FUNC_4 4
>
> #endif
>

2019-10-16 03:42:11

by Johan Jonker

[permalink] [raw]

Subject: Re: [PATCH 2/2] include: dt-bindings: rockchip: remove RK_FUNC defines

Hi Heiko,

What's the plan for RK_FUNC_GPIO ? Change all to '0' or keep it?

On 10/15/19 10:10 PM, Heiko Stuebner wrote:
> Hi Johan,
>
> Am Dienstag, 15. Oktober 2019, 21:10:00 CEST schrieb Johan Jonker:
>> The defines RK_FUNC_1, RK_FUNC_2, RK_FUNC_3 and RK_FUNC_4
>> are no longer used, so remove them to prevent
>> that someone start using them again.
>
> That won't work. Devicetree provides a slightly flexible promise of
> backwards compatibilty. So a new kernel should still work old devicetrees.
> (not exactly sure if this means dt-binaries and sources or only binaries)
>
> So while I think RK_FUNC_0-n should not be used anymore, we should
> probably just mark them as "deprecated" in a first step.
>
>
> Heiko

2019-10-16 03:45:30

by Heiko Stuebner

[permalink] [raw]

Subject: Re: [PATCH 2/2] include: dt-bindings: rockchip: remove RK_FUNC defines

Am Dienstag, 15. Oktober 2019, 22:26:14 CEST schrieb Johan Jonker:
> Hi Heiko,
>
> What's the plan for RK_FUNC_GPIO ? Change all to '0' or keep it?

RK_FUNC_GPIO I'd like to keep :-) .

Basic rationale is that mapping RK_FUNC_1 -> 1, RK_FUNC_2 -> 2, etc does
not provide any additional value, while telling it explicitly that we're
mapping to the gpio function does.

Heiko

>
> On 10/15/19 10:10 PM, Heiko Stuebner wrote:
> > Hi Johan,
> >
> > Am Dienstag, 15. Oktober 2019, 21:10:00 CEST schrieb Johan Jonker:
> >> The defines RK_FUNC_1, RK_FUNC_2, RK_FUNC_3 and RK_FUNC_4
> >> are no longer used, so remove them to prevent
> >> that someone start using them again.
> >
> > That won't work. Devicetree provides a slightly flexible promise of
> > backwards compatibilty. So a new kernel should still work old devicetrees.
> > (not exactly sure if this means dt-binaries and sources or only binaries)
> >
> > So while I think RK_FUNC_0-n should not be used anymore, we should
> > probably just mark them as "deprecated" in a first step.
> >
> >
> > Heiko
>
>

2019-10-16 03:55:45

by Johan Jonker

[permalink] [raw]

Subject: [PATCH v2 1/2] arm64: dts: rockchip: rk3399-rock-pi-4: restyle rockchip,pins

2019-10-16 03:55:51

by Johan Jonker

[permalink] [raw]

Subject: [PATCH v2 2/2] include: dt-bindings: rockchip: mark RK_FUNC defines as deprecated

The defines RK_FUNC_1, RK_FUNC_2, RK_FUNC_3 and RK_FUNC_4
are no longer used. Mark them as "deprecated"
to prevent that someone start using them again.

Signed-off-by: Johan Jonker <[email protected]>
---
include/dt-bindings/pinctrl/rockchip.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/dt-bindings/pinctrl/rockchip.h b/include/dt-bindings/pinctrl/rockchip.h
index dc5c1c73d..6d6bac1c2 100644
--- a/include/dt-bindings/pinctrl/rockchip.h
+++ b/include/dt-bindings/pinctrl/rockchip.h
@@ -50,9 +50,9 @@
#define RK_PD7 31

#define RK_FUNC_GPIO 0
-#define RK_FUNC_1 1
-#define RK_FUNC_2 2
-#define RK_FUNC_3 3
-#define RK_FUNC_4 4
+#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
--
2.11.0

2019-10-17 12:58:28

by Heiko Stuebner

[permalink] [raw]

Subject: Re: [PATCH v2 1/2] arm64: dts: rockchip: rk3399-rock-pi-4: restyle rockchip,pins

Am Dienstag, 15. Oktober 2019, 22:58:51 CEST schrieb Johan Jonker:
> The define RK_FUNC_1 is no longer used,
> so restyle the rockchip,pins definitions.
>
> Signed-off-by: Johan Jonker <[email protected]>

applied both for 5.5

Thanks
Heiko