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

Commit d0020cc6 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Tony Lindgren
Browse files

ARM: OMAP2+: gpmc: Introduce gpmc_set_legacy() 



Introduce a helper function to complete the setting of some GPMC
parameters, only used when the gpmc is probed from a board file.
As such, it will go away once the DT conversion is completed.

Signed-off-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent e2e699b1

arch/arm/mach-omap2/gpmc-nand.c

+14 −8
Original line number Diff line number Diff line
@@ -65,6 +65,17 @@ static bool gpmc_hwecc_bch_capable(enum omap_ecc ecc_opt) 
	return 1;

}



/* This function will go away once the device-tree convertion is complete */

static void gpmc_set_legacy(struct omap_nand_platform_data *gpmc_nand_data,

			    struct gpmc_settings *s)

{

	/* Enable RD PIN Monitoring Reg */

	if (gpmc_nand_data->dev_ready) {

		s->wait_on_read = true;

		s->wait_on_write = true;

	}

}



int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data,

		   struct gpmc_timings *gpmc_t)

{
@@ -100,15 +111,10 @@ int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data, 
		}

	}



	if (gpmc_nand_data->of_node) {

	if (gpmc_nand_data->of_node)

		gpmc_read_settings_dt(gpmc_nand_data->of_node, &s);

	} else {

		/* Enable RD PIN Monitoring Reg */

		if (gpmc_nand_data->dev_ready) {

			s.wait_on_read = true;

			s.wait_on_write = true;

		}

	}

	else

		gpmc_set_legacy(gpmc_nand_data, &s);



	s.device_nand = true;