summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/include/device/pci_ids.h1
-rw-r--r--src/soc/intel/braswell/Kconfig2
-rw-r--r--src/soc/intel/braswell/Makefile.inc1
-rw-r--r--src/soc/intel/braswell/hda.c43
-rw-r--r--src/soc/intel/common/block/hda/hda.c2
5 files changed, 5 insertions, 44 deletions
diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h
index 90b02cbf99..0fd45e33ef 100644
--- a/src/include/device/pci_ids.h
+++ b/src/include/device/pci_ids.h
@@ -3139,6 +3139,7 @@
#define PCI_DEVICE_ID_INTEL_CNP_H_AUDIO 0xa348
#define PCI_DEVICE_ID_INTEL_ICL_AUDIO 0x34c8
#define PCI_DEVICE_ID_INTEL_CMP_AUDIO 0x02c8
+#define PCI_DEVICE_ID_INTEL_BSW_AUDIO 0x2284
/* Intel HECI/ME device Ids */
#define PCI_DEVICE_ID_INTEL_APL_CSE0 0x5a9a
diff --git a/src/soc/intel/braswell/Kconfig b/src/soc/intel/braswell/Kconfig
index 340ee76180..061c494987 100644
--- a/src/soc/intel/braswell/Kconfig
+++ b/src/soc/intel/braswell/Kconfig
@@ -31,6 +31,8 @@ config CPU_SPECIFIC_OPTIONS
select RTC
select SOC_INTEL_COMMON
select SOC_INTEL_COMMON_ACPI_WAKE_SOURCE
+ select SOC_INTEL_COMMON_BLOCK
+ select SOC_INTEL_COMMON_BLOCK_HDA
select SOC_INTEL_COMMON_RESET
select SMM_TSEG
select SMP
diff --git a/src/soc/intel/braswell/Makefile.inc b/src/soc/intel/braswell/Makefile.inc
index d5fe1abb66..a538f7daff 100644
--- a/src/soc/intel/braswell/Makefile.inc
+++ b/src/soc/intel/braswell/Makefile.inc
@@ -27,7 +27,6 @@ ramstage-y += gpio.c
ramstage-y += gfx.c
ramstage-y += gpio_support.c
-ramstage-y += hda.c
ramstage-y += iosf.c
ramstage-y += lpe.c
ramstage-y += lpss.c
diff --git a/src/soc/intel/braswell/hda.c b/src/soc/intel/braswell/hda.c
deleted file mode 100644
index 26ca8fdcf4..0000000000
--- a/src/soc/intel/braswell/hda.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2014 Google Inc.
- * Copyright (C) 2015 Intel Corp.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
-
-#include <arch/io.h>
-#include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_def.h>
-#include <device/pci_ids.h>
-#include <reg_script.h>
-
-#include <soc/hda.h>
-#include <soc/iomap.h>
-#include <soc/pci_devs.h>
-#include <soc/ramstage.h>
-
-static const struct device_operations device_ops = {
- .read_resources = pci_dev_read_resources,
- .set_resources = pci_dev_set_resources,
- .enable_resources = pci_dev_enable_resources,
- .init = NULL,
- .enable = NULL,
- .scan_bus = NULL,
- .ops_pci = &soc_pci_ops,
-};
-
-static const struct pci_driver southcluster __pci_driver = {
- .ops = &device_ops,
- .vendor = PCI_VENDOR_ID_INTEL,
- .device = HDA_DEVID,
-};
diff --git a/src/soc/intel/common/block/hda/hda.c b/src/soc/intel/common/block/hda/hda.c
index da0ad53374..376a40d3cf 100644
--- a/src/soc/intel/common/block/hda/hda.c
+++ b/src/soc/intel/common/block/hda/hda.c
@@ -2,6 +2,7 @@
* This file is part of the coreboot project.
*
* Copyright (C) 2017 Google Inc.
+ * Copyright (C) 2018 Eltan B.V.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -79,6 +80,7 @@ static const unsigned short pci_device_ids[] = {
PCI_DEVICE_ID_INTEL_CNP_H_AUDIO,
PCI_DEVICE_ID_INTEL_ICL_AUDIO,
PCI_DEVICE_ID_INTEL_CMP_AUDIO,
+ PCI_DEVICE_ID_INTEL_BSW_AUDIO,
0
};