Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 324c654d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-ab-4.13-drivers-fixes' of... 

Merge tag 'at91-ab-4.13-drivers-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into fixes

Pull "Driver fixes for 4.13" from Alexandre Belloni:

 - Multiple EBI/SMC timing setting/calculation fixes

* tag 'at91-ab-4.13-drivers-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  memory: atmel-ebi: Fix smc cycle xlate converter
  memory: atmel-ebi: Allow t_DF timings of zero ns
  memory: atmel-ebi: Fix smc timing return value evaluation
parents 4459398b 3fb3b3c4

drivers/memory/atmel-ebi.c

+6 −4
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ struct atmel_smc_timing_xlate { 
	{ .name = nm, .converter = atmel_smc_cs_conf_set_pulse, .shift = pos}



#define ATMEL_SMC_CYCLE_XLATE(nm, pos)	\

	{ .name = nm, .converter = atmel_smc_cs_conf_set_setup, .shift = pos}

	{ .name = nm, .converter = atmel_smc_cs_conf_set_cycle, .shift = pos}



static void at91sam9_ebi_get_config(struct atmel_ebi_dev *ebid,

				    struct atmel_ebi_dev_config *conf)
@@ -120,12 +120,14 @@ static int atmel_ebi_xslate_smc_timings(struct atmel_ebi_dev *ebid, 
	if (!ret) {

		required = true;

		ncycles = DIV_ROUND_UP(val, clk_period_ns);

		if (ncycles > ATMEL_SMC_MODE_TDF_MAX ||

		    ncycles < ATMEL_SMC_MODE_TDF_MIN) {

		if (ncycles > ATMEL_SMC_MODE_TDF_MAX) {

			ret = -EINVAL;

			goto out;

		}



		if (ncycles < ATMEL_SMC_MODE_TDF_MIN)

			ncycles = ATMEL_SMC_MODE_TDF_MIN;



		smcconf->mode |= ATMEL_SMC_MODE_TDF(ncycles);

	}
@@ -263,7 +265,7 @@ static int atmel_ebi_xslate_smc_config(struct atmel_ebi_dev *ebid, 
	}



	ret = atmel_ebi_xslate_smc_timings(ebid, np, &conf->smcconf);

	if (ret)

	if (ret < 0)

		return -EINVAL;



	if ((ret > 0 && !required) || (!ret && required)) {

drivers/mfd/atmel-smc.c

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ EXPORT_SYMBOL_GPL(atmel_smc_cs_conf_set_pulse); 
 *	     parameter

 *

 * This function encodes the @ncycles value as described in the datasheet

 * (section "SMC Pulse Register"), and then stores the result in the

 * (section "SMC Cycle Register"), and then stores the result in the

 * @conf->setup field at @shift position.

 *

 * Returns -EINVAL if @shift is invalid, -ERANGE if @ncycles does not fit in