diff options
| author | Lijian Zhao <lijian.zhao@intel.com> | 2017-10-30 14:27:52 -0700 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2017-11-04 00:27:24 +0000 |
| commit | 44e2abf38ff6da6504f29f69904869cf38724ba7 (patch) | |
| tree | ab36336cf014bb50c4fb4837ee3b4e4f974a2f99 | |
| parent | 7b6a8cec9b87e048894b926a6a2b082bcdae05ce (diff) | |
soc/intel/apollolake: Move to common dsp driver
Move dsp driver implementation to common dsp driver.
TEST=Boot up and check dsp driver loaded or not in OS.
Change-Id: Ia2be1c9f18e0e110600bd56a0b6cb8d40ca5e01f
Signed-off-by: Lijian Zhao <lijian.zhao@intel.com>
Reviewed-on: https://review.coreboot.org/22234
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
| -rw-r--r-- | src/soc/intel/apollolake/Kconfig | 1 | ||||
| -rw-r--r-- | src/soc/intel/apollolake/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/soc/intel/apollolake/dsp.c | 37 |
3 files changed, 1 insertions, 38 deletions
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig index e8bfb07187..cf2492c509 100644 --- a/src/soc/intel/apollolake/Kconfig +++ b/src/soc/intel/apollolake/Kconfig @@ -65,6 +65,7 @@ config CPU_SPECIFIC_OPTIONS select SOC_INTEL_COMMON_BLOCK select SOC_INTEL_COMMON_BLOCK_ACPI select SOC_INTEL_COMMON_BLOCK_CPU + select SOC_INTEL_COMMON_BLOCK_DSP select SOC_INTEL_COMMON_BLOCK_FAST_SPI select SOC_INTEL_COMMON_BLOCK_GPIO select SOC_INTEL_COMMON_BLOCK_GPIO_MULTI_ACPI_DEVICES diff --git a/src/soc/intel/apollolake/Makefile.inc b/src/soc/intel/apollolake/Makefile.inc index 2848beddbe..de270006cd 100644 --- a/src/soc/intel/apollolake/Makefile.inc +++ b/src/soc/intel/apollolake/Makefile.inc @@ -48,7 +48,6 @@ ramstage-y += cpu.c ramstage-y += chip.c ramstage-y += cse.c ramstage-y += elog.c -ramstage-y += dsp.c ramstage-y += graphics.c ramstage-y += heci.c ramstage-y += i2c.c diff --git a/src/soc/intel/apollolake/dsp.c b/src/soc/intel/apollolake/dsp.c deleted file mode 100644 index 76547eef6c..0000000000 --- a/src/soc/intel/apollolake/dsp.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2016 Google Inc. - * - * 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 <device/device.h> -#include <device/pci.h> -#include <device/pci_ids.h> - -static struct device_operations dsp_dev_ops = { - .read_resources = &pci_dev_read_resources, - .set_resources = &pci_dev_set_resources, - .enable_resources = &pci_dev_enable_resources, - .scan_bus = &scan_static_bus, -}; - -static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_APL_AUDIO, - PCI_DEVICE_ID_INTEL_GLK_AUDIO, - 0, -}; - -static const struct pci_driver apollolake_dsp __pci_driver = { - .ops = &dsp_dev_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .devices = pci_device_ids, -}; |