From 71800909f3f560a4da72a4fea1f2fff945f97732 Mon Sep 17 00:00:00 2001
From: Felix Held <felix.held@amd.corp-partner.google.com>
Date: Wed, 17 Jun 2020 19:59:53 +0200
Subject: [PATCH] soc/amd/picasso/acp: use config_of_soc()

Change-Id: I815b013438d66eef6605dba7cfbd96b9a4aff9b2
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42477
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
---
 src/soc/amd/picasso/acp.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/soc/amd/picasso/acp.c b/src/soc/amd/picasso/acp.c
index 854dd8f52b..29b7521f38 100644
--- a/src/soc/amd/picasso/acp.c
+++ b/src/soc/amd/picasso/acp.c
@@ -16,15 +16,11 @@
 static void init(struct device *dev)
 {
 	const struct soc_amd_picasso_config *cfg;
-	const struct device *nb_dev = pcidev_path_on_root(GNB_DEVFN);
 	struct resource *res;
 	uintptr_t bar;
 
 	/* Set the proper I2S_PIN_CONFIG state */
-	if (!nb_dev || !nb_dev->chip_info)
-		return;
-
-	cfg = nb_dev->chip_info;
+	cfg = config_of_soc();
 
 	res = dev->resource_list;
 	if (!res || !res->base) {