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

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

Merge "defconfig: msm: Disable config NVMEM_SYSFS for Lito"

parents 413de5f0 1c4a4ac8

Documentation/ABI/stable/sysfs-bus-nvmem

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ Description: 
		This file allows user to read/write the raw NVMEM contents.

		Permissions for write to this file depends on the nvmem

		provider configuration.

		Note: This file is only present if CONFIG_NVMEM_SYSFS

		is enabled



		ex:

		hexdump /sys/bus/nvmem/devices/qfprom0/nvmem

arch/arm64/configs/vendor/lito-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -599,6 +599,7 @@ CONFIG_QCOM_LLCC_PMU=y 
CONFIG_RAS=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

# CONFIG_NVMEM_SYSFS is not set

CONFIG_QCOM_QFPROM=y

CONFIG_NVMEM_SPMI_SDAM=y

CONFIG_SLIMBUS_MSM_NGD=y

arch/arm64/configs/vendor/lito_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -617,6 +617,7 @@ CONFIG_QCOM_LLCC_PMU=y 
CONFIG_RAS=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

# CONFIG_NVMEM_SYSFS is not set

CONFIG_QCOM_QFPROM=y

CONFIG_NVMEM_SPMI_SDAM=y

CONFIG_SLIMBUS_MSM_NGD=y

drivers/nvmem/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -13,6 +13,16 @@ menuconfig NVMEM 


if NVMEM



config NVMEM_SYSFS

	bool "/sys/bus/nvmem/devices/*/nvmem (sysfs interface)"

	depends on SYSFS

	default y

	help

	 Say Y here to add a sysfs interface for NVMEM.



	 This interface is mostly used by userspace applications to

	 read/write directly into nvmem.



config NVMEM_IMX_IIM

	tristate "i.MX IC Identification Module support"

	depends on ARCH_MXC || COMPILE_TEST

drivers/nvmem/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ 
obj-$(CONFIG_NVMEM)		+= nvmem_core.o

nvmem_core-y			:= core.o



obj-$(CONFIG_NVMEM_SYSFS)	+= nvmem_sysfs.o

nvmem_sysfs-y			:= nvmem-sysfs.o



# Devices

obj-$(CONFIG_NVMEM_BCM_OCOTP)	+= nvmem-bcm-ocotp.o

nvmem-bcm-ocotp-y		:= bcm-ocotp.o