aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2013-07-01 09:23:22 -0400
committerShawn Guo <shawn.guo@linaro.org>2013-08-18 04:34:56 -0400
commitf71f2e95d0ceb4d713e0161196a7283363f181ff (patch)
tree5fe94a3223aa24d05de1c5573b92a1cbd976f571
parente115d63ce8bd740b2bd22edc7de03e7e5ced604c (diff)
ARM: mxs: Simplify detection of CrystalFontz boards
As all CrystalFontz boards are compatible with "crystalfontz,cfa10036", make it easier to add future boards. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r--arch/arm/mach-mxs/mach-mxs.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
index 958ef483bf33..98f6e2adb53e 100644
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -457,10 +457,7 @@ static void __init mxs_machine_init(void)
457 imx28_evk_init(); 457 imx28_evk_init();
458 else if (of_machine_is_compatible("bluegiga,apx4devkit")) 458 else if (of_machine_is_compatible("bluegiga,apx4devkit"))
459 apx4devkit_init(); 459 apx4devkit_init();
460 else if (of_machine_is_compatible("crystalfontz,cfa10037") || 460 else if (of_machine_is_compatible("crystalfontz,cfa10036"))
461 of_machine_is_compatible("crystalfontz,cfa10049") ||
462 of_machine_is_compatible("crystalfontz,cfa10055") ||
463 of_machine_is_compatible("crystalfontz,cfa10057"))
464 crystalfontz_init(); 461 crystalfontz_init();
465 462
466 of_platform_populate(NULL, of_default_bus_match_table, 463 of_platform_populate(NULL, of_default_bus_match_table,