[4/5] UBUNTU: [Config] arm64: snapdragon: disable DRM_I2C_ADV7511_CEC

Message ID 1539186692-28644-5-git-send-email-paolo.pisati@canonical.com
State New
Headers show
Series
  • [1/5] UBUNTU: [Config] arm64: snapdragon: DRM_MSM=m
Related show

Commit Message

Paolo Pisati Oct. 10, 2018, 3:51 p.m.
BugLink: https://bugs.launchpad.net/bugs/1797154

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
---
 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(-)

Patch

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index e9beda91e1b3..ff3d1b4760b7 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -59,7 +59,6 @@  CONFIG_CAIF=m
 CONFIG_CAN=m
 CONFIG_CB710_CORE=m
 CONFIG_CDROM_PKTCDVD=m
-CONFIG_CEC_CORE=m
 CONFIG_CMDLINE_PARTITION=y
 CONFIG_CRAMFS=m
 CONFIG_CRYPTO_DEFLATE=y
diff --git a/debian.master/config/arm64/config.flavour.generic b/debian.master/config/arm64/config.flavour.generic
index c8a4b2cd8687..b64f12d03458 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 7275dbd5d4ef..a7fd65e170f0 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 bb34e1c628d2..1820b01b4fe5 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -59,7 +59,6 @@  CONFIG_CAIF=m
 CONFIG_CAN=m
 CONFIG_CB710_CORE=m
 CONFIG_CDROM_PKTCDVD=m
-CONFIG_CEC_CORE=m
 CONFIG_CMDLINE=""
 CONFIG_CMDLINE_PARTITION=y
 CONFIG_COMMON_CLK_QCOM=m
@@ -76,6 +75,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_DRM_PANEL_ORIENTATION_QUIRKS=y
 CONFIG_DRM_RCAR_LVDS=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 18e929c41635..9767fe50b50c 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1295,6 +1295,7 @@  CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=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
@@ -2357,7 +2358,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_TDA9950=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index ef5247f98023..e8f1a6d3c518 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -57,7 +57,6 @@  CONFIG_CAIF=m
 CONFIG_CAN=m
 CONFIG_CB710_CORE=m
 CONFIG_CDROM_PKTCDVD=m
-CONFIG_CEC_CORE=m
 CONFIG_CMDLINE_PARTITION=y
 CONFIG_CRAMFS=m
 CONFIG_CRYPTO_DEFLATE=y
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 4eae101b324b..33e2fc125467 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -55,7 +55,6 @@  CONFIG_CAIF=m
 CONFIG_CAN=m
 CONFIG_CB710_CORE=m
 CONFIG_CDROM_PKTCDVD=m
-CONFIG_CEC_CORE=m
 CONFIG_CMDLINE_PARTITION=y
 CONFIG_CMM=m
 # CONFIG_CPU_BIG_ENDIAN is not set
@@ -71,6 +70,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_DRM_PANEL_ORIENTATION_QUIRKS=m
 # CONFIG_DRM_RCAR_LVDS is not set