| Message ID | 20241008105450.20648-3-didi.debian@cknow.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Drop deprecated 'rockchip' prefix from s-p-c PMIC property | expand |
Hello Diederik, On 2024-10-08 12:48, Diederik de Haas wrote: > Property 'rockchip,system-power-controller' was deprecated in commit > 961748bb1555 ("dt-bindings: mfd: rk8xx: Deprecate > rockchip,system-power-controller") > > in the "rockchip,rk{805,808,809,817,818}.yaml" mtd bindings and its > replacement is (just) 'system-power-controller'. > > Update the rk3328 DT files which still used the deprecated variant. > > Signed-off-by: Diederik de Haas <didi.debian@cknow.org> This patch is looking good to me, all changes introduced to the board dts files are fine and pretty much straightforward. Thanks for this patch, and please feel free to include: Reviewed-by: Dragan Simic <dsimic@manjaro.org> See also a related rk8xx MFD patch that I just submitted. [1] It builds upon the changes you introduced and helps with saving a few CPU cycles while probing. [1] https://lore.kernel.org/linux-rockchip/08d4e88974c205eba124086ce156622e2e4cdc20.1728397516.git.dsimic@manjaro.org/T/#u > --- > changes in v2: > - rephrased commit message a bit > > arch/arm64/boot/dts/rockchip/rk3328-a1.dts | 2 +- > arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 2 +- > arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts | 2 +- > arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts | 2 +- > arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 2 +- > arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts | 2 +- > arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 2 +- > 7 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/arch/arm64/boot/dts/rockchip/rk3328-a1.dts > b/arch/arm64/boot/dts/rockchip/rk3328-a1.dts > index 824183e515da..9406a887652d 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3328-a1.dts > +++ b/arch/arm64/boot/dts/rockchip/rk3328-a1.dts > @@ -159,7 +159,7 @@ pmic@18 { > interrupts = <RK_PA6 IRQ_TYPE_LEVEL_LOW>; > pinctrl-names = "default"; > pinctrl-0 = <&pmic_int_l>; > - rockchip,system-power-controller; > + system-power-controller; > wakeup-source; > #clock-cells = <0>; > > diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts > b/arch/arm64/boot/dts/rockchip/rk3328-evb.dts > index 1eef5504445f..12a4e421ec95 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts > +++ b/arch/arm64/boot/dts/rockchip/rk3328-evb.dts > @@ -121,7 +121,7 @@ rk805: pmic@18 { > #gpio-cells = <2>; > pinctrl-names = "default"; > pinctrl-0 = <&pmic_int_l>; > - rockchip,system-power-controller; > + system-power-controller; > wakeup-source; > > vcc1-supply = <&vcc_sys>; > diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts > b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts > index a4399da7d8b1..a10847509bfe 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts > +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts > @@ -181,7 +181,7 @@ rk805: pmic@18 { > #gpio-cells = <2>; > pinctrl-0 = <&pmic_int_l>; > pinctrl-names = "default"; > - rockchip,system-power-controller; > + system-power-controller; > wakeup-source; > > vcc1-supply = <&vdd_5v>; > diff --git a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts > b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts > index f20662929c77..99499a0bab19 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts > +++ b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts > @@ -152,7 +152,7 @@ rk805: pmic@18 { > #gpio-cells = <2>; > pinctrl-0 = <&pmic_int_l>; > pinctrl-names = "default"; > - rockchip,system-power-controller; > + system-power-controller; > wakeup-source; > > vcc1-supply = <&vcc_sys>; > diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts > b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts > index 414897a57e75..88bb95075b6f 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts > +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts > @@ -191,7 +191,7 @@ rk805: pmic@18 { > #gpio-cells = <2>; > pinctrl-names = "default"; > pinctrl-0 = <&pmic_int_l>; > - rockchip,system-power-controller; > + system-power-controller; > wakeup-source; > > vcc1-supply = <&vcc_sys>; > diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts > b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts > index 3e08e2fd0a78..905ef4b94095 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts > +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts > @@ -249,7 +249,7 @@ rk805: pmic@18 { > #gpio-cells = <2>; > pinctrl-names = "default"; > pinctrl-0 = <&pmic_int_l>; > - rockchip,system-power-controller; > + system-power-controller; > wakeup-source; > > vcc1-supply = <&vcc_sys>; > diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts > b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts > index 90fef766f3ae..7d179aae8d24 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts > +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts > @@ -181,7 +181,7 @@ rk805: pmic@18 { > #gpio-cells = <2>; > pinctrl-names = "default"; > pinctrl-0 = <&pmic_int_l>; > - rockchip,system-power-controller; > + system-power-controller; > wakeup-source; > > vcc1-supply = <&vcc_sys>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-a1.dts b/arch/arm64/boot/dts/rockchip/rk3328-a1.dts index 824183e515da..9406a887652d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-a1.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-a1.dts @@ -159,7 +159,7 @@ pmic@18 { interrupts = <RK_PA6 IRQ_TYPE_LEVEL_LOW>; pinctrl-names = "default"; pinctrl-0 = <&pmic_int_l>; - rockchip,system-power-controller; + system-power-controller; wakeup-source; #clock-cells = <0>; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts b/arch/arm64/boot/dts/rockchip/rk3328-evb.dts index 1eef5504445f..12a4e421ec95 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-evb.dts @@ -121,7 +121,7 @@ rk805: pmic@18 { #gpio-cells = <2>; pinctrl-names = "default"; pinctrl-0 = <&pmic_int_l>; - rockchip,system-power-controller; + system-power-controller; wakeup-source; vcc1-supply = <&vcc_sys>; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts index a4399da7d8b1..a10847509bfe 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts @@ -181,7 +181,7 @@ rk805: pmic@18 { #gpio-cells = <2>; pinctrl-0 = <&pmic_int_l>; pinctrl-names = "default"; - rockchip,system-power-controller; + system-power-controller; wakeup-source; vcc1-supply = <&vdd_5v>; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts index f20662929c77..99499a0bab19 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts @@ -152,7 +152,7 @@ rk805: pmic@18 { #gpio-cells = <2>; pinctrl-0 = <&pmic_int_l>; pinctrl-names = "default"; - rockchip,system-power-controller; + system-power-controller; wakeup-source; vcc1-supply = <&vcc_sys>; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts index 414897a57e75..88bb95075b6f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts @@ -191,7 +191,7 @@ rk805: pmic@18 { #gpio-cells = <2>; pinctrl-names = "default"; pinctrl-0 = <&pmic_int_l>; - rockchip,system-power-controller; + system-power-controller; wakeup-source; vcc1-supply = <&vcc_sys>; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts index 3e08e2fd0a78..905ef4b94095 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts @@ -249,7 +249,7 @@ rk805: pmic@18 { #gpio-cells = <2>; pinctrl-names = "default"; pinctrl-0 = <&pmic_int_l>; - rockchip,system-power-controller; + system-power-controller; wakeup-source; vcc1-supply = <&vcc_sys>; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts index 90fef766f3ae..7d179aae8d24 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts @@ -181,7 +181,7 @@ rk805: pmic@18 { #gpio-cells = <2>; pinctrl-names = "default"; pinctrl-0 = <&pmic_int_l>; - rockchip,system-power-controller; + system-power-controller; wakeup-source; vcc1-supply = <&vcc_sys>;
Property 'rockchip,system-power-controller' was deprecated in commit 961748bb1555 ("dt-bindings: mfd: rk8xx: Deprecate rockchip,system-power-controller") in the "rockchip,rk{805,808,809,817,818}.yaml" mtd bindings and its replacement is (just) 'system-power-controller'. Update the rk3328 DT files which still used the deprecated variant. Signed-off-by: Diederik de Haas <didi.debian@cknow.org> --- changes in v2: - rephrased commit message a bit arch/arm64/boot/dts/rockchip/rk3328-a1.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-)