]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
arm64: dts: hisilicon: fix arm,sp805 compatible string
authorMichael Walle <michael@walle.cc>
Mon, 30 Aug 2021 16:51:13 +0000 (18:51 +0200)
committerAndrea Righi <andrea.righi@canonical.com>
Tue, 4 Jan 2022 08:48:44 +0000 (09:48 +0100)
BugLink: https://bugs.launchpad.net/bugs/1952579
[ 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>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
arch/arm64/boot/dts/hisilicon/hi3660.dtsi
arch/arm64/boot/dts/hisilicon/hi6220.dtsi

index 2d5c1a348716a227eac0564bedce0efa4eb0eafc..6eabec2602e23f49510784d6ec053f9bd390635d 100644 (file)
                };
 
                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>,
                };
 
                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>,
index dde9371dc545100f7afeab81bed7287a29791e11..e4860b8a638ecc426e7e6c4e157b8fa1c985c104 100644 (file)
                };
 
                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>,