diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-09-12 15:37:18 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-09-12 15:37:18 +1000 |
| commit | 5c1cf70eb80c5be1dd8e782abc9a837da8eb3aa8 (patch) | |
| tree | 89a0647d9c295f062ef0d3aecd37cd48826f00f1 | |
| parent | 0817f0a37dc19fe24e5c715540b626a195e53ca1 (diff) | |
| parent | 6bee5daa9e26846f49afc3241e014ea9b0f65437 (diff) | |
Merge remote-tracking branch 'regmap/for-next'
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | drivers/base/regmap/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/base/regmap/regmap-debugfs.c | 9 |
3 files changed, 12 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7b9d30826091..30ba7c9aa91a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7621,6 +7621,7 @@ F: fs/reiserfs/ REGISTER MAP ABSTRACTION M: Mark Brown <broonie@kernel.org> +L: linux-kernel@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git S: Supported F: drivers/base/regmap/ diff --git a/drivers/base/regmap/Kconfig b/drivers/base/regmap/Kconfig index 4251570610c9..8a3f51f7b1b9 100644 --- a/drivers/base/regmap/Kconfig +++ b/drivers/base/regmap/Kconfig @@ -11,12 +11,15 @@ config REGMAP config REGMAP_I2C tristate + depends on I2C config REGMAP_SPI tristate + depends on SPI config REGMAP_SPMI tristate + depends on SPMI config REGMAP_MMIO tristate diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c index 65ea7b256b3e..0c94b661c16f 100644 --- a/drivers/base/regmap/regmap-debugfs.c +++ b/drivers/base/regmap/regmap-debugfs.c @@ -512,7 +512,14 @@ void regmap_debugfs_init(struct regmap *map, const char *name) map, ®map_reg_ranges_fops); if (map->max_register || regmap_readable(map, 0)) { - debugfs_create_file("registers", 0400, map->debugfs, + umode_t registers_mode; + + if (IS_ENABLED(REGMAP_ALLOW_WRITE_DEBUGFS)) + registers_mode = 0600; + else + registers_mode = 0400; + + debugfs_create_file("registers", registers_mode, map->debugfs, map, ®map_map_fops); debugfs_create_file("access", 0400, map->debugfs, map, ®map_access_fops); |