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

Commit 52405db9 authored by Gurram Pravalika's avatar Gurram Pravalika Committed by Gerrit - the friendly Code Review server
Browse files

defconfig: sdm660 : Add defconfig changes for camera 



1. Enable the camera components.
2. remove unused rpm rpm_vreg_create_debugfs function.

Change-Id: I9b724437db75b9b389b649fe5b01cffb1a072727
Signed-off-by: default avatarGurram Pravalika <gpravali@codeaurora.org>
parent a89210c1

arch/arm64/configs/vendor/sdm660_defconfig

+20 −2
Original line number Diff line number Diff line
@@ -437,6 +437,26 @@ CONFIG_USB_VIDEO_CLASS=y 
CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_MSM_VIDC_3X_GOVERNORS=y

CONFIG_MSM_VIDC_3X_V4L2=y

CONFIG_MSM_CAMERA=y

CONFIG_MSM_CAMERA_DEBUG=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_MSM_DUAL_ISP_SYNC=y

CONFIG_MSM_V4L2_VIDEO_OVERLAY_DEVICE=y

CONFIG_MSMB_JPEG=y

CONFIG_MSM_FD=y

CONFIG_MSM_JPEGDMA=y

CONFIG_DVB_MPQ=m

CONFIG_DVB_MPQ_DEMUX=m

CONFIG_FB=y
@@ -515,8 +535,6 @@ CONFIG_MMC_SDHCI_PLTFM=y 
CONFIG_MMC_SDHCI_MSM=y

CONFIG_MMC_CQHCI_CRYPTO=y

CONFIG_MMC_CQHCI_CRYPTO_QTI=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_QTI_TRI_LED=y

CONFIG_LEDS_QPNP_FLASH_V2=y

CONFIG_EDAC=y

drivers/media/platform/msm/Kconfig

+30 −0
Original line number Diff line number Diff line
@@ -11,6 +11,26 @@ menuconfig SPECTRA_CAMERA 


source "drivers/media/platform/msm/vidc_3x/Kconfig"



menuconfig MSM_CAMERA

     bool "QTI MSM camera and video capture support"

     depends on ARCH_QCOM && VIDEO_V4L2 && I2C

     help

       Say Y here to enable selecting the video adapters for

       QTI msm camera and video capture drivers. enabling this

       adds support for the camera driver stack including sensor, isp

       and postprocessing drivers for legacy chipsets.



config MSM_CAMERA_DEBUG

     bool "QTI MSM camera debugging with printk"

     depends on MSM_CAMERA

     default n

     help

       Say Y here to enable selecting the video adapters for

       QTI msm camera and video capture drivers. enabling this

       adds support for the camera driver stack including sensor, isp

       and postprocessing drivers for legacy chipsets.

       Enable printk() debug for msm camera.



menuconfig MSMB_CAMERA

     bool "QTI MSM camera and video capture 2.0 support"

     depends on ARCH_QCOM && VIDEO_V4L2 && I2C
@@ -20,6 +40,16 @@ menuconfig MSMB_CAMERA 
       adds support for the camera driver stack including sensor, isp

       and postprocessing drivers.



config MSMB_CAMERA_DEBUG

     bool "QTI MSM camera 2.0 debugging with printk"

     depends on MSMB_CAMERA

     help

       Say Y here to enable selecting the video adapters for

       QTI msm camera and video capture 2.0, enabling this

       adds support for the camera driver stack including sensor, isp

       and postprocessing drivers.

       Enable printk() debug for msm camera 2.0.



if MSMB_CAMERA

       source "drivers/media/platform/msm/camera_v2/Kconfig"

endif # MSMB_CAMERA

include/linux/regulator/rpm-smd-regulator.h

+1 −12
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/* Copyright (c) 2012-2013, 2015, 2017, 2019, The Linux Foundation. All rights reserved. */

/* Copyright (c) 2012-2013, 2015, 2017, 2020, The Linux Foundation. All rights reserved. */



#ifndef _LINUX_REGULATOR_RPM_SMD_H

#define _LINUX_REGULATOR_RPM_SMD_H
@@ -120,15 +120,4 @@ static inline int rpm_regulator_set_mode(struct rpm_regulator *regulator, 
static inline int __init rpm_smd_regulator_driver_init(void) { return 0; }



#endif /* CONFIG_REGULATOR_RPM_SMD */



#ifdef CONFIG_DEBUG_FS



static void rpm_vreg_create_debugfs(struct rpm_regulator *reg);



#else



static inline void rpm_vreg_create_debugfs(struct rpm_regulator *reg)

{

}

#endif

#endif