From 43c26cb07fa42e6d5013f2e6bcb4e05522d24c1b Mon Sep 17 00:00:00 2001 From: Marshall Dawson Date: Fri, 3 May 2019 12:42:29 -0600 Subject: soc/amd/stoneyridge: Move hda.c to common BUG=b:131682806 Change-Id: I1aa869584fd6743101c07a6a508abff6426df18d Signed-off-by: Marshall Dawson Reviewed-on: https://review.coreboot.org/c/coreboot/+/32656 Reviewed-by: Furquan Shaikh Reviewed-by: Richard Spiegel Tested-by: build bot (Jenkins) --- src/soc/amd/common/block/hda/Kconfig | 6 +++++ src/soc/amd/common/block/hda/Makefile.inc | 1 + src/soc/amd/common/block/hda/hda.c | 42 ++++++++++++++++++++++++++++++ src/soc/amd/stoneyridge/Kconfig | 1 + src/soc/amd/stoneyridge/Makefile.inc | 1 - src/soc/amd/stoneyridge/hda.c | 43 ------------------------------- 6 files changed, 50 insertions(+), 44 deletions(-) create mode 100644 src/soc/amd/common/block/hda/Kconfig create mode 100644 src/soc/amd/common/block/hda/Makefile.inc create mode 100644 src/soc/amd/common/block/hda/hda.c delete mode 100644 src/soc/amd/stoneyridge/hda.c (limited to 'src/soc') diff --git a/src/soc/amd/common/block/hda/Kconfig b/src/soc/amd/common/block/hda/Kconfig new file mode 100644 index 0000000000..775de2fd8c --- /dev/null +++ b/src/soc/amd/common/block/hda/Kconfig @@ -0,0 +1,6 @@ +config SOC_AMD_COMMON_BLOCK_HDA + bool + default n + help + Select this option to use AMD common High Definition Audio + driver support. diff --git a/src/soc/amd/common/block/hda/Makefile.inc b/src/soc/amd/common/block/hda/Makefile.inc new file mode 100644 index 0000000000..d6f1b3275a --- /dev/null +++ b/src/soc/amd/common/block/hda/Makefile.inc @@ -0,0 +1 @@ +ramstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_HDA) += hda.c diff --git a/src/soc/amd/common/block/hda/hda.c b/src/soc/amd/common/block/hda/hda.c new file mode 100644 index 0000000000..f4ea732fba --- /dev/null +++ b/src/soc/amd/common/block/hda/hda.c @@ -0,0 +1,42 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2010 Advanced Micro Devices, 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 +#include +#include +#include + +static const unsigned short pci_device_ids[] = { + PCI_DEVICE_ID_AMD_SB900_HDA, + PCI_DEVICE_ID_AMD_CZ_HDA, + 0 +}; + +static struct pci_operations lops_pci = { + .set_subsystem = pci_dev_set_subsystem, +}; + +static struct device_operations hda_audio_ops = { + .read_resources = pci_dev_read_resources, + .set_resources = pci_dev_set_resources, + .enable_resources = pci_dev_enable_resources, + .ops_pci = &lops_pci, +}; + +static const struct pci_driver hdaaudio_driver __pci_driver = { + .ops = &hda_audio_ops, + .vendor = PCI_VENDOR_ID_AMD, + .devices = pci_device_ids, +}; diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig index ed9aaf05ba..d386012a86 100644 --- a/src/soc/amd/stoneyridge/Kconfig +++ b/src/soc/amd/stoneyridge/Kconfig @@ -51,6 +51,7 @@ config CPU_SPECIFIC_OPTIONS select SOC_AMD_COMMON_BLOCK_ACPI select SOC_AMD_COMMON_BLOCK_LPC select SOC_AMD_COMMON_BLOCK_PCI + select SOC_AMD_COMMON_BLOCK_HDA select SOC_AMD_COMMON_BLOCK_PI select SOC_AMD_COMMON_BLOCK_PSP select SOC_AMD_COMMON_BLOCK_CAR diff --git a/src/soc/amd/stoneyridge/Makefile.inc b/src/soc/amd/stoneyridge/Makefile.inc index e235adaab2..7c4e875130 100644 --- a/src/soc/amd/stoneyridge/Makefile.inc +++ b/src/soc/amd/stoneyridge/Makefile.inc @@ -99,7 +99,6 @@ ramstage-y += mca.c ramstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi.c ramstage-y += gpio.c -ramstage-y += hda.c ramstage-y += iommu.c ramstage-y += monotonic_timer.c ramstage-y += southbridge.c diff --git a/src/soc/amd/stoneyridge/hda.c b/src/soc/amd/stoneyridge/hda.c deleted file mode 100644 index 0ab2f91ee7..0000000000 --- a/src/soc/amd/stoneyridge/hda.c +++ /dev/null @@ -1,43 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2010 Advanced Micro Devices, 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 -#include -#include -#include -#include - -static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_AMD_SB900_HDA, - PCI_DEVICE_ID_AMD_CZ_HDA, - 0 -}; - -static struct pci_operations lops_pci = { - .set_subsystem = pci_dev_set_subsystem, -}; - -static struct device_operations hda_audio_ops = { - .read_resources = pci_dev_read_resources, - .set_resources = pci_dev_set_resources, - .enable_resources = pci_dev_enable_resources, - .ops_pci = &lops_pci, -}; - -static const struct pci_driver hdaaudio_driver __pci_driver = { - .ops = &hda_audio_ops, - .vendor = PCI_VENDOR_ID_AMD, - .devices = pci_device_ids, -}; -- cgit v1.2.3