Commit ea2787f3 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Mark Brown

ASoC: n810: fix init with DT boot

Since 3.14-rc1 only DT boot has been supported on N810, so this
file fails to init. Make a minimal fix to retain functionality.
This file should be properly converted to DT in longer term.

There seems to be still other unresolved issues with N810 audio support,
but this patch is needed at minimum as otherwise the machine driver
probing would completely fail.
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Acked-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 38dbfb59
...@@ -305,7 +305,9 @@ static int __init n810_soc_init(void) ...@@ -305,7 +305,9 @@ static int __init n810_soc_init(void)
int err; int err;
struct device *dev; struct device *dev;
if (!(machine_is_nokia_n810() || machine_is_nokia_n810_wimax())) if (!of_have_populated_dt() ||
(!of_machine_is_compatible("nokia,n810") &&
!of_machine_is_compatible("nokia,n810-wimax")))
return -ENODEV; return -ENODEV;
n810_snd_device = platform_device_alloc("soc-audio", -1); n810_snd_device = platform_device_alloc("soc-audio", -1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment