dts: fix the warnings when compiling the g12a device tree. [1/1]

PD#SWPL-4967

Problem:
warning when compiling the g12a device tree.

Solution:
fix the warning.

Verify:
locall.

Change-Id: I1f93c788d1914441e48305c04330701bfd718b87
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>

diff --git a/arch/arm/boot/dts/amlogic/mesong12a.dtsi b/arch/arm/boot/dts/amlogic/mesong12a.dtsi
index 99b85bb..01d7cb2 100644 (file)
--- a/arch/arm/boot/dts/amlogic/mesong12a.dtsi
+++ b/arch/arm/boot/dts/amlogic/mesong12a.dtsi
@@ -1028,9 +1028,9 @@
                interrupt-map-mask = <0 0 0 0>;
                interrupt-map = <0 0 0 0 &gic GIC_SPI 223 IRQ_TYPE_EDGE_RISING>;
                device_type = "pci";
-               ranges = <0x81000000 0 0 0 0xfc600000 0x0 0x100000
+               ranges = <0x81000000 0 0 0xfc600000 0x0 0x100000
                        /* downstream I/O */
-                       0x82000000 0 0xfc700000 0x0 0xfc700000 0 0x1900000>;
+                       0x82000000 0xfc700000 0x0 0xfc700000 0 0x1900000>;
                        /* non-prefetchable memory */
                num-lanes = <1>;
                pcie-num = <1>;

diff --git a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi
index b34e0b8..ef6a000 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi
@@ -157,10 +157,10 @@
        };
 
        arm_pmu {
-               compatible = "arm,cortex-a15-pmu";
+               compatible = "arm,armv8-pmuv3";
                /* clusterb-enabled; */
                interrupts = <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>;
-               reg = <0xff634680 0x4>;
+               reg = <0x0 0xff634680 0x0 0x4>;
                cpumasks = <0xf>;
                /* default 10ms */
                relax-timer-ns = <10000000>;