From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Laurent Pinchart , Simon Horman , Sasha Levin Subject: [PATCH AUTOSEL 4.18 105/136] arm64: dts: renesas: Fix VSPD registers range Date: Mon, 17 Sep 2018 03:01:18 +0000 Message-ID: <20180917030006.245495-105-alexander.levin@microsoft.com> References: <20180917030006.245495-1-alexander.levin@microsoft.com> In-Reply-To: <20180917030006.245495-1-alexander.levin@microsoft.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: From: Laurent Pinchart [ Upstream commit e21adc781bb45e810f1c396c4bc2c1624a4c25b9 ] The VSPD and FCPVD nodes have overlapping register ranges, as the FCPVD devices are mapped in the memory range usually used by the VSP LUT and CLU, which are not present in the VSPD. Fix this by shortening the VSPD registers range to 0x5000. Fixes: 9f8573e38a0b ("arm64: dts: renesas: r8a7795: Add VSP instances") Fixes: 291e0c4994d0 ("arm64: dts: r8a7795: Add support for R-Car H3 ES2.0") Fixes: f06ffdfbdd90 ("arm64: dts: r8a7796: Add VSP instances") Fixes: b4f92030d5d3 ("arm64: dts: renesas: r8a77970: add VSPD support") Fixes: 295952a183d3 ("arm64: dts: renesas: r8a77995: add VSP instances") Fixes: 85cb3229218a ("arm64: dts: renesas: r8a77965: Add VSP instances") Reported-by: Simon Horman Reported-by: Geert Uytterhoeven Signed-off-by: Laurent Pinchart Reviewed-by: Geert Uytterhoeven Signed-off-by: Simon Horman Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 2 +- arch/arm64/boot/dts/renesas/r8a7795.dtsi | 6 +++--- arch/arm64/boot/dts/renesas/r8a7796.dtsi | 6 +++--- arch/arm64/boot/dts/renesas/r8a77965.dtsi | 4 ++-- arch/arm64/boot/dts/renesas/r8a77970.dtsi | 2 +- arch/arm64/boot/dts/renesas/r8a77995.dtsi | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot= /dts/renesas/r8a7795-es1.dtsi index e19dcd6cb767..0a42b016f257 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi @@ -80,7 +80,7 @@ =20 vspd3: vsp@fea38000 { compatible =3D "renesas,vsp2"; - reg =3D <0 0xfea38000 0 0x8000>; + reg =3D <0 0xfea38000 0 0x5000>; interrupts =3D ; clocks =3D <&cpg CPG_MOD 620>; power-domains =3D <&sysc R8A7795_PD_ALWAYS_ON>; diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts= /renesas/r8a7795.dtsi index d842940b2f43..91c392f879f9 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi @@ -2530,7 +2530,7 @@ =20 vspd0: vsp@fea20000 { compatible =3D "renesas,vsp2"; - reg =3D <0 0xfea20000 0 0x8000>; + reg =3D <0 0xfea20000 0 0x5000>; interrupts =3D ; clocks =3D <&cpg CPG_MOD 623>; power-domains =3D <&sysc R8A7795_PD_ALWAYS_ON>; @@ -2541,7 +2541,7 @@ =20 vspd1: vsp@fea28000 { compatible =3D "renesas,vsp2"; - reg =3D <0 0xfea28000 0 0x8000>; + reg =3D <0 0xfea28000 0 0x5000>; interrupts =3D ; clocks =3D <&cpg CPG_MOD 622>; power-domains =3D <&sysc R8A7795_PD_ALWAYS_ON>; @@ -2552,7 +2552,7 @@ =20 vspd2: vsp@fea30000 { compatible =3D "renesas,vsp2"; - reg =3D <0 0xfea30000 0 0x8000>; + reg =3D <0 0xfea30000 0 0x5000>; interrupts =3D ; clocks =3D <&cpg CPG_MOD 621>; power-domains =3D <&sysc R8A7795_PD_ALWAYS_ON>; diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts= /renesas/r8a7796.dtsi index 7c25be6b5af3..a3653f9f4627 100644 --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi @@ -2212,7 +2212,7 @@ =20 vspd0: vsp@fea20000 { compatible =3D "renesas,vsp2"; - reg =3D <0 0xfea20000 0 0x8000>; + reg =3D <0 0xfea20000 0 0x5000>; interrupts =3D ; clocks =3D <&cpg CPG_MOD 623>; power-domains =3D <&sysc R8A7796_PD_ALWAYS_ON>; @@ -2223,7 +2223,7 @@ =20 vspd1: vsp@fea28000 { compatible =3D "renesas,vsp2"; - reg =3D <0 0xfea28000 0 0x8000>; + reg =3D <0 0xfea28000 0 0x5000>; interrupts =3D ; clocks =3D <&cpg CPG_MOD 622>; power-domains =3D <&sysc R8A7796_PD_ALWAYS_ON>; @@ -2234,7 +2234,7 @@ =20 vspd2: vsp@fea30000 { compatible =3D "renesas,vsp2"; - reg =3D <0 0xfea30000 0 0x8000>; + reg =3D <0 0xfea30000 0 0x5000>; interrupts =3D ; clocks =3D <&cpg CPG_MOD 621>; power-domains =3D <&sysc R8A7796_PD_ALWAYS_ON>; diff --git a/arch/arm64/boot/dts/renesas/r8a77965.dtsi b/arch/arm64/boot/dt= s/renesas/r8a77965.dtsi index 486aecacb22a..ca618228fce1 100644 --- a/arch/arm64/boot/dts/renesas/r8a77965.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a77965.dtsi @@ -1397,7 +1397,7 @@ =20 vspd0: vsp@fea20000 { compatible =3D "renesas,vsp2"; - reg =3D <0 0xfea20000 0 0x8000>; + reg =3D <0 0xfea20000 0 0x5000>; interrupts =3D ; clocks =3D <&cpg CPG_MOD 623>; power-domains =3D <&sysc R8A77965_PD_ALWAYS_ON>; @@ -1416,7 +1416,7 @@ =20 vspd1: vsp@fea28000 { compatible =3D "renesas,vsp2"; - reg =3D <0 0xfea28000 0 0x8000>; + reg =3D <0 0xfea28000 0 0x5000>; interrupts =3D ; clocks =3D <&cpg CPG_MOD 622>; power-domains =3D <&sysc R8A77965_PD_ALWAYS_ON>; diff --git a/arch/arm64/boot/dts/renesas/r8a77970.dtsi b/arch/arm64/boot/dt= s/renesas/r8a77970.dtsi index 98a2317a16c4..89dc4e343b7c 100644 --- a/arch/arm64/boot/dts/renesas/r8a77970.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a77970.dtsi @@ -776,7 +776,7 @@ =20 vspd0: vsp@fea20000 { compatible =3D "renesas,vsp2"; - reg =3D <0 0xfea20000 0 0x8000>; + reg =3D <0 0xfea20000 0 0x5000>; interrupts =3D ; clocks =3D <&cpg CPG_MOD 623>; power-domains =3D <&sysc R8A77970_PD_ALWAYS_ON>; diff --git a/arch/arm64/boot/dts/renesas/r8a77995.dtsi b/arch/arm64/boot/dt= s/renesas/r8a77995.dtsi index 2506f46293e8..ac9aadf2723c 100644 --- a/arch/arm64/boot/dts/renesas/r8a77995.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a77995.dtsi @@ -699,7 +699,7 @@ =20 vspd0: vsp@fea20000 { compatible =3D "renesas,vsp2"; - reg =3D <0 0xfea20000 0 0x8000>; + reg =3D <0 0xfea20000 0 0x5000>; interrupts =3D ; clocks =3D <&cpg CPG_MOD 623>; power-domains =3D <&sysc R8A77995_PD_ALWAYS_ON>; @@ -709,7 +709,7 @@ =20 vspd1: vsp@fea28000 { compatible =3D "renesas,vsp2"; - reg =3D <0 0xfea28000 0 0x8000>; + reg =3D <0 0xfea28000 0 0x5000>; interrupts =3D ; clocks =3D <&cpg CPG_MOD 622>; power-domains =3D <&sysc R8A77995_PD_ALWAYS_ON>; --=20 2.17.1