From f3f2aa8a50af36de42d2feda7c38fe12f7fb52b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Mon, 21 Dec 2020 15:17:01 +0200
Subject: [PATCH] soc/intel: Replace <soc/nvs.h> with <soc/device_nvs.h>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ib78e746875e330e47540a6199343be62aa7e92a6
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48830
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/soc/intel/baytrail/emmc.c | 2 +-
 src/soc/intel/baytrail/sd.c   | 2 +-
 src/soc/intel/braswell/emmc.c | 2 +-
 src/soc/intel/braswell/sd.c   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/soc/intel/baytrail/emmc.c b/src/soc/intel/baytrail/emmc.c
index e8253e0b2c..e672b58bfe 100644
--- a/src/soc/intel/baytrail/emmc.c
+++ b/src/soc/intel/baytrail/emmc.c
@@ -6,8 +6,8 @@
 #include <device/pci_ids.h>
 #include <reg_script.h>
 
+#include <soc/device_nvs.h>
 #include <soc/iosf.h>
-#include <soc/nvs.h>
 #include <soc/pci_devs.h>
 #include <soc/ramstage.h>
 #include "chip.h"
diff --git a/src/soc/intel/baytrail/sd.c b/src/soc/intel/baytrail/sd.c
index 34a90317ea..0a015c8667 100644
--- a/src/soc/intel/baytrail/sd.c
+++ b/src/soc/intel/baytrail/sd.c
@@ -6,8 +6,8 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 
+#include <soc/device_nvs.h>
 #include <soc/iosf.h>
-#include <soc/nvs.h>
 #include <soc/pci_devs.h>
 #include <soc/ramstage.h>
 #include "chip.h"
diff --git a/src/soc/intel/braswell/emmc.c b/src/soc/intel/braswell/emmc.c
index 954b5b4b50..d3c5aa8640 100644
--- a/src/soc/intel/braswell/emmc.c
+++ b/src/soc/intel/braswell/emmc.c
@@ -6,8 +6,8 @@
 #include <device/pci_ids.h>
 #include <reg_script.h>
 
+#include <soc/device_nvs.h>
 #include <soc/iosf.h>
-#include <soc/nvs.h>
 #include <soc/pci_devs.h>
 #include <soc/ramstage.h>
 #include "chip.h"
diff --git a/src/soc/intel/braswell/sd.c b/src/soc/intel/braswell/sd.c
index 5d88016619..39a44db772 100644
--- a/src/soc/intel/braswell/sd.c
+++ b/src/soc/intel/braswell/sd.c
@@ -6,8 +6,8 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 
+#include <soc/device_nvs.h>
 #include <soc/iosf.h>
-#include <soc/nvs.h>
 #include <soc/pci_devs.h>
 #include <soc/ramstage.h>
 #include "chip.h"