Since 3.14-rc1 only DT boot has been supported on N810. Make a minimal fix to retain functionality. This file should be properly converted to DT in longer term.
Signed-off-by: Aaro Koskinen aaro.koskinen@iki.fi --- sound/soc/omap/n810.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c index 3fde9e4..d163e18 100644 --- a/sound/soc/omap/n810.c +++ b/sound/soc/omap/n810.c @@ -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);