Commit 2998954c authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-ab-4.11-drivers2' of... 

Merge tag 'at91-ab-4.11-drivers2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/drivers

Drivers for 4.11 #2:

 - more EBI fixes

* tag 'at91-ab-4.11-drivers2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux

:
  memory: atmel-ebi: Enable the SMC clock if specified
  memory: atmel-ebi: Properly handle multiple reference to the same CS
  memory: atmel-ebi: Fix the test to enable generic SMC logic

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 95f4e568 87108dc7

drivers/memory/atmel-ebi.c

+65 −34
Original line number Diff line number Diff line
@@ -76,9 +76,11 @@ struct at91_ebi_caps { 


struct at91_ebi {

	struct clk *clk;

	struct regmap *smc;

	struct regmap *matrix;



	struct  {

		struct regmap *regmap;

		struct clk *clk;

	} smc;

	struct regmap_field *ebi_csa;



	struct device *dev;
@@ -395,22 +397,26 @@ static int at91sam9_ebi_init(struct at91_ebi *ebi) 
	field.id_offset = AT91SAM9_SMC_GENERIC_BLK_SZ;



	field.reg = AT91SAM9_SMC_SETUP(AT91SAM9_SMC_GENERIC);

	fields->setup = devm_regmap_field_alloc(ebi->dev, ebi->smc, field);

	fields->setup = devm_regmap_field_alloc(ebi->dev, ebi->smc.regmap,

						field);

	if (IS_ERR(fields->setup))

		return PTR_ERR(fields->setup);



	field.reg = AT91SAM9_SMC_PULSE(AT91SAM9_SMC_GENERIC);

	fields->pulse = devm_regmap_field_alloc(ebi->dev, ebi->smc, field);

	fields->pulse = devm_regmap_field_alloc(ebi->dev, ebi->smc.regmap,

						field);

	if (IS_ERR(fields->pulse))

		return PTR_ERR(fields->pulse);



	field.reg = AT91SAM9_SMC_CYCLE(AT91SAM9_SMC_GENERIC);

	fields->cycle = devm_regmap_field_alloc(ebi->dev, ebi->smc, field);

	fields->cycle = devm_regmap_field_alloc(ebi->dev, ebi->smc.regmap,

						field);

	if (IS_ERR(fields->cycle))

		return PTR_ERR(fields->cycle);



	field.reg = AT91SAM9_SMC_MODE(AT91SAM9_SMC_GENERIC);

	fields->mode = devm_regmap_field_alloc(ebi->dev, ebi->smc, field);

	fields->mode = devm_regmap_field_alloc(ebi->dev, ebi->smc.regmap,

					       field);

	return PTR_ERR_OR_ZERO(fields->mode);

}
@@ -423,22 +429,26 @@ static int sama5d3_ebi_init(struct at91_ebi *ebi) 
	field.id_offset = SAMA5_SMC_GENERIC_BLK_SZ;



	field.reg = AT91SAM9_SMC_SETUP(SAMA5_SMC_GENERIC);

	fields->setup = devm_regmap_field_alloc(ebi->dev, ebi->smc, field);

	fields->setup = devm_regmap_field_alloc(ebi->dev, ebi->smc.regmap,

						field);

	if (IS_ERR(fields->setup))

		return PTR_ERR(fields->setup);



	field.reg = AT91SAM9_SMC_PULSE(SAMA5_SMC_GENERIC);

	fields->pulse = devm_regmap_field_alloc(ebi->dev, ebi->smc, field);

	fields->pulse = devm_regmap_field_alloc(ebi->dev, ebi->smc.regmap,

						field);

	if (IS_ERR(fields->pulse))

		return PTR_ERR(fields->pulse);



	field.reg = AT91SAM9_SMC_CYCLE(SAMA5_SMC_GENERIC);

	fields->cycle = devm_regmap_field_alloc(ebi->dev, ebi->smc, field);

	fields->cycle = devm_regmap_field_alloc(ebi->dev, ebi->smc.regmap,

						field);

	if (IS_ERR(fields->cycle))

		return PTR_ERR(fields->cycle);



	field.reg = SAMA5_SMC_MODE(SAMA5_SMC_GENERIC);

	fields->mode = devm_regmap_field_alloc(ebi->dev, ebi->smc, field);

	fields->mode = devm_regmap_field_alloc(ebi->dev, ebi->smc.regmap,

					       field);

	return PTR_ERR_OR_ZERO(fields->mode);

}
@@ -449,12 +459,31 @@ static int at91_ebi_dev_setup(struct at91_ebi *ebi, struct device_node *np, 
	struct at91_ebi_dev_config conf = { };

	struct device *dev = ebi->dev;

	struct at91_ebi_dev *ebid;

	int ret, numcs = 0, i;

	unsigned long cslines = 0;

	int ret, numcs = 0, nentries, i;

	bool apply = false;

	u32 cs;



	numcs = of_property_count_elems_of_size(np, "reg",

	nentries = of_property_count_elems_of_size(np, "reg",

						   reg_cells * sizeof(u32));

	if (numcs <= 0) {

	for (i = 0; i < nentries; i++) {

		ret = of_property_read_u32_index(np, "reg", i * reg_cells,

						 &cs);

		if (ret)

			return ret;



		if (cs >= AT91_MATRIX_EBI_NUM_CS ||

		    !(ebi->caps->available_cs & BIT(cs))) {

			dev_err(dev, "invalid reg property in %s\n",

				np->full_name);

			return -EINVAL;

		}



		if (!test_and_set_bit(cs, &cslines))

			numcs++;

	}



	if (!numcs) {

		dev_err(dev, "invalid reg property in %s\n", np->full_name);

		return -EINVAL;

	}
@@ -473,21 +502,8 @@ static int at91_ebi_dev_setup(struct at91_ebi *ebi, struct device_node *np, 
	else if (ret)

		apply = true;



	for (i = 0; i < numcs; i++) {

		u32 cs;



		ret = of_property_read_u32_index(np, "reg", i * reg_cells,

						 &cs);

		if (ret)

			return ret;



		if (cs > AT91_MATRIX_EBI_NUM_CS ||

		    !(ebi->caps->available_cs & BIT(cs))) {

			dev_err(dev, "invalid reg property in %s\n",

				np->full_name);

			return -EINVAL;

		}



	i = 0;

	for_each_set_bit(cs, &cslines, AT91_MATRIX_EBI_NUM_CS) {

		ebid->configs[i].cs = cs;



		if (apply) {
@@ -503,9 +519,11 @@ static int at91_ebi_dev_setup(struct at91_ebi *ebi, struct device_node *np, 
		 * Attach the EBI device to the generic SMC logic if at least

		 * one "atmel,smc-" property is present.

		 */

		if (ebi->ebi_csa && ret)

		if (ebi->ebi_csa && apply)

			regmap_field_update_bits(ebi->ebi_csa,

						 BIT(cs), 0);



		i++;

	}



	list_add_tail(&ebid->node, &ebi->devs);
@@ -669,7 +687,7 @@ static int at91_ebi_dev_disable(struct at91_ebi *ebi, struct device_node *np) 
static int at91_ebi_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct device_node *child, *np = dev->of_node;

	struct device_node *child, *np = dev->of_node, *smc_np;

	const struct of_device_id *match;

	struct at91_ebi *ebi;

	int ret, reg_cells;
@@ -694,9 +712,22 @@ static int at91_ebi_probe(struct platform_device *pdev) 


	ebi->clk = clk;



	ebi->smc = syscon_regmap_lookup_by_phandle(np, "atmel,smc");

	if (IS_ERR(ebi->smc))

		return PTR_ERR(ebi->smc);

	smc_np = of_parse_phandle(dev->of_node, "atmel,smc", 0);



	ebi->smc.regmap = syscon_node_to_regmap(smc_np);

	if (IS_ERR(ebi->smc.regmap))

		return PTR_ERR(ebi->smc.regmap);



	ebi->smc.clk = of_clk_get(smc_np, 0);

	if (IS_ERR(ebi->smc.clk)) {

		if (PTR_ERR(ebi->smc.clk) != -ENOENT)

			return PTR_ERR(ebi->smc.clk);



		ebi->smc.clk = NULL;

	}

	ret = clk_prepare_enable(ebi->smc.clk);

	if (ret)

		return ret;



	/*

	 * The sama5d3 does not provide an EBICSA register and thus does need

CRA Git | Maintained and supported by SUSTech CRA and CCSE