Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 20:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARM: SoC fixes for 5.14, part 4

Browse Source 
Just two trivial fixes from the reset driver tree, nothing else came up
 since the last soc fixes.
 
 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmEpYfYACgkQmmx57+YA
 GNmgQQ/8CYvLzRb7Dy6NkZ6suytSATY2JuniBaNmJMxmP1y5W0qdejRS4ZDB7HdE
 MP3T/7soYyynunhAgZpwcNxC3xbuv3eK2F8k5XS27e7q/bv0Dz664poareAGDIOV
 SHDSPswiCtBvAO2E2e77kVnotBjKNEWhFcXUh/EJFJJQLdCQFrU8WFcR4dPicC0s
 2Cba7E7zcW5hmBvZLWf7ogz6gNEWGHqi1cRI4pa+3xeNdOCCiX7dY8YlRfPTnSpA
 Ghg9MwzQf/v120vvwvj2SmQxdIeEiJ0vcCAQ0G+V86Jua0A/us700bRp9qBt+cdz
 2qugiehaPo/6BqNRfRBIkEhSNtykhOXu/v2njDRQOREt+7RnJlxqlpCHqem6IVyF
 d0OM/F7u73fl+8ostno0nsLyqwFON1gCKhno2Wx+/5I2hJRZufGu9FVv/QQZdX/7
 PCz6cmIugRtH2ZfDcs79q10EOj9U60FvmIhlkpYgaGEZQVo5gqWTK2yDB9j91S9D
 ZunAqmwL02J/zu6wgbpy/WSM+xl3C+dgD+hzHrdCcgjHWBiEBm9CZRkjTOfqfwAn
 FYPNvRlvS7uC668Q8xYfQvRFDzMbULQiExAJOYirUDbPuLZzHD0bS29M+1oaBmV3
 NwKnQTkruXVwVB0U3/RajOXdo9//goZF/d5abL5jjFx/xdH2zZM=
 =ID9X
 -----END PGP SIGNATURE-----

Merge tag 'soc-fixes-5.14-4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull ARM SoC fixes from Arnd Bergmann:
 "Just two trivial fixes from the reset driver tree, nothing else came
  up since the last soc fixes"

* tag 'soc-fixes-5.14-4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  reset: reset-zynqmp: Fixed the argument data type
  reset: RESET_MCHP_SPARX5 should depend on ARCH_SPARX5
This commit is contained in:
Linus Torvalds 2021-08-27 15:59:00 -07:00
commit 6f18b82b41
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/reset/Kconfig
View File

@ -116,7 +116,7 @@ config RESET_LPC18XX
config RESET_MCHP_SPARX5
bool "Microchip Sparx5 reset driver"
depends on HAS_IOMEM || COMPILE_TEST
depends on ARCH_SPARX5 || COMPILE_TEST
default y if SPARX5_SWITCH
select MFD_SYSCON
help

3
drivers/reset/reset-zynqmp.c
View File

@ -53,7 +53,8 @@ static int zynqmp_reset_status(struct reset_controller_dev *rcdev,
unsigned long id)
{
struct zynqmp_reset_data *priv = to_zynqmp_reset_data(rcdev);
int val, err;
int err;
u32 val;
err = zynqmp_pm_reset_get_status(priv->data->reset_id + id, &val);
if (err)