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

Commit 3af91cf7 authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Jon Hunter
Browse files

ARM: OMAP2+: rename gpmc_probe_nor_child() to gpmc_probe_generic_child() 



The gpmc_probe_nor_child() function is used in the GPMC driver to
configure the GPMC for a NOR child device node.

But this function is quite generic and all the NOR specific configuration
is made by the driver of the actual NOR flash memory used.

Other Pseudo-SRAM devices such as ethernet controllers need a similar
setup so by making this function generic it can be used for those too.

Signed-off-by: default avatarJavier Martinez Canillas <javier.martinez@collabora.co.uk>
Signed-off-by: default avatarJon Hunter <jon-hunter@ti.com>
parent e8ffd6fd

arch/arm/mach-omap2/gpmc.c

+5 −5
Original line number Diff line number Diff line
@@ -1429,14 +1429,14 @@ static int gpmc_probe_onenand_child(struct platform_device *pdev, 
#endif



/**

 * gpmc_probe_nor_child - configures the gpmc for a nor device

 * gpmc_probe_generic_child - configures the gpmc for a child device

 * @pdev:	pointer to gpmc platform device

 * @child:	pointer to device-tree node for nor device

 * @child:	pointer to device-tree node for child device

 *

 * Allocates and configures a GPMC chip-select for a NOR flash device.

 * Allocates and configures a GPMC chip-select for a child device.

 * Returns 0 on success and appropriate negative error code on failure.

 */

static int gpmc_probe_nor_child(struct platform_device *pdev,

static int gpmc_probe_generic_child(struct platform_device *pdev,

				struct device_node *child)

{

	struct gpmc_settings gpmc_s;
@@ -1537,7 +1537,7 @@ static int gpmc_probe_dt(struct platform_device *pdev) 
	}



	for_each_node_by_name(child, "nor") {

		ret = gpmc_probe_nor_child(pdev, child);

		ret = gpmc_probe_generic_child(pdev, child);

		if (ret < 0) {

			of_node_put(child);

			return ret;