diff options
author | Marc Zyngier <maz@kernel.org> | 2020-11-13 00:20:43 +0300 |
---|---|---|
committer | Marc Zyngier <maz@kernel.org> | 2020-11-13 00:20:43 +0300 |
commit | 4f6b838c378a52ea3ae0b15f12ca8a20849072fa (patch) | |
tree | fbd8c2346320f97eda221b9150d787f9006e8b35 /arch/arm64/boot/dts/hisilicon/hi6220.dtsi | |
parent | c512298eed0360923d0cbc4a1f30bc0509af0d50 (diff) | |
parent | 3650b228f83adda7e5ee532e2b90429c03f7b9ec (diff) | |
download | linux-4f6b838c378a52ea3ae0b15f12ca8a20849072fa.tar.xz |
Merge tag 'v5.10-rc1' into kvmarm-master/next
Linux 5.10-rc1
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/boot/dts/hisilicon/hi6220.dtsi')
-rw-r--r-- | arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi index 3d189d9f0d24..014735a9bc73 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi @@ -371,7 +371,7 @@ clocks = <&sys_ctrl HI6220_EDMAC_ACLK>; dma-no-cci; dma-type = "hi6220_dma"; - status = "ok"; + status = "okay"; }; dual_timer0: timer@f8008000 { @@ -843,8 +843,9 @@ compatible = "arm,sp805-wdt", "arm,primecell"; reg = <0x0 0xf8005000 0x0 0x1000>; interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&ao_ctrl HI6220_WDT0_PCLK>; - clock-names = "apb_pclk"; + clocks = <&ao_ctrl HI6220_WDT0_PCLK>, + <&ao_ctrl HI6220_WDT0_PCLK>; + clock-names = "wdog_clk", "apb_pclk"; }; tsensor: tsensor@0,f7030700 { |