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

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

Merge "drivers: mfd: Add support for wcd9xxx core module"

parents cee27b0e eea1836b

arch/arm64/configs/sdm845-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -366,6 +366,7 @@ CONFIG_SND=y 
CONFIG_SND_USB_AUDIO=y

CONFIG_SND_USB_AUDIO_QMI=y

CONFIG_SND_SOC=y

CONFIG_SND_SOC_MACHINE_SDM845=y

CONFIG_SND_SOC_SDM845=y

CONFIG_UHID=y

CONFIG_HID_APPLE=y

arch/arm64/configs/sdm845_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -373,6 +373,7 @@ CONFIG_SND=y 
CONFIG_SND_USB_AUDIO=y

CONFIG_SND_USB_AUDIO_QMI=y

CONFIG_SND_SOC=y

CONFIG_SND_SOC_MACHINE_SDM845=y

CONFIG_SND_SOC_SDM845=y

CONFIG_UHID=y

CONFIG_HID_APPLE=y

drivers/cpuidle/lpm-levels.c

+6 −0
Original line number Diff line number Diff line
@@ -133,10 +133,16 @@ module_param_named(print_parsed_dt, print_parsed_dt, bool, 0664); 
static bool sleep_disabled;

module_param_named(sleep_disabled, sleep_disabled, bool, 0664);



/**

 * msm_cpuidle_get_deep_idle_latency - Get deep idle latency value

 *

 * Returns an s32 latency value

 */

s32 msm_cpuidle_get_deep_idle_latency(void)

{

	return 10;

}

EXPORT_SYMBOL(msm_cpuidle_get_deep_idle_latency);



void lpm_suspend_wake_time(uint64_t wakeup_time)

{

drivers/mfd/Kconfig

+10 −9
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ menu "Multifunction device drivers" 
config MFD_CORE

	tristate

	select IRQ_DOMAIN

	default n

	default y



config MFD_CS5535

	tristate "AMD CS5535 and CS5536 southbridge core functions"
@@ -1636,11 +1636,16 @@ config MSM_CDC_SUPPLY 
	  power supply enable or disable. This driver acts as interface

	  between codec and regulator framework.



config WCD9XXX_CODEC_UTIL

	tristate "WCD9XXX Codec Utils"

	select MFD_CORE

config WCD9XXX_CODEC_CORE

	tristate "WCD9XXX Codec Core"

	select SLIMBUS

	select SOUNDWIRE_WCD_CTRL

	select MSM_CDC_SUPPLY

	select MSM_CDC_PINCTRL

	select REGMAP_ALLOW_WRITE_DEBUGFS

	select PINCTRL_WCD

	help

	  WCD9XXX Util driver provides APIs for WCD drivers to reset,

	  WCD9XXX Core driver provides APIs for WCD drivers to reset,

	  suspend/resume, regmap bus callback functions and read/write

	  functions. This driver also hides the underlying bus related

	  functionalities.
@@ -1649,8 +1654,6 @@ config WCD9335_CODEC 
	tristate "WCD9335 Codec"

	select SLIMBUS

	select SOUNDWIRE_WCD_CTRL

	select MFD_CORE

	select WCD9XXX_CODEC_UTIL

	select MSM_CDC_SUPPLY

	select MSM_CDC_PINCTRL

	select REGMAP_ALLOW_WRITE_DEBUGFS
@@ -1665,8 +1668,6 @@ config WCD934X_CODEC 
	tristate "WCD934X Codec"

	depends on SLIMBUS

	select SOUNDWIRE_WCD_CTRL

	select MFD_CORE

	select WCD9XXX_CODEC_UTIL

	select MSM_CDC_SUPPLY

	select MSM_CDC_PINCTRL

	select REGMAP_ALLOW_WRITE_DEBUGFS

drivers/mfd/Makefile

+7 −8
Original line number Diff line number Diff line
@@ -205,14 +205,13 @@ obj-$(CONFIG_MFD_HI655X_PMIC) += hi655x-pmic.o 
obj-$(CONFIG_MFD_DLN2)		+= dln2.o

obj-$(CONFIG_MFD_RT5033)	+= rt5033.o

obj-$(CONFIG_MFD_SKY81452)	+= sky81452.o

obj-$(CONFIG_MSM_CDC_PINCTRL)	+= msm-cdc-pinctrl.o

obj-$(CONFIG_MSM_CDC_SUPPLY) += msm-cdc-supply.o

obj-$(CONFIG_WCD9XXX_CODEC_UTIL) += wcd9xxx-utils.o

obj-$(CONFIG_WCD9335_CODEC)	+= wcd9xxx-core.o wcd9xxx-irq.o wcd9xxx-slimslave.o\

					wcd9335-regmap.o wcd9335-tables.o

obj-$(CONFIG_WCD934X_CODEC)	+= wcd9xxx-core.o wcd9xxx-irq.o wcd9xxx-slimslave.o\

					wcd934x-regmap.o wcd934x-tables.o



wcd-core-objs			:= wcd9xxx-rst.o wcd9xxx-core-init.o \

				   wcd9xxx-core.o wcd9xxx-irq.o \

				   wcd9xxx-slimslave.o wcd9xxx-utils.o \

				   wcd934x-regmap.o wcd934x-tables.o \

				   wcd9335-regmap.o wcd9335-tables.o \

				   msm-cdc-pinctrl.o msm-cdc-supply.o

obj-$(CONFIG_WCD934X_CODEC)	+= wcd-core.o

intel-soc-pmic-objs		:= intel_soc_pmic_core.o intel_soc_pmic_crc.o

intel-soc-pmic-$(CONFIG_INTEL_PMC_IPC)	+= intel_soc_pmic_bxtwc.o

obj-$(CONFIG_INTEL_SOC_PMIC)	+= intel-soc-pmic.o