Commit dbbf9839 authored by Tudor Ambarus's avatar Tudor Ambarus Committed by Alexandre Belloni
Browse files

memory: atmel-ebi: move NUM_CS definition inside EBI driver 



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: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Link: https://lore.kernel.org/r/20190906150632.19039-1-tudor.ambarus@microchip.com


Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent 02c1c37f

drivers/memory/atmel-ebi.c

+4 −2
Original line number Diff line number Diff line
@@ -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;
@@ -344,7 +346,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) {

include/linux/mfd/syscon/atmel-matrix.h

+0 −1
Original line number Diff line number Diff line
@@ -106,7 +106,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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE