tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 6f18b82b 8f9d0349

+3 -2
+1 -1
drivers/reset/Kconfig
··· 116 116 117 117 config RESET_MCHP_SPARX5 118 118 bool "Microchip Sparx5 reset driver" 119 - depends on HAS_IOMEM || COMPILE_TEST 119 + depends on ARCH_SPARX5 || COMPILE_TEST 120 120 default y if SPARX5_SWITCH 121 121 select MFD_SYSCON 122 122 help
+2 -1
drivers/reset/reset-zynqmp.c
··· 53 53 unsigned long id) 54 54 { 55 55 struct zynqmp_reset_data *priv = to_zynqmp_reset_data(rcdev); 56 - int val, err; 56 + int err; 57 + u32 val; 57 58 58 59 err = zynqmp_pm_reset_get_status(priv->data->reset_id + id, &val); 59 60 if (err)