From: Eric Anholt <eric@anholt.net>
Date: Wed, 16 Dec 2015 23:55:14 +0000 (-0800)
Subject: ARM: bcm2835: Add a compat string for bcm2836 machine probe
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c1be3c1fc6178ca48750b4e66f1acb7c22b64997;p=linux-beck.git

ARM: bcm2835: Add a compat string for bcm2836 machine probe

Supporting the 2836 requires using the new interrupt controller, which
we have support for.

Signed-off-by: Eric Anholt <eric@anholt.net>
---

diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c
index 0f7b9eac3d15..834d67684e20 100644
--- a/arch/arm/mach-bcm/board_bcm2835.c
+++ b/arch/arm/mach-bcm/board_bcm2835.c
@@ -36,7 +36,12 @@ static void __init bcm2835_init(void)
 }
 
 static const char * const bcm2835_compat[] = {
+#ifdef CONFIG_ARCH_MULTI_V6
 	"brcm,bcm2835",
+#endif
+#ifdef CONFIG_ARCH_MULTI_V7
+	"brcm,bcm2836",
+#endif
 	NULL
 };