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

Commit 79d1c712 authored by Nathan Fontenot's avatar Nathan Fontenot Committed by Benjamin Herrenschmidt
Browse files

powerpc+of: Rename the drivers/of prom_* functions to of_* 



Rename the prom_*_property routines of the generic OF code to of_*_property.
This brings them in line with the naming used by the rest of the OF code.

Signed-off-by: default avatarNathan Fontenot <nfont@linux.vnet.ibm.com>
Acked-by: default avatarGeoff Levand <geoff@infradead.org>
Acked-by: default avatarRob Herring <rob.herring@calxeda.com>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 1cf3d8b3

arch/arm/mach-mxs/mach-mxs.c

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ static void __init update_fec_mac_prop(enum mac_oui oui) 
		macaddr[4] = (val >> 8) & 0xff;

		macaddr[5] = (val >> 0) & 0xff;



		prom_update_property(np, newmac);

		of_update_property(np, newmac);

	}

}

arch/powerpc/kernel/machine_kexec.c

+7 −7
Original line number Diff line number Diff line
@@ -218,23 +218,23 @@ static void __init export_crashk_values(struct device_node *node) 
	 * be sure what's in them, so remove them. */

	prop = of_find_property(node, "linux,crashkernel-base", NULL);

	if (prop)

		prom_remove_property(node, prop);

		of_remove_property(node, prop);



	prop = of_find_property(node, "linux,crashkernel-size", NULL);

	if (prop)

		prom_remove_property(node, prop);

		of_remove_property(node, prop);



	if (crashk_res.start != 0) {

		prom_add_property(node, &crashk_base_prop);

		of_add_property(node, &crashk_base_prop);

		crashk_size = resource_size(&crashk_res);

		prom_add_property(node, &crashk_size_prop);

		of_add_property(node, &crashk_size_prop);

	}



	/*

	 * memory_limit is required by the kexec-tools to limit the

	 * crash regions to the actual memory used.

	 */

	prom_update_property(node, &memory_limit_prop);

	of_update_property(node, &memory_limit_prop);

}



static int __init kexec_setup(void)
@@ -249,11 +249,11 @@ static int __init kexec_setup(void) 
	/* remove any stale properties so ours can be found */

	prop = of_find_property(node, kernel_end_prop.name, NULL);

	if (prop)

		prom_remove_property(node, prop);

		of_remove_property(node, prop);



	/* information needed by userspace when using default_machine_kexec */

	kernel_end = __pa(_end);

	prom_add_property(node, &kernel_end_prop);

	of_add_property(node, &kernel_end_prop);



	export_crashk_values(node);

arch/powerpc/kernel/machine_kexec_64.c

+4 −4
Original line number Diff line number Diff line
@@ -389,14 +389,14 @@ static int __init export_htab_values(void) 
	/* remove any stale propertys so ours can be found */

	prop = of_find_property(node, htab_base_prop.name, NULL);

	if (prop)

		prom_remove_property(node, prop);

		of_remove_property(node, prop);

	prop = of_find_property(node, htab_size_prop.name, NULL);

	if (prop)

		prom_remove_property(node, prop);

		of_remove_property(node, prop);



	htab_base = __pa(htab_address);

	prom_add_property(node, &htab_base_prop);

	prom_add_property(node, &htab_size_prop);

	of_add_property(node, &htab_base_prop);

	of_add_property(node, &htab_size_prop);



	of_node_put(node);

	return 0;

arch/powerpc/kernel/pci_32.c

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ pci_create_OF_bus_map(void) 
		of_prop->name = "pci-OF-bus-map";

		of_prop->length = 256;

		of_prop->value = &of_prop[1];

		prom_add_property(dn, of_prop);

		of_add_property(dn, of_prop);

		of_node_put(dn);

	}

}

arch/powerpc/platforms/85xx/p1022_ds.c

+3 −3
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ static void __init p1022_ds_setup_arch(void) 
				};



				/*

				 * prom_update_property() is called before

				 * of_update_property() is called before

				 * kmalloc() is available, so the 'new' object

				 * should be allocated in the global area.

				 * The easiest way is to do that is to
@@ -548,7 +548,7 @@ static void __init p1022_ds_setup_arch(void) 
				 */

				pr_info("p1022ds: disabling %s node",

					np2->full_name);

				prom_update_property(np2, &nor_status);

				of_update_property(np2, &nor_status);

				of_node_put(np2);

			}
@@ -564,7 +564,7 @@ static void __init p1022_ds_setup_arch(void) 


				pr_info("p1022ds: disabling %s node",

					np2->full_name);

				prom_update_property(np2, &nand_status);

				of_update_property(np2, &nand_status);

				of_node_put(np2);

			}