From: Stafford Horne <shorne@gmail.com>
Date: Mon, 25 Jan 2021 02:08:34 +0000 (+0900)
Subject: Merge remote-tracking branch 'openrisc/or1k-5.11-fixes' into or1k-5.12-updates
X-Git-Tag: v5.12-rc1~12^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2261352157a932717ec08b9dd18d1bfbb7c37c52;p=thirdparty%2Fkernel%2Flinux.git

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>
---

2261352157a932717ec08b9dd18d1bfbb7c37c52
diff --cc drivers/soc/litex/litex_soc_ctrl.c
index a7dd5be9fd5bd,9b07663845708..6268bfa7f0d60
--- a/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"},
  	{},