diff options
author | Javier Martinez Canillas <javier.martinez@collabora.co.uk> | 2013-03-14 11:09:21 -0400 |
---|---|---|
committer | Jon Hunter <jon-hunter@ti.com> | 2013-04-03 21:13:42 -0400 |
commit | 3af91cf7016bdfce9a6a0343ab942302e98e8f3d (patch) | |
tree | 0ad056fe4e219570fb6038a09d64f5f1bbad2afa | |
parent | e8ffd6fdf28ac8404acebf2759315600bfdcb5f9 (diff) |
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: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Signed-off-by: Jon Hunter <jon-hunter@ti.com>
-rw-r--r-- | arch/arm/mach-omap2/gpmc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index c6f0ef563817..8a1cafb2750e 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c | |||
@@ -1429,14 +1429,14 @@ static int gpmc_probe_onenand_child(struct platform_device *pdev, | |||
1429 | #endif | 1429 | #endif |
1430 | 1430 | ||
1431 | /** | 1431 | /** |
1432 | * gpmc_probe_nor_child - configures the gpmc for a nor device | 1432 | * gpmc_probe_generic_child - configures the gpmc for a child device |
1433 | * @pdev: pointer to gpmc platform device | 1433 | * @pdev: pointer to gpmc platform device |
1434 | * @child: pointer to device-tree node for nor device | 1434 | * @child: pointer to device-tree node for child device |
1435 | * | 1435 | * |
1436 | * Allocates and configures a GPMC chip-select for a NOR flash device. | 1436 | * Allocates and configures a GPMC chip-select for a child device. |
1437 | * Returns 0 on success and appropriate negative error code on failure. | 1437 | * Returns 0 on success and appropriate negative error code on failure. |
1438 | */ | 1438 | */ |
1439 | static int gpmc_probe_nor_child(struct platform_device *pdev, | 1439 | static int gpmc_probe_generic_child(struct platform_device *pdev, |
1440 | struct device_node *child) | 1440 | struct device_node *child) |
1441 | { | 1441 | { |
1442 | struct gpmc_settings gpmc_s; | 1442 | struct gpmc_settings gpmc_s; |
@@ -1537,7 +1537,7 @@ static int gpmc_probe_dt(struct platform_device *pdev) | |||
1537 | } | 1537 | } |
1538 | 1538 | ||
1539 | for_each_node_by_name(child, "nor") { | 1539 | for_each_node_by_name(child, "nor") { |
1540 | ret = gpmc_probe_nor_child(pdev, child); | 1540 | ret = gpmc_probe_generic_child(pdev, child); |
1541 | if (ret < 0) { | 1541 | if (ret < 0) { |
1542 | of_node_put(child); | 1542 | of_node_put(child); |
1543 | return ret; | 1543 | return ret; |