From c1be3c1fc6178ca48750b4e66f1acb7c22b64997 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 16 Dec 2015 15:55:14 -0800 Subject: 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 --- arch/arm/mach-bcm/board_bcm2835.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'arch/arm/mach-bcm') 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 }; -- cgit v1.2.3