summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Brezillon <boris.brezillon@free-electrons.com>2016-06-15 13:20:19 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-07-27 08:42:23 -0700
commit59012669c68d4bffc0c43b96477cd4d4fcbb3c10 (patch)
treed1e777e9f3a46ebe47bdeee7993b6e29368a0945
parent5387cd434a12b453803a06e1f7fa502ec3c93aa6 (diff)
downloadlwn-59012669c68d4bffc0c43b96477cd4d4fcbb3c10.tar.gz
lwn-59012669c68d4bffc0c43b96477cd4d4fcbb3c10.zip
ARM: sunxi/dt: make the CHIP inherit from allwinner,sun5i-a13
commit 5fc39d347267bd029fcc9099c70e2fe2d53130e9 upstream. The sun4i-timer driver registers its sched_clock only if the machine is compatible with "allwinner,sun5i-a13", "allwinner,sun5i-a10s" or "allwinner,sun4i-a10". Add the missing "allwinner,sun5i-a13" string to the machine compatible. Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> Fixes: 465a225fb2af ("ARM: sun5i: Add C.H.I.P DTS") Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/arm/boot/dts/sun5i-r8-chip.dts2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/sun5i-r8-chip.dts b/arch/arm/boot/dts/sun5i-r8-chip.dts
index f6898c6b84d4..c937c85ffb45 100644
--- a/arch/arm/boot/dts/sun5i-r8-chip.dts
+++ b/arch/arm/boot/dts/sun5i-r8-chip.dts
@@ -52,7 +52,7 @@
/ {
model = "NextThing C.H.I.P.";
- compatible = "nextthing,chip", "allwinner,sun5i-r8";
+ compatible = "nextthing,chip", "allwinner,sun5i-r8", "allwinner,sun5i-a13";
aliases {
i2c0 = &i2c0;