aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm64/boot
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2018-12-12 12:48:57 -0800
committerOlof Johansson <olof@lixom.net>2018-12-12 12:48:57 -0800
commit2c94db389bbae850a6f353d9b93ee22c170d8497 (patch)
treec42b1cb5d3e61402d93f383711609caa2377d5ab /arch/arm64/boot
parentMerge tag 'tegra-for-4.21-arm64-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt (diff)
parentARM: dts: sunxi: Fix PMU compatible strings (diff)
downloadlinux-dev-2c94db389bbae850a6f353d9b93ee22c170d8497.tar.xz
linux-dev-2c94db389bbae850a6f353d9b93ee22c170d8497.zip
Merge tag 'sunxi-dt-for-4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt
Allwinner DT changes for 4.21 This is a quite big pull request this time, with a huge number of changes (and patches) due to us fixing the vast majority of the DTC warnings our DT had. We also have a bunch of other good, more meaningful, changes: - Support for the new Allwinner T3 (rebranded R40) and f1c100s (armv5) SoCs - AXP803 PMIC AC Power supply support - Rework of the oscillators tree - Two new boards: the t3-cqa3t-bv3 and Lichee Pi Nano Plus a few enhancements here and there. * tag 'sunxi-dt-for-4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: (84 commits) ARM: dts: sunxi: Fix PMU compatible strings ARM: dts: sun8i: r40: Add RTC device node ARM: dts: sunxi: h3/h5: Fix up RTC device node and clock references ARM: dts: sun8i: a23/a33: Fix up RTC device node ARM: dts: sun8i: r40: Add clock accuracy for external oscillators ARM: dts: sunxi: h3/h5: Add clock accuracy for external oscillators ARM: dts: sun8i: a33: Drop audio codec oversampling rate to 128 fs ARM: dts: sun8i: h3: Remove unnecessary reserved memory node ARM: dts: sun8i: a33: Remove unnecessary reserved memory node ARM: dts: suniv: Add device tree for Lichee Pi Nano ARM: dts: suniv: add initial DTSI file for F1C100s ARM: dts: axp81x: add AC power supply subnode ARM: dts: sun8i: v3s: Remove skeleton and memory to avoid warnings ARM: dts: sun8i: v3s: Provide default muxing for relevant controllers ARM: dts: sun8i: v3s: Change pinctrl nodes to avoid warning ARM: dts: sun8i: v3s: Change LRADC node names to avoid warnings ARM: dts: sun8i: h3: Remove leading zeros from unit-addresses ARM: dts: sun8i: BPI-M2M: Remove i2c nodes ARM: dts: sun8i: a23/a33: Provide default muxing for relevant controllers ARM: dts: sunxi: reference: Move the muxing back to the common DTSI ... Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64/boot')
-rw-r--r--arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
index b41dc1aab67d..fe731b35f761 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
@@ -172,3 +172,7 @@
<GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
compatible = "allwinner,sun50i-h5-pinctrl";
};
+
+&rtc {
+ compatible = "allwinner,sun50i-h5-rtc";
+};