openwrt-owl/target/linux/brcm2708/patches-4.4/0017-bcm2835-i2s-Eliminate-...

37 lines
1.1 KiB
Diff

From 08c03b0127c99d816f84a03d9f62c2b8313b359e Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Sun, 11 Oct 2015 15:49:51 +0200
Subject: [PATCH 017/304] bcm2835-i2s: Eliminate debugfs directory error
Code ported from bcm2708-i2s driver in Raspberry Pi tree.
RPi commit fd7d7a3dbe9262d16971ef81c234ed28c6499dd7 ("bcm2708:
Eliminate i2s debugfs directory error")
Qualify the two regmap ranges uses by bcm2708-i2s ('-i2s' and '-clk')
to avoid the name clash when registering debugfs entries.
Signed-off-by: Matthias Reichl <hias@horus.com>
---
sound/soc/bcm/bcm2835-i2s.c | 2 ++
1 file changed, 2 insertions(+)
--- a/sound/soc/bcm/bcm2835-i2s.c
+++ b/sound/soc/bcm/bcm2835-i2s.c
@@ -782,6 +782,7 @@ static const struct regmap_config bcm283
.precious_reg = bcm2835_i2s_precious_reg,
.volatile_reg = bcm2835_i2s_volatile_reg,
.cache_type = REGCACHE_RBTREE,
+ .name = "i2s",
},
{
.reg_bits = 32,
@@ -790,6 +791,7 @@ static const struct regmap_config bcm283
.max_register = BCM2835_CLK_PCMDIV_REG,
.volatile_reg = bcm2835_clk_volatile_reg,
.cache_type = REGCACHE_RBTREE,
+ .name = "clk",
},
};