Add support for new Juno FPGA reset controller
Support for a new reset controller that identifies itself with ID
0x20113 has been added in the Juno FPGA reset driver.
The driver version has been given a minor version bump to indicate the
new support.
Change-Id: Ife21d8b2c97d68eea3c4780c4124aac136b36c0b
Signed-off-by: Mikael Olsson <mikael.olsson@arm.com>
diff --git a/remoteproc/juno_fpga_reset.c b/remoteproc/juno_fpga_reset.c
index 29b2eb9..0d29c20 100644
--- a/remoteproc/juno_fpga_reset.c
+++ b/remoteproc/juno_fpga_reset.c
@@ -25,7 +25,7 @@
#include <linux/platform_device.h>
#include <linux/reset-controller.h>
-#define JUNO_FPGA_RESET_DRIVER_VERSION "0.0.1"
+#define JUNO_FPGA_RESET_DRIVER_VERSION "0.1.0"
struct juno_fpga_reset {
struct reset_controller_dev rst;
@@ -33,6 +33,10 @@
void __iomem *base;
};
+/* Supported controller IDs */
+#define JUNO_FPGA_RESET_MIN_SUPPORTED_ID 0x2010f
+#define JUNO_FPGA_RESET_MAX_SUPPORTED_ID 0x20113
+
#define JUNO_FPGA_RESET_ID(base) (base)
#define JUNO_FPGA_RESET_SOFT_RESET(base) ((base) + 0x140)
#define JUNO_FPGA_RESET_CPU_WAIT(base) ((base) + 0x144)
@@ -53,11 +57,9 @@
id = readl(JUNO_FPGA_RESET_ID(base));
- if (id != 0x2010f &&
- id != 0x20110 &&
- id != 0x20111 &&
- id != 0x20112) {
- dev_err(dev, "ID not matching");
+ if (id < JUNO_FPGA_RESET_MIN_SUPPORTED_ID ||
+ id > JUNO_FPGA_RESET_MAX_SUPPORTED_ID) {
+ dev_err(dev, "Unknown controller ID: %u", id);
return IOMEM_ERR_PTR(-EINVAL);
}