summaryrefslogtreecommitdiff
path: root/arch/arm/mach-bcm
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2015-12-16 15:55:14 -0800
committerEric Anholt <eric@anholt.net>2015-12-22 11:17:04 -0800
commitc1be3c1fc6178ca48750b4e66f1acb7c22b64997 (patch)
tree6ea7864d1268f3f8469831a71340e9ad392907e8 /arch/arm/mach-bcm
parent57e5c6d95b2cde884634586d833b02f54ba1c79d (diff)
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>
Diffstat (limited to 'arch/arm/mach-bcm')
-rw-r--r--arch/arm/mach-bcm/board_bcm2835.c5
1 files changed, 5 insertions, 0 deletions
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
};