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

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

Merge "msm: regmap: configure REGMAP debugfs write optional"

parents 95811d0d 9fdd2b11

drivers/base/regmap/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -32,3 +32,7 @@ config REGMAP_IRQ 


config REGMAP_SWR

	tristate



config REGMAP_ALLOW_WRITE_DEBUGFS

	depends on REGMAP && DEBUG_FS

	bool "Allow REGMAP debugfs write"

drivers/base/regmap/regmap-debugfs.c

+3 −4
Original line number Diff line number Diff line
@@ -259,8 +259,7 @@ static ssize_t regmap_map_read_file(struct file *file, char __user *user_buf, 
				   count, ppos);

}



#define REGMAP_ALLOW_WRITE_DEBUGFS

#ifdef REGMAP_ALLOW_WRITE_DEBUGFS

#ifdef CONFIG_REGMAP_ALLOW_WRITE_DEBUGFS

/*

 * This can be dangerous especially when we have clients such as

 * PMICs, therefore don't provide any real compile time configuration option
@@ -330,7 +329,7 @@ static ssize_t regmap_data_read_file(struct file *file, char __user *user_buf, 
			new_count, ppos);

}



#ifdef REGMAP_ALLOW_WRITE_DEBUGFS

#ifdef CONFIG_REGMAP_ALLOW_WRITE_DEBUGFS

static ssize_t regmap_data_write_file(struct file *file,

				     const char __user *user_buf,

				     size_t count, loff_t *ppos)
@@ -656,7 +655,7 @@ void regmap_debugfs_init(struct regmap *map, const char *name) 
	if (map->max_register || regmap_readable(map, 0)) {

		umode_t registers_mode;



#if defined(REGMAP_ALLOW_WRITE_DEBUGFS)

#ifdef CONFIG_REGMAP_ALLOW_WRITE_DEBUGFS

		registers_mode = 0600;

#else

		registers_mode = 0400;

drivers/mfd/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -1539,7 +1539,6 @@ config WCD9330_CODEC 
	select MFD_CORE

	select WCD9XXX_CODEC_UTIL

	select MSM_CDC_SUPPLY

	select REGMAP_ALLOW_WRITE_DEBUGFS

	help

	  Enables the WCD9xxx codec core driver. The core driver provides

	  read/write capability to registers which are part of the
@@ -1555,7 +1554,6 @@ config WCD9335_CODEC 
	select WCD9XXX_CODEC_UTIL

	select MSM_CDC_SUPPLY

	select MSM_CDC_PINCTRL

	select REGMAP_ALLOW_WRITE_DEBUGFS

	help

	  Enables the WCD9xxx codec core driver. The core driver provides

	  read/write capability to registers which are part of the
@@ -1571,7 +1569,6 @@ config WCD934X_CODEC 
	select WCD9XXX_CODEC_UTIL

	select MSM_CDC_SUPPLY

	select MSM_CDC_PINCTRL

	select REGMAP_ALLOW_WRITE_DEBUGFS

	select PINCTRL_WCD

	help

	  Enables the WCD9xxx codec core driver. The core driver provides