projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 57e5c6d)
ARM: bcm2835: Add a compat string for bcm2836 machine probe
authorEric Anholt <eric@anholt.net>
Wed, 16 Dec 2015 23:55:14 +0000 (15:55 -0800)
committerEric Anholt <eric@anholt.net>
Tue, 22 Dec 2015 19:17:04 +0000 (11:17 -0800)
Supporting the 2836 requires using the new interrupt controller, which
we have support for.

Signed-off-by: Eric Anholt <eric@anholt.net>
arch/arm/mach-bcm/board_bcm2835.c patch | blob | blame | history

diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c
index 0f7b9eac3d15d23dc7faa78699e119c7faad547c..834d67684e205a185971c13ebc6620434eeac788 100644 (file)
--- 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
 };