diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-07-01 10:01:32 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-07-01 10:01:32 -0700 |
commit | 9650910d05a31d62f562f90ca15ece685a4c1b9c (patch) | |
tree | 442ab7adeca916a809870e73e335043c569d2e3d | |
parent | a175eca0f3d747599f1fdfac04cc9195b71ec996 (diff) | |
parent | a79e69c8714f416bd324952d06d1dd7bce3f35bf (diff) | |
download | linux-9650910d05a31d62f562f90ca15ece685a4c1b9c.tar.bz2 |
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull clk fixes from Stephen Boyd:
"Two small fixes
- Initialize a spinlock in the stm32 reset code
- Add dt bindings to the clk maintainer filepattern"
* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
MAINTAINERS: add include/dt-bindings/clock to COMMON CLK FRAMEWORK
clk: stm32: rcc_reset: Fix missing spin_lock_init()
-rw-r--r-- | MAINTAINERS | 1 | ||||
-rw-r--r-- | drivers/clk/stm32/reset-stm32.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d4d3f37f64eb..66bffb24a348 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4976,6 +4976,7 @@ Q: http://patchwork.kernel.org/project/linux-clk/list/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git F: Documentation/devicetree/bindings/clock/ F: drivers/clk/ +F: include/dt-bindings/clock/ F: include/linux/clk-pr* F: include/linux/clk/ F: include/linux/of_clk.h diff --git a/drivers/clk/stm32/reset-stm32.c b/drivers/clk/stm32/reset-stm32.c index 040870130e4b..e89381528af9 100644 --- a/drivers/clk/stm32/reset-stm32.c +++ b/drivers/clk/stm32/reset-stm32.c @@ -111,6 +111,7 @@ int stm32_rcc_reset_init(struct device *dev, const struct of_device_id *match, if (!reset_data) return -ENOMEM; + spin_lock_init(&reset_data->lock); reset_data->membase = base; reset_data->rcdev.owner = THIS_MODULE; reset_data->rcdev.ops = &stm32_reset_ops; |