aboutsummaryrefslogtreecommitdiff
path: root/drivers/memory/ti-gpmc.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2024-02-13 17:31:11 -0500
committerTom Rini <trini@konsulko.com>2024-02-13 17:32:17 -0500
commit0b66c54a97320956b837f61216debfb50c0ffec6 (patch)
tree4a641d6853dd8dd7fd7586b6be8d67c418717204 /drivers/memory/ti-gpmc.c
parent73b5b47dd5b546d0b9106bcca54c72815380e6d3 (diff)
parentea7d3eec1e6e6541db68bf48a1314410e06cd9de (diff)
Merge branch '2024-02-13-assorted-updates'
- Add the button command patch, update MAINTAINERS entry for a platform, fix a problem with the hash command, fix a problem on K3 platforms and revert a change on verdin-am62.
Diffstat (limited to 'drivers/memory/ti-gpmc.c')
-rw-r--r--drivers/memory/ti-gpmc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/memory/ti-gpmc.c b/drivers/memory/ti-gpmc.c
index 0b8674339e..8877b8f438 100644
--- a/drivers/memory/ti-gpmc.c
+++ b/drivers/memory/ti-gpmc.c
@@ -1196,6 +1196,12 @@ static int gpmc_probe(struct udevice *dev)
gpmc_cfg = (struct gpmc *)priv->base;
gpmc_base = priv->base;
+ /*
+ * Disable all IRQs as some bootroms might leave them enabled
+ * and that will cause a lock-up later
+ */
+ gpmc_write_reg(GPMC_IRQENABLE, 0);
+
priv->l3_clk = devm_clk_get(dev, "fck");
if (IS_ERR(priv->l3_clk))
return PTR_ERR(priv->l3_clk);