UBUNTU: [Config] snapdragon: DRM_I2C_ADV7511=y

BugLink: http://bugs.launchpad.net/bugs/1768761
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
Acked-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/debian.master/abi/4.15.0-22.24/arm64/snapdragon.modules b/debian.master/abi/4.15.0-22.24/arm64/snapdragon.modules
index ae97cc2e64c7b3b382351c27bb723b632f450200..9658cc3deab4e81107a189683ca2f83d1c26a5b9 100644 (file)
--- a/debian.master/abi/4.15.0-22.24/arm64/snapdragon.modules
+++ b/debian.master/abi/4.15.0-22.24/arm64/snapdragon.modules
@@ -210,7 +210,6 @@ adutux
 adv7170
 adv7175
 adv7511
-adv7511_drm
 adv7604
 adv7842
 adv_pci1710
@@ -651,7 +650,6 @@ cdc_ether
 cdc_mbim
 cdc_ncm
 cdc_subset
-cec
 ceph
 cfg80211
 cfi_cmdset_0001

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index b5a1e219d5524b537e08951063dee2b91e31e78d..74bdfcef30cc55f4e661d61c8cda9f77875b081d 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -73,6 +73,7 @@ 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 80f7e244ca1ac501b154cc7e186108b78441fad9..d57a37e00066df33d174f5f8b5c0bc46cb1cd531 100644 (file)
--- a/debian.master/config/arm64/config.flavour.generic
+++ b/debian.master/config/arm64/config.flavour.generic
@@ -3,8 +3,10 @@
 #
 CONFIG_AC97_BUS=m
 # CONFIG_ADV7511_SNAPDRAGON_HACKS is not set
+CONFIG_CEC_CORE=m
 CONFIG_COMMON_CLK_QCOM=m
 CONFIG_DRM=m
+CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_KMS_HELPER=m
 CONFIG_DRM_MSM=m
 CONFIG_FB_SYS_COPYAREA=m

diff --git a/debian.master/config/arm64/config.flavour.snapdragon b/debian.master/config/arm64/config.flavour.snapdragon
index 40a6c62f92e60a05227ff2446068134fee94a31e..cef01ad278618a3aaecc2f872a6ef181d8d98342 100644 (file)
--- a/debian.master/config/arm64/config.flavour.snapdragon
+++ b/debian.master/config/arm64/config.flavour.snapdragon
@@ -3,8 +3,10 @@
 #
 CONFIG_AC97_BUS=y
 CONFIG_ADV7511_SNAPDRAGON_HACKS=y
+CONFIG_CEC_CORE=y
 CONFIG_COMMON_CLK_QCOM=y
 CONFIG_DRM=y
+CONFIG_DRM_I2C_ADV7511=y
 CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_MSM=y
 CONFIG_FB_SYS_COPYAREA=y

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index b1a84534a018e0d0e894da74e09debae7985f3ce..6ae8ae5bf84d903b6a675f9339ee6bd36cac9c75 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -71,6 +71,7 @@ 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
@@ -90,6 +91,7 @@ CONFIG_DMA_VIRTUAL_CHANNELS=y
 # CONFIG_DM_MQ_DEFAULT is not set
 CONFIG_DNET=m
 CONFIG_DRM=m
+CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_KMS_HELPER=m
 CONFIG_DRM_MSM=m
 CONFIG_DUMMY_IRQ=m

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 5ff32cb997e9d7f79915cfc05423f4d34eecff0d..ceb13375aed74e7add40ba299e9acf0850de9f96 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1263,7 +1263,6 @@ 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
@@ -2278,7 +2277,6 @@ CONFIG_DRM_HDLCD=m
 # CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
 CONFIG_DRM_HISI_HIBMC=m
 CONFIG_DRM_HISI_KIRIN=m
-CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_I2C_ADV7511_AUDIO=y
 CONFIG_DRM_I2C_ADV7511_CEC=y
 CONFIG_DRM_I2C_ADV7533=y

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 34d5ed297fcee409735d5539dd4415af35bea77e..3d4f6adf0b33942d5e30e830b7563174dba22587 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -70,6 +70,7 @@ 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 6c55c7dfa9f69c4ae806531d2f7ea2c9a9ad8fb4..02bb780f57a848650249ed99a37434777b83766e 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -68,6 +68,7 @@ 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
@@ -87,6 +88,7 @@ CONFIG_DMA_VIRTUAL_CHANNELS=m
 # CONFIG_DM_MQ_DEFAULT is not set
 CONFIG_DNET=m
 CONFIG_DRM=m
+CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_KMS_HELPER=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_DW_WATCHDOG=m