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

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

Merge "defconfig: titanium: Enable camera modules for perf and nonperf"

parents 0c1b28f2 7ddb36e7

arch/arm/configs/msmcortex-perf_defconfig

+25 −2
Original line number Diff line number Diff line
@@ -358,6 +358,31 @@ CONFIG_SOC_CAMERA=y 
CONFIG_SOC_CAMERA_PLATFORM=y

CONFIG_MSM_VIDC_V4L2=y

CONFIG_MSM_VIDC_GOVERNORS=y

CONFIG_MSM_CAMERA=y

CONFIG_MSMB_CAMERA=y

CONFIG_MSM_CAMERA_SENSOR=y

CONFIG_MSM_CPP=y

CONFIG_MSM_CCI=y

CONFIG_MSM_CSI20_HEADER=y

CONFIG_MSM_CSI22_HEADER=y

CONFIG_MSM_CSI30_HEADER=y

CONFIG_MSM_CSI31_HEADER=y

CONFIG_MSM_CSIPHY=y

CONFIG_MSM_CSID=y

CONFIG_MSM_EEPROM=y

CONFIG_MSM_ISPIF=y

CONFIG_IMX134=y

CONFIG_IMX132=y

CONFIG_OV9724=y

CONFIG_OV5648=y

CONFIG_GC0339=y

CONFIG_OV8825=y

CONFIG_OV8865=y

CONFIG_s5k4e1=y

CONFIG_OV12830=y

CONFIG_MSM_V4L2_VIDEO_OVERLAY_DEVICE=y

CONFIG_MSMB_JPEG=y

CONFIG_MSM_FD=y

CONFIG_RADIO_SILABS=y

CONFIG_MSM_KGSL=y

CONFIG_FB=y
@@ -415,8 +440,6 @@ CONFIG_MMC_TEST=m 
CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_QPNP=y

CONFIG_LEDS_QPNP_FLASH=y

CONFIG_LEDS_QPNP_WLED=y

arch/arm/configs/msmcortex_defconfig

+26 −2
Original line number Diff line number Diff line
@@ -346,6 +346,32 @@ CONFIG_SOC_CAMERA=y 
CONFIG_SOC_CAMERA_PLATFORM=y

CONFIG_MSM_VIDC_V4L2=y

CONFIG_MSM_VIDC_GOVERNORS=y

CONFIG_MSM_CAMERA=y

CONFIG_MSMB_CAMERA=y

CONFIG_MSMB_CAMERA_DEBUG=y

CONFIG_MSM_CAMERA_SENSOR=y

CONFIG_MSM_CPP=y

CONFIG_MSM_CCI=y

CONFIG_MSM_CSI20_HEADER=y

CONFIG_MSM_CSI22_HEADER=y

CONFIG_MSM_CSI30_HEADER=y

CONFIG_MSM_CSI31_HEADER=y

CONFIG_MSM_CSIPHY=y

CONFIG_MSM_CSID=y

CONFIG_MSM_EEPROM=y

CONFIG_MSM_ISPIF=y

CONFIG_IMX134=y

CONFIG_IMX132=y

CONFIG_OV9724=y

CONFIG_OV5648=y

CONFIG_GC0339=y

CONFIG_OV8825=y

CONFIG_OV8865=y

CONFIG_s5k4e1=y

CONFIG_OV12830=y

CONFIG_MSM_V4L2_VIDEO_OVERLAY_DEVICE=y

CONFIG_MSMB_JPEG=y

CONFIG_MSM_FD=y

CONFIG_RADIO_SILABS=y

CONFIG_MSM_KGSL=y

CONFIG_FB=y
@@ -411,8 +437,6 @@ CONFIG_MMC_TEST=m 
CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_QPNP=y

CONFIG_LEDS_QPNP_FLASH=y

CONFIG_LEDS_QPNP_WLED=y

arch/arm64/configs/msmcortex-perf_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -377,7 +377,6 @@ CONFIG_MSM_CSIPHY=y 
CONFIG_MSM_CSID=y

CONFIG_MSM_EEPROM=y

CONFIG_MSM_ISPIF=y

CONFIG_MSM_ISPIF_V2=y

CONFIG_IMX134=y

CONFIG_IMX132=y

CONFIG_OV9724=y

arch/arm64/configs/msmcortex_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ CONFIG_MSM_CSI31_HEADER=y 
CONFIG_MSM_CSIPHY=y

CONFIG_MSM_CSID=y

CONFIG_MSM_EEPROM=y

CONFIG_MSM_ISPIF_V2=y

CONFIG_MSM_ISPIF=y

CONFIG_IMX134=y

CONFIG_IMX132=y

CONFIG_OV9724=y