* [RESEND PATCH] memory: atmel-ebi: move NUM_CS definition inside EBI driver
@ 2019-09-06 15:06 Tudor.Ambarus
2019-09-11 11:37 ` Alexandre Belloni
0 siblings, 1 reply; 2+ messages in thread
From: Tudor.Ambarus @ 2019-09-06 15:06 UTC (permalink / raw)
To: Nicolas.Ferre, alexandre.belloni, Ludovic.Desroches, lee.jones,
linux-arm-kernel, linux-kernel
Cc: Tudor.Ambarus
From: Tudor Ambarus <tudor.ambarus@microchip.com>
The total number of EBI CS lines is described by the EBI controller
and not by the Matrix. Move the definition for the number of CS
inside EBI driver.
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
---
drivers/memory/atmel-ebi.c | 6 ++++--
include/linux/mfd/syscon/atmel-matrix.h | 1 -
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/memory/atmel-ebi.c b/drivers/memory/atmel-ebi.c
index d0cd57aaebb4..111e09a5b4e9 100644
--- a/drivers/memory/atmel-ebi.c
+++ b/drivers/memory/atmel-ebi.c
@@ -19,6 +19,8 @@
#include <linux/regmap.h>
#include <soc/at91/atmel-sfr.h>
+#define AT91_EBI_NUM_CS 8
+
struct atmel_ebi_dev_config {
int cs;
struct atmel_smc_cs_conf smcconf;
@@ -314,7 +316,7 @@ static int atmel_ebi_dev_setup(struct atmel_ebi *ebi, struct device_node *np,
if (ret)
return ret;
- if (cs >= AT91_MATRIX_EBI_NUM_CS ||
+ if (cs >= AT91_EBI_NUM_CS ||
!(ebi->caps->available_cs & BIT(cs))) {
dev_err(dev, "invalid reg property in %pOF\n", np);
return -EINVAL;
@@ -345,7 +347,7 @@ static int atmel_ebi_dev_setup(struct atmel_ebi *ebi, struct device_node *np,
apply = true;
i = 0;
- for_each_set_bit(cs, &cslines, AT91_MATRIX_EBI_NUM_CS) {
+ for_each_set_bit(cs, &cslines, AT91_EBI_NUM_CS) {
ebid->configs[i].cs = cs;
if (apply) {
diff --git a/include/linux/mfd/syscon/atmel-matrix.h b/include/linux/mfd/syscon/atmel-matrix.h
index 8293c3e2a82a..1e2cd118e4e3 100644
--- a/include/linux/mfd/syscon/atmel-matrix.h
+++ b/include/linux/mfd/syscon/atmel-matrix.h
@@ -110,7 +110,6 @@
#define AT91_MATRIX_DDR_IOSR BIT(18)
#define AT91_MATRIX_NFD0_SELECT BIT(24)
#define AT91_MATRIX_DDR_MP_EN BIT(25)
-#define AT91_MATRIX_EBI_NUM_CS 8
#define AT91_MATRIX_USBPUCR_PUON BIT(30)
--
2.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [RESEND PATCH] memory: atmel-ebi: move NUM_CS definition inside EBI driver
2019-09-06 15:06 [RESEND PATCH] memory: atmel-ebi: move NUM_CS definition inside EBI driver Tudor.Ambarus
@ 2019-09-11 11:37 ` Alexandre Belloni
0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Belloni @ 2019-09-11 11:37 UTC (permalink / raw)
To: Tudor.Ambarus
Cc: Nicolas.Ferre, Ludovic.Desroches, lee.jones, linux-arm-kernel,
linux-kernel
On 06/09/2019 15:06:41+0000, Tudor.Ambarus@microchip.com wrote:
> From: Tudor Ambarus <tudor.ambarus@microchip.com>
>
> The total number of EBI CS lines is described by the EBI controller
> and not by the Matrix. Move the definition for the number of CS
> inside EBI driver.
>
> Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
> ---
> drivers/memory/atmel-ebi.c | 6 ++++--
> include/linux/mfd/syscon/atmel-matrix.h | 1 -
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
Applied, thanks.
--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-09-11 11:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-06 15:06 [RESEND PATCH] memory: atmel-ebi: move NUM_CS definition inside EBI driver Tudor.Ambarus
2019-09-11 11:37 ` Alexandre Belloni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).