Skip to content

Commit

Permalink
ASoC: n810: fix init with DT boot
Browse files Browse the repository at this point in the history
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: Aaro Koskinen <aaro.koskinen@iki.fi>
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Aaro Koskinen authored and Mark Brown committed Mar 4, 2014
1 parent 38dbfb5 commit ea2787f
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion sound/soc/omap/n810.c
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,9 @@ static int __init n810_soc_init(void)
int err;
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;

n810_snd_device = platform_device_alloc("soc-audio", -1);
Expand Down

0 comments on commit ea2787f

Please sign in to comment.