lkml.org 
[lkml]   [2021]   [Nov]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 016/279] arm64: dts: hisilicon: fix arm,sp805 compatible string
    Date
    From: Michael Walle <michael@walle.cc>

    [ Upstream commit 894d4f1f77d0e88f1f81af2e1e37333c1c41b631 ]

    According to Documentation/devicetree/bindings/watchdog/arm,sp805.yaml
    the compatible is:
    compatible = "arm,sp805", "arm,primecell";

    The current compatible string doesn't exist at all. Fix it.

    Signed-off-by: Michael Walle <michael@walle.cc>
    Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 4 ++--
    arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 2 +-
    2 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
    index 2d5c1a348716a..6eabec2602e23 100644
    --- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
    +++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
    @@ -1087,7 +1087,7 @@
    };

    watchdog0: watchdog@e8a06000 {
    - compatible = "arm,sp805-wdt", "arm,primecell";
    + compatible = "arm,sp805", "arm,primecell";
    reg = <0x0 0xe8a06000 0x0 0x1000>;
    interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
    clocks = <&crg_ctrl HI3660_OSC32K>,
    @@ -1096,7 +1096,7 @@
    };

    watchdog1: watchdog@e8a07000 {
    - compatible = "arm,sp805-wdt", "arm,primecell";
    + compatible = "arm,sp805", "arm,primecell";
    reg = <0x0 0xe8a07000 0x0 0x1000>;
    interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
    clocks = <&crg_ctrl HI3660_OSC32K>,
    diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
    index dde9371dc5451..e4860b8a638ec 100644
    --- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
    +++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
    @@ -840,7 +840,7 @@
    };

    watchdog0: watchdog@f8005000 {
    - compatible = "arm,sp805-wdt", "arm,primecell";
    + compatible = "arm,sp805", "arm,primecell";
    reg = <0x0 0xf8005000 0x0 0x1000>;
    interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
    clocks = <&ao_ctrl HI6220_WDT0_PCLK>,
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-24 14:46    [W:3.708 / U:0.816 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site