| Message ID | 20200626080642.4244-1-krzk@kernel.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 9141b3ca7fedcdc18d9147287913bf80c9c432ba |
| Headers | show |
| Series | ARM: dts: berlin: Align L2 cache-controller nodename with dtschema | expand |
On Tue, Jul 28, 2020 at 8:37 AM Jisheng Zhang <Jisheng.Zhang@synaptics.com> wrote: > > Hi arm-soc, > > > On Fri, 26 Jun 2020 10:06:41 +0200 Krzysztof Kozlowski wrote: > > > > > > > Fix dtschema validator warnings like: > > l2-cache-controller@ac0000: $nodename:0: > > 'l2-cache-controller@ac0000' does not match '^(cache-controller|cpu)(@[0-9a-f,]+)*$' > > > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > > Reviewed-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com> > > As for berlin linux-5.9, we only have this one patch, could you please > directly take this patch? Applied now. To ensure we actually see the patch, it's better if you can just send a new copy with your added Signed-off-by to soc@kernel.org than to reply to the original email. Thanks, Arnd
diff --git a/arch/arm/boot/dts/berlin2.dtsi b/arch/arm/boot/dts/berlin2.dtsi index 3ab3cd250da7..6194857f8a02 100644 --- a/arch/arm/boot/dts/berlin2.dtsi +++ b/arch/arm/boot/dts/berlin2.dtsi @@ -106,7 +106,7 @@ status = "disabled"; }; - l2: l2-cache-controller@ac0000 { + l2: cache-controller@ac0000 { compatible = "marvell,tauros3-cache", "arm,pl310-cache"; reg = <0xac0000 0x1000>; cache-unified; diff --git a/arch/arm/boot/dts/berlin2cd.dtsi b/arch/arm/boot/dts/berlin2cd.dtsi index 7cf3e6302d75..6f30d7eb3b41 100644 --- a/arch/arm/boot/dts/berlin2cd.dtsi +++ b/arch/arm/boot/dts/berlin2cd.dtsi @@ -71,7 +71,7 @@ status = "disabled"; }; - l2: l2-cache-controller@ac0000 { + l2: cache-controller@ac0000 { compatible = "arm,pl310-cache"; reg = <0xac0000 0x1000>; cache-unified; diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi index c44a32e873f4..b6a0acac6836 100644 --- a/arch/arm/boot/dts/berlin2q.dtsi +++ b/arch/arm/boot/dts/berlin2q.dtsi @@ -149,7 +149,7 @@ status = "disabled"; }; - l2: l2-cache-controller@ac0000 { + l2: cache-controller@ac0000 { compatible = "arm,pl310-cache"; reg = <0xac0000 0x1000>; cache-unified;
Fix dtschema validator warnings like: l2-cache-controller@ac0000: $nodename:0: 'l2-cache-controller@ac0000' does not match '^(cache-controller|cpu)(@[0-9a-f,]+)*$' Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> --- arch/arm/boot/dts/berlin2.dtsi | 2 +- arch/arm/boot/dts/berlin2cd.dtsi | 2 +- arch/arm/boot/dts/berlin2q.dtsi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)