From 6587458f254fb35a688520b68f69f8ae0dc71ee8 Mon Sep 17 00:00:00 2001 From: Stefan Bader Date: Mon, 2 May 2022 11:55:39 +0200 Subject: [PATCH 1/1] Revert "UBUNTU: [Config] ivsc: enable Intel VSC drivers" BugLink: https://bugs.launchpad.net/bugs/1955383 This reverts commit a0e11594ce1fedd1f54a2a2ef0859d09f0a28a96. Signed-off-by: Stefan Bader --- debian.master/config/amd64/config.common.amd64 | 4 ---- debian.master/config/arm64/config.common.arm64 | 4 ---- debian.master/config/armhf/config.common.armhf | 4 ---- debian.master/config/config.common.ubuntu | 6 ------ debian.master/config/ppc64el/config.common.ppc64el | 4 ---- debian.master/config/s390x/config.common.s390x | 3 --- 6 files changed, 25 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 874043455d42..85e93d39da4d 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -274,9 +274,6 @@ CONFIG_INPUT_SPARSEKMAP=m CONFIG_INPUT_TABLET=y CONFIG_INPUT_TOUCHSCREEN=y CONFIG_INTEL_LPSS_USB=m -CONFIG_INTEL_VSC=m -CONFIG_INTEL_VSC_ACE_DEBUG=m -CONFIG_INTEL_VSC_PSE=m CONFIG_INTERCONNECT=y CONFIG_IOMMU_DEFAULT_DMA_LAZY=y # CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set @@ -341,7 +338,6 @@ CONFIG_MFD_INTEL_PMT=m CONFIG_MFD_IQS62X=m CONFIG_MFD_JANZ_CMODIO=m CONFIG_MFD_KEMPLD=m -CONFIG_MFD_LJCA=m CONFIG_MFD_LM3533=m CONFIG_MFD_LP3943=m CONFIG_MFD_MADERA=m diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 98c3f7c64fa0..1a1a381c6761 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -288,9 +288,6 @@ CONFIG_INPUT_SPARSEKMAP=m CONFIG_INPUT_TABLET=y CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_INTEL_LPSS_USB is not set -# CONFIG_INTEL_VSC is not set -# CONFIG_INTEL_VSC_ACE_DEBUG is not set -# CONFIG_INTEL_VSC_PSE is not set CONFIG_INTERCONNECT=y # CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set CONFIG_IOMMU_DEFAULT_DMA_STRICT=y @@ -355,7 +352,6 @@ CONFIG_MFD_INTEL_PMT=m CONFIG_MFD_IQS62X=m CONFIG_MFD_JANZ_CMODIO=m CONFIG_MFD_KEMPLD=m -# CONFIG_MFD_LJCA is not set CONFIG_MFD_LM3533=m CONFIG_MFD_LP3943=m CONFIG_MFD_MADERA=m diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index d43db3b32c66..418751dbe97b 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -282,9 +282,6 @@ CONFIG_INPUT_SPARSEKMAP=m CONFIG_INPUT_TABLET=y CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_INTEL_LPSS_USB is not set -# CONFIG_INTEL_VSC is not set -# CONFIG_INTEL_VSC_ACE_DEBUG is not set -# CONFIG_INTEL_VSC_PSE is not set CONFIG_INTERCONNECT=y # CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set CONFIG_IOMMU_DEFAULT_DMA_STRICT=y @@ -347,7 +344,6 @@ CONFIG_MFD_INTEL_PMT=m CONFIG_MFD_IQS62X=m CONFIG_MFD_JANZ_CMODIO=m CONFIG_MFD_KEMPLD=m -# CONFIG_MFD_LJCA is not set CONFIG_MFD_LM3533=m CONFIG_MFD_LP3943=m CONFIG_MFD_MADERA=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 67d7ee7fcbf3..e3d54072eae4 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3978,7 +3978,6 @@ CONFIG_GPIO_ICH=m CONFIG_GPIO_IT87=m CONFIG_GPIO_JANZ_TTL=m CONFIG_GPIO_KEMPLD=m -CONFIG_GPIO_LJCA=m CONFIG_GPIO_LOGICVC=m CONFIG_GPIO_LP3943=m CONFIG_GPIO_LP873X=m @@ -4593,7 +4592,6 @@ CONFIG_I2C_HIX5HD2=m CONFIG_I2C_IMX_LPI2C=m CONFIG_I2C_ISMT=m CONFIG_I2C_KEMPLD=m -CONFIG_I2C_LJCA=m CONFIG_I2C_MESON=m CONFIG_I2C_MLXBF=m CONFIG_I2C_MLXCPLD=m @@ -4999,7 +4997,6 @@ CONFIG_INTEL_MEI=m CONFIG_INTEL_MEI_HDCP=m CONFIG_INTEL_MEI_ME=m CONFIG_INTEL_MEI_TXE=m -CONFIG_INTEL_MEI_VSC=m CONFIG_INTEL_MEI_WDT=m CONFIG_INTEL_MENLOW=m CONFIG_INTEL_MRFLD_ADC=m @@ -5048,8 +5045,6 @@ CONFIG_INTEL_TURBO_MAX_3=y CONFIG_INTEL_TXT=y CONFIG_INTEL_UNCORE_FREQ_CONTROL=m CONFIG_INTEL_VBTN=m -CONFIG_INTEL_VSC_ACE=m -CONFIG_INTEL_VSC_CSI=m CONFIG_INTEL_WMI=y CONFIG_INTEL_WMI_SBL_FW_UPDATE=m CONFIG_INTEL_WMI_THUNDERBOLT=m @@ -10685,7 +10680,6 @@ CONFIG_SPI_IMX=m # CONFIG_SPI_INTEL_SPI_PCI is not set # CONFIG_SPI_INTEL_SPI_PLATFORM is not set CONFIG_SPI_LANTIQ_SSC=m -CONFIG_SPI_LJCA=m CONFIG_SPI_LM70_LLP=m CONFIG_SPI_LOOPBACK_TEST=m CONFIG_SPI_MASTER=y diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index 004fed25a8f2..e56b319b01ff 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -280,9 +280,6 @@ CONFIG_INPUT_SPARSEKMAP=m CONFIG_INPUT_TABLET=y CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_INTEL_LPSS_USB is not set -# CONFIG_INTEL_VSC is not set -# CONFIG_INTEL_VSC_ACE_DEBUG is not set -# CONFIG_INTEL_VSC_PSE is not set CONFIG_INTERCONNECT=y # CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set CONFIG_IOMMU_DEFAULT_DMA_STRICT=y @@ -349,7 +346,6 @@ CONFIG_MFD_INTEL_PMT=m CONFIG_MFD_IQS62X=m CONFIG_MFD_JANZ_CMODIO=m CONFIG_MFD_KEMPLD=m -# CONFIG_MFD_LJCA is not set CONFIG_MFD_LM3533=m CONFIG_MFD_LP3943=m CONFIG_MFD_MADERA=m diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index 54ccf042ea16..7bec8565614e 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -257,9 +257,6 @@ CONFIG_IMA_NG_TEMPLATE=y # CONFIG_INPUT_SPARSEKMAP is not set # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set -# CONFIG_INTEL_VSC is not set -# CONFIG_INTEL_VSC_ACE_DEBUG is not set -# CONFIG_INTEL_VSC_PSE is not set # CONFIG_INTERCONNECT is not set # CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set CONFIG_IOMMU_DEFAULT_DMA_STRICT=y -- 2.39.5