From ae497268daaecee57cb46389e4f3076259248605 Mon Sep 17 00:00:00 2001 From: Paolo Pisati Date: Wed, 10 Oct 2018 17:32:50 +0200 Subject: [PATCH] UBUNTU: [Config] arm64: snapdragon: disable DRM_I2C_ADV7511_CEC BugLink: https://bugs.launchpad.net/bugs/1797154 Signed-off-by: Paolo Pisati Acked-by: Stefan Bader Acked-by: Colin Ian King Signed-off-by: Khalid Elmously --- debian.master/config/amd64/config.common.amd64 | 1 - debian.master/config/arm64/config.flavour.generic | 2 +- debian.master/config/arm64/config.flavour.snapdragon | 2 +- debian.master/config/armhf/config.common.armhf | 2 +- debian.master/config/config.common.ubuntu | 2 +- debian.master/config/i386/config.common.i386 | 1 - debian.master/config/ppc64el/config.common.ppc64el | 2 +- 7 files changed, 5 insertions(+), 7 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index db1ba8e86711..173b6f777b63 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -73,7 +73,6 @@ CONFIG_CAN=m CONFIG_CB710_CORE=m CONFIG_CC_STACKPROTECTOR=y CONFIG_CDROM_PKTCDVD=m -CONFIG_CEC_CORE=m CONFIG_CHASH=m CONFIG_CMDLINE_PARTITION=y CONFIG_CRAMFS=m diff --git a/debian.master/config/arm64/config.flavour.generic b/debian.master/config/arm64/config.flavour.generic index 58ab73d46b33..c09c6c6e8131 100644 --- a/debian.master/config/arm64/config.flavour.generic +++ b/debian.master/config/arm64/config.flavour.generic @@ -3,10 +3,10 @@ # # CONFIG_ADV7511_SNAPDRAGON_HACKS is not set CONFIG_ARM_SDE_INTERFACE=y -CONFIG_CEC_CORE=m CONFIG_COMMON_CLK_QCOM=m CONFIG_DRM=m CONFIG_DRM_I2C_ADV7511=m +CONFIG_DRM_I2C_ADV7511_CEC=y CONFIG_DRM_KMS_HELPER=m CONFIG_FB_SYS_COPYAREA=m CONFIG_FB_SYS_FILLRECT=m diff --git a/debian.master/config/arm64/config.flavour.snapdragon b/debian.master/config/arm64/config.flavour.snapdragon index 74daeba882ca..30c744bf18ea 100644 --- a/debian.master/config/arm64/config.flavour.snapdragon +++ b/debian.master/config/arm64/config.flavour.snapdragon @@ -3,10 +3,10 @@ # CONFIG_ADV7511_SNAPDRAGON_HACKS=y # CONFIG_ARM_SDE_INTERFACE is not set -CONFIG_CEC_CORE=y CONFIG_COMMON_CLK_QCOM=y CONFIG_DRM=y CONFIG_DRM_I2C_ADV7511=y +# CONFIG_DRM_I2C_ADV7511_CEC is not set CONFIG_DRM_KMS_HELPER=y CONFIG_FB_SYS_COPYAREA=y CONFIG_FB_SYS_FILLRECT=y diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 7f8f061fcb16..7815e0e97362 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -71,7 +71,6 @@ CONFIG_CAN=m CONFIG_CB710_CORE=m CONFIG_CC_STACKPROTECTOR=y CONFIG_CDROM_PKTCDVD=m -CONFIG_CEC_CORE=m CONFIG_CHASH=m CONFIG_CMDLINE="" CONFIG_CMDLINE_PARTITION=y @@ -92,6 +91,7 @@ CONFIG_DMA_VIRTUAL_CHANNELS=y CONFIG_DNET=m CONFIG_DRM=m CONFIG_DRM_I2C_ADV7511=m +CONFIG_DRM_I2C_ADV7511_CEC=y CONFIG_DRM_KMS_HELPER=m CONFIG_DUMMY_IRQ=m CONFIG_DW_WATCHDOG=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 3a4f7d3f19a2..5fc4aab9833d 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -1266,6 +1266,7 @@ CONFIG_CC_STACKPROTECTOR_STRONG=y CONFIG_CDROM=y CONFIG_CDROM_PKTCDVD_BUFFERS=8 # CONFIG_CDROM_PKTCDVD_WCACHE is not set +CONFIG_CEC_CORE=m CONFIG_CEC_GPIO=m CONFIG_CEC_NOTIFIER=y CONFIG_CEC_PIN=y @@ -2281,7 +2282,6 @@ CONFIG_DRM_HDLCD=m CONFIG_DRM_HISI_HIBMC=m CONFIG_DRM_HISI_KIRIN=m CONFIG_DRM_I2C_ADV7511_AUDIO=y -CONFIG_DRM_I2C_ADV7511_CEC=y CONFIG_DRM_I2C_ADV7533=y CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 1ed8561c6075..0c9330e31315 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -70,7 +70,6 @@ CONFIG_CAN=m CONFIG_CB710_CORE=m CONFIG_CC_STACKPROTECTOR=y CONFIG_CDROM_PKTCDVD=m -CONFIG_CEC_CORE=m CONFIG_CHASH=m CONFIG_CMDLINE_PARTITION=y CONFIG_CRAMFS=m diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index 7e502013a001..918f2bc39ac9 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -68,7 +68,6 @@ CONFIG_CAN=m CONFIG_CB710_CORE=m # CONFIG_CC_STACKPROTECTOR is not set CONFIG_CDROM_PKTCDVD=m -CONFIG_CEC_CORE=m CONFIG_CHASH=m CONFIG_CMDLINE_PARTITION=y CONFIG_CMM=m @@ -89,6 +88,7 @@ CONFIG_DMA_VIRTUAL_CHANNELS=m CONFIG_DNET=m CONFIG_DRM=m CONFIG_DRM_I2C_ADV7511=m +CONFIG_DRM_I2C_ADV7511_CEC=y CONFIG_DRM_KMS_HELPER=m CONFIG_DUMMY_IRQ=m CONFIG_DW_WATCHDOG=m -- 2.39.2