diff options
author | Arnd Bergmann <arnd@arndb.de> | 2021-10-20 23:17:04 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2021-10-20 23:17:06 +0200 |
commit | 06fab4a544a288220abd3803b8a2e88c17c049ff (patch) | |
tree | 35f2de67fd0ae1af741d6747459a4414db1e0c52 /arch/arm/boot/dts | |
parent | 6375b90837858f2fead4704bba61ecedaa820483 (diff) | |
parent | 4ad12dd5a2b05406473dc33bdf7dc6fd79024ca6 (diff) |
Merge branch 'mstar-dt-next' of https://github.com/linux-chenxing/linux into arm/dt
* 'mstar-dt-next' of https://github.com/linux-chenxing/linux:
ARM: dts: mstar: Mark timer with arm,cpu-registers-not-fw-configured
ARM: dts: mstar: Add rtc device node
Link: https://lore.kernel.org/r/20211020163010.3079-1-romain.perier@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r-- | arch/arm/boot/dts/mstar-v7.dtsi | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/mstar-v7.dtsi b/arch/arm/boot/dts/mstar-v7.dtsi index 2273295e140f..89ebfe4f29da 100644 --- a/arch/arm/boot/dts/mstar-v7.dtsi +++ b/arch/arm/boot/dts/mstar-v7.dtsi @@ -39,6 +39,7 @@ * u-boot is broken */ clock-frequency = <6000000>; + arm,cpu-registers-not-fw-configured; }; pmu: pmu { @@ -109,12 +110,20 @@ mask = <0x79>; }; + rtc@2400 { + compatible = "mstar,msc313-rtc"; + reg = <0x2400 0x40>; + clocks = <&xtal_div2>; + interrupts-extended = <&intc_irq GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>; + }; + watchdog@6000 { compatible = "mstar,msc313e-wdt"; reg = <0x6000 0x1f>; clocks = <&xtal_div2>; }; + intc_fiq: interrupt-controller@201310 { compatible = "mstar,mst-intc"; reg = <0x201310 0x40>; |