Merge remote-tracking branch 'openrisc/or1k-5.11-fixes' into or1k-5.12-updates

Pickup fixes that went upstream already in order to resolve conflicts in
litex_soc_ctrl.c between 5.11 fixes that went upstream and the
or1k-5.12-updates linux-next queue.

Signed-off-by: Stafford Horne <shorne@gmail.com>

diff --cc drivers/soc/litex/litex_soc_ctrl.c
index a7dd5be9fd5bd8ad664e451260bc1cf5f2a2009d,9b076638457087a01ea168dd67eb8f3981d58e9b..6268bfa7f0d6088ed464ef890c1a778d8f2d33c3
--- 1/drivers/soc/litex/litex_soc_ctrl.c
--- 2/drivers/soc/litex/litex_soc_ctrl.c
+++ b/drivers/soc/litex/litex_soc_ctrl.c
@@@ -71,19 -138,9 +71,20 @@@ static int litex_check_csr_access(void 
  
  struct litex_soc_ctrl_device {
        void __iomem *base;
 +      struct notifier_block reset_nb;
  };
  
 +static int litex_reset_handler(struct notifier_block *this, unsigned long mode,
 +                             void *cmd)
 +{
 +      struct litex_soc_ctrl_device *soc_ctrl_dev =
 +              container_of(this, struct litex_soc_ctrl_device, reset_nb);
 +
 +      litex_write32(soc_ctrl_dev->base + RESET_REG_OFF, RESET_REG_VALUE);
 +      return NOTIFY_DONE;
 +}
 +
+ #ifdef CONFIG_OF
  static const struct of_device_id litex_soc_ctrl_of_match[] = {
        {.compatible = "litex,soc-controller"},
        {},