Commit ea2787f3 authored Mar 04, 2014 by Aaro Koskinen Committed by Mark Brown Mar 04, 2014

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: Aaro Koskinen <aaro.koskinen@iki.fi>
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

parent 38dbfb59

sound/soc/omap/n810.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message