summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mxs
diff options
context:
space:
mode:
authorBrian Lilly <brian@crystalfontz.com>2013-06-13 15:43:44 +0200
committerShawn Guo <shawn.guo@linaro.org>2013-06-17 15:43:31 +0800
commited138c368d95095de522db98b8b6929874bed403 (patch)
tree26414623cc9bd88167e5a83e1d2d488666621a02 /arch/arm/mach-mxs
parent65bc642f1b76442e8242a79fa0e48d49fda98ba8 (diff)
downloadlinux-ed138c368d95095de522db98b8b6929874bed403.tar.bz2
ARM: mxs: dt: Add the Crystalfontz CFA-10055 device tree
The CFA-10055 is yet another breakout board for the CFA-10036, and is basically a CFA-10037, with the screen and LCD controller found on the CFA-10049. Signed-off-by: Brian Lilly <brian@crystalfontz.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-mxs')
-rw-r--r--arch/arm/mach-mxs/mach-mxs.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
index f0bf6076fa32..f9fe0c539031 100644
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -368,12 +368,7 @@ static void __init tx28_post_init(void)
pinctrl_put(pctl);
}
-static void __init cfa10049_init(void)
-{
- update_fec_mac_prop(OUI_CRYSTALFONTZ);
-}
-
-static void __init cfa10037_init(void)
+static void __init crystalfontz_init(void)
{
update_fec_mac_prop(OUI_CRYSTALFONTZ);
}
@@ -482,10 +477,10 @@ static void __init mxs_machine_init(void)
imx28_evk_init();
else if (of_machine_is_compatible("bluegiga,apx4devkit"))
apx4devkit_init();
- else if (of_machine_is_compatible("crystalfontz,cfa10037"))
- cfa10037_init();
- else if (of_machine_is_compatible("crystalfontz,cfa10049"))
- cfa10049_init();
+ else if (of_machine_is_compatible("crystalfontz,cfa10037") ||
+ of_machine_is_compatible("crystalfontz,cfa10049") ||
+ of_machine_is_compatible("crystalfontz,cfa10055"))
+ crystalfontz_init();
of_platform_populate(NULL, of_default_bus_match_table,
mxs_auxdata_lookup, parent);