[PATCH RESEND] sound: omap: n810: fix init with DT boot

[PATCH RESEND] sound: omap: n810: fix init with DT boot

[Aaro Koskinen]

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>
---

	Previous discussion:
	http://marc.info/?l=linux-omap&m=139387208426122&w=2

 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);
-- 
1.9.0

Re: [PATCH RESEND] sound: omap: n810: fix init with DT boot

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 358 bytes --]

On Tue, Mar 04, 2014 at 12:45:18AM +0200, Aaro Koskinen wrote:
> 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.

Applied, please remember to use subject lines consistent with those for
the rest of the subsystem.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]