Merge tag 'pstore-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / r8a73a4.dtsi

diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi
index dd4d09712a2a3a8885bbb99889494742a9cc945d..8e48090e4fdc14125225d906163a2a35d18c1660 100644 (file)
--- a/arch/arm/boot/dts/r8a73a4.dtsi
+++ b/arch/arm/boot/dts/r8a73a4.dtsi
@@ -132,15 +132,12 @@
        };
 
        cmt1: timer@e6130000 {
-               compatible = "renesas,cmt-48-r8a73a4", "renesas,cmt-48-gen2";
+               compatible = "renesas,r8a73a4-cmt1", "renesas,rcar-gen2-cmt1";
                reg = <0 0xe6130000 0 0x1004>;
                interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
                clocks = <&mstp3_clks R8A73A4_CLK_CMT1>;
                clock-names = "fck";
                power-domains = <&pd_c5>;
-
-               renesas,channels-mask = <0xff>;
-
                status = "disabled";
        };