[v2,8/9] ASoC: Intel: Skylake: Initialize NHLT table
diff mbox

Message ID 1439832404-12424-9-git-send-email-vinod.koul@intel.com
State New
Headers show

Commit Message

Vinod Koul Aug. 17, 2015, 5:26 p.m. UTC
From: Jeeja KP <jeeja.kp@intel.com>

Load and Initialize Non HDA Link Table in Skylake driver
to get platform configuration.

Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
---
 sound/soc/intel/skylake/skl.c | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Mark Brown Sept. 19, 2015, 4:27 p.m. UTC | #1
On Mon, Aug 17, 2015 at 10:56:43PM +0530, Vinod Koul wrote:
> From: Jeeja KP <jeeja.kp@intel.com>
> 
> Load and Initialize Non HDA Link Table in Skylake driver
> to get platform configuration.

Didn't we need this before we started trying to use the NHLT?
Vinod Koul Sept. 21, 2015, 3:38 a.m. UTC | #2
On Sat, Sep 19, 2015 at 09:27:20AM -0700, Mark Brown wrote:
> On Mon, Aug 17, 2015 at 10:56:43PM +0530, Vinod Koul wrote:
> > From: Jeeja KP <jeeja.kp@intel.com>
> > 
> > Load and Initialize Non HDA Link Table in Skylake driver
> > to get platform configuration.
> 
> Didn't we need this before we started trying to use the NHLT?

We have only added NHLT code, not calls to it. Since the whole driver
series is not merged we thought best to add enabling bits in later patches,
so added here at last.

Thanks

Patch
diff mbox

diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
index 2f1890e703c6..ca135b8ab5c0 100644
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -458,6 +458,11 @@  static int skl_probe(struct pci_dev *pci,
 	if (err < 0)
 		goto out_free;
 
+	skl->nhlt = skl_nhlt_init(bus->dev);
+
+	if (skl->nhlt == NULL)
+		goto out_free;
+
 	pci_set_drvdata(skl->pci, ebus);
 
 	/* check if dsp is there */