diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-03-28 17:14:29 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-28 17:14:29 +0200 |
| commit | 84985460569570f5cca5fabbfb811e11b07bc916 (patch) | |
| tree | 829a52c7aabf724bf8b481b58749d3ac1438248f | |
| parent | 064fe81ef23d72854e7f17fd58a945e4fd0d0f3f (diff) | |
| parent | 03151b8989257bfcee6cfd5f06d9a4a06b781cf3 (diff) | |
| download | linux-84985460569570f5cca5fabbfb811e11b07bc916.tar.gz linux-84985460569570f5cca5fabbfb811e11b07bc916.tar.bz2 linux-84985460569570f5cca5fabbfb811e11b07bc916.zip | |
Merge tag 'v4.17-rockchip-soc32-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc
Pull "Rockchip soc32 changes for 4.17" from Heiko Stübner:
Fix for the legacy pmu-regmap in the smp-code to have a real name
and therefore not create a dummy* entry in debugfs.
* tag 'v4.17-rockchip-soc32-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: rockchip: Set name of pmu regmap_config in smp code
| -rw-r--r-- | arch/arm/mach-rockchip/platsmp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-rockchip/platsmp.c b/arch/arm/mach-rockchip/platsmp.c index ecec340ca345..51984a40b097 100644 --- a/arch/arm/mach-rockchip/platsmp.c +++ b/arch/arm/mach-rockchip/platsmp.c @@ -208,6 +208,7 @@ static int __init rockchip_smp_prepare_sram(struct device_node *node) } static const struct regmap_config rockchip_pmu_regmap_config = { + .name = "rockchip-pmu", .reg_bits = 32, .val_bits = 32, .reg_stride = 4, |