Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d33c2dc authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: msmtitanium: Enable MDSS and MDSS PLL driver"

parents ee1f599a c4432a00

arch/arm/configs/msmcortex-perf_defconfig

+4 −3
Original line number Diff line number Diff line
@@ -388,7 +388,9 @@ CONFIG_MSM_KGSL=y 
CONFIG_FB=y

CONFIG_FB_VIRTUAL=y

CONFIG_FB_MSM=y

CONFIG_FB_MSM_MDP_NONE=y

CONFIG_FB_MSM_MDSS=y

CONFIG_FB_MSM_MDSS_WRITEBACK=y

CONFIG_FB_MSM_MDSS_HDMI_PANEL=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_SOUND=y

CONFIG_SND=y
@@ -459,8 +461,6 @@ CONFIG_ANDROID_BINDER_IPC=y 
CONFIG_ASHMEM=y

CONFIG_ANDROID_TIMED_GPIO=y

CONFIG_ANDROID_LOW_MEMORY_KILLER=y

CONFIG_SYNC=y

CONFIG_SW_SYNC=y

CONFIG_SW_SYNC_USER=y

CONFIG_ION=y

CONFIG_ION_MSM=y
@@ -519,6 +519,7 @@ CONFIG_MSM_CORE_CTL_HELPER=y 
CONFIG_MSM_BAM_DMUX=y

CONFIG_MEM_SHARE_QMI_SERVICE=y

CONFIG_MSM_CLK_CONTROLLER_V2=y

CONFIG_MSM_MDSS_PLL=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MSM_IOMMU_V1=y

CONFIG_ARM_SMMU=y

arch/arm/configs/msmcortex_defconfig

+4 −3
Original line number Diff line number Diff line
@@ -377,7 +377,9 @@ CONFIG_MSM_KGSL=y 
CONFIG_FB=y

CONFIG_FB_VIRTUAL=y

CONFIG_FB_MSM=y

CONFIG_FB_MSM_MDP_NONE=y

CONFIG_FB_MSM_MDSS=y

CONFIG_FB_MSM_MDSS_WRITEBACK=y

CONFIG_FB_MSM_MDSS_HDMI_PANEL=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

# CONFIG_LCD_CLASS_DEVICE is not set

CONFIG_BACKLIGHT_CLASS_DEVICE=y
@@ -456,8 +458,6 @@ CONFIG_ANDROID_BINDER_IPC=y 
CONFIG_ASHMEM=y

CONFIG_ANDROID_TIMED_GPIO=y

CONFIG_ANDROID_LOW_MEMORY_KILLER=y

CONFIG_SYNC=y

CONFIG_SW_SYNC=y

CONFIG_SW_SYNC_USER=y

CONFIG_ION=y

CONFIG_ION_MSM=y
@@ -519,6 +519,7 @@ CONFIG_MSM_BAM_DMUX=y 
CONFIG_MSM_PERFORMANCE=y

CONFIG_MEM_SHARE_QMI_SERVICE=y

CONFIG_MSM_CLK_CONTROLLER_V2=y

CONFIG_MSM_MDSS_PLL=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MSM_IOMMU=y

CONFIG_ARM_SMMU=y