Commit 6f18b82b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 8f9d0349 6c35ca06

drivers/reset/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/reset/reset-zynqmp.c

+2 −1
Original line number Diff line number Diff line
@@ -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)