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

Commit be2fc47c authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "kconfig: add config dependency in drm, v4l2 and snd drivers"

parents 89ca22e0 efaecfac

drivers/gpu/drm/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ menuconfig DRM 


config DRM_MIPI_DSI

	bool

	depends on DRM

	default y if DRM



config DRM_DP_AUX_CHARDEV

	bool "DRM DP AUX Interface"
@@ -68,7 +68,7 @@ config DRM_DEBUG_SELFTEST 


config DRM_KMS_HELPER

	tristate

	depends on DRM

	default y if DRM

	help

	  CRTC helpers for KMS drivers.

drivers/media/v4l2-core/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ config VIDEO_TUNER 
# Used by drivers that need v4l2-mem2mem.ko

config V4L2_MEM2MEM_DEV

	tristate

	depends on VIDEOBUF2_CORE

	default y if ARCH_QCOM && VIDEO_V4L2



# Used by LED subsystem flash drivers

config V4L2_FLASH_LED_CLASS

drivers/platform/msm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ menu "Qualcomm technologies inc. MSM specific device drivers" 


config MSM_EXT_DISPLAY

	bool "MSM External Display Driver"

	default y if ARCH_QCOM && DRM

	help

	  Enabling this option adds MSM External Display Driver.

	  External Display driver was added to support the communication

include/linux/msm_drm_notify.h

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

/*

 * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

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

 */

#ifndef _MSM_DRM_NOTIFY_H_

#define _MSM_DRM_NOTIFY_H_
@@ -32,6 +32,18 @@ struct msm_drm_notifier { 
	void *data;

};



#ifdef CONFIG_DRM_MSM

int msm_drm_register_client(struct notifier_block *nb);

int msm_drm_unregister_client(struct notifier_block *nb);

#else

static inline int msm_drm_register_client(struct notifier_block *nb)

{

	return 0;

}



static inline int msm_drm_unregister_client(struct notifier_block *nb)

{

	return 0;

}

#endif

#endif

sound/soc/codecs/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -582,6 +582,7 @@ config SND_SOC_HDMI_CODEC 
	select SND_PCM_ELD

	select SND_PCM_IEC958

	select HDMI

	default y if SND_SOC



config SND_SOC_ES7134

       tristate "Everest Semi ES7134 CODEC"