[PATCH v2 2/3] perf/amlogic: resolve conflict between canvas & pmu

[Neil Armstrong]

On 27/03/2023 14:09, Marc Gonzalez wrote:

I'll fixup the commit message while applying.

> According to S905X2 Datasheet - Revision 07:
> 
> DMC_MON area spans 0xff638080-0xff6380c0
> DDR_PLL area spans 0xff638c00-0xff638c34
> 
> Round DDR_PLL area size up to 0x40
> 
> Fixes: 90cf8e21016fa3 ("arm64: dts: meson: Add DDR PMU node")
> Signed-off-by: Marc Gonzalez <mgonzalez at freebox.fr>
> ---
>   arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
> index a5653ab1f0b43..1aab65bb5f578 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
> @@ -1585,6 +1585,12 @@ canvas: video-lut at 48 {
>   					compatible = "amlogic,canvas";
>   					reg = <0x0 0x48 0x0 0x14>;
>   				};
> +
> +				pmu: pmu at 80 {
> +					reg = <0x0 0x80 0x0 0x40>,
> +					      <0x0 0xc00 0x0 0x40>;
> +					interrupts = <GIC_SPI 52 IRQ_TYPE_EDGE_RISING>;
> +				};
>   			};
>   
>   			usb2_phy1: phy at 3a000 {
> @@ -1710,12 +1716,6 @@ internal_ephy: ethernet-phy at 8 {
>   			};
>   		};
>   
> -		pmu: pmu at ff638000 {
> -			reg = <0x0 0xff638000 0x0 0x100>,
> -			      <0x0 0xff638c00 0x0 0x100>;
> -			interrupts = <GIC_SPI 52 IRQ_TYPE_EDGE_RISING>;
> -		};
> -
>   		aobus: bus at ff800000 {
>   			compatible = "simple-bus";
>   			reg = <0x0 0xff800000 0x0 0x100000>;

Reviewed-by: Neil Armstrong <neil.armstrong at linaro.org>