2021-07-11 15:00:25

by Johan Jonker

Subject: [PATCH] arm64: dts: rockchip: rename flash nodenames

Nodes with compatible "jedec,spi-nor" are now checked with
jedec,spi-nor.yaml and mtd.yaml. The pattern is now
"^flash(@.*)?$", so change that for the boards with a
Rockchip SoC.

Signed-off-by: Johan Jonker <[email protected]>
---
arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 2 +-
arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
index 1b0f7e455..f69a38f42 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
@@ -345,7 +345,7 @@
&spi0 {
status = "okay";

- spiflash@0 {
+ flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
index c1bcc8ca3..e310b51ab 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
@@ -543,7 +543,7 @@ ap_i2c_audio: &i2c8 {
pinctrl-names = "default", "sleep";
pinctrl-1 = <&spi1_sleep>;

- spiflash@0 {
+ flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;

--
2.11.0

2021-07-11 23:28:38

by Heiko Stuebner

Subject: Re: [PATCH] arm64: dts: rockchip: rename flash nodenames

On Sun, 11 Jul 2021 16:59:00 +0200, Johan Jonker wrote:
> Nodes with compatible "jedec,spi-nor" are now checked with
> jedec,spi-nor.yaml and mtd.yaml. The pattern is now
> "^flash(@.*)?$", so change that for the boards with a
> Rockchip SoC.

Applied, thanks!

[1/1] arm64: dts: rockchip: rename flash nodenames
commit: 3a9476ad636e4044b5175d1cd1e1ce7ef1ba448c

Best regards,
--
Heiko Stuebner <[email protected]>