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

Commit 81db718d authored by Kumar Gala's avatar Kumar Gala
Browse files

powerpc/fsl: use of_iomap() for rstcr mapping 



The rstcr register mapping code was written sometime ago before
of_iomap() existed.  We can use it and clean up the code a bit
and get rid of one user of get_immrbase() in the process.

Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent abd7d483

arch/powerpc/sysdev/fsl_soc.c

+4 −10
Original line number Diff line number Diff line
@@ -379,16 +379,10 @@ static int __init setup_rstcr(void) 
	struct device_node *np;

	np = of_find_node_by_name(NULL, "global-utilities");

	if ((np && of_get_property(np, "fsl,has-rstcr", NULL))) {

		const u32 *prop = of_get_property(np, "reg", NULL);

		if (prop) {

			/* map reset control register

			 * 0xE00B0 is offset of reset control register

			 */

			rstcr = ioremap(get_immrbase() + *prop + 0xB0, 0xff);

		rstcr = of_iomap(np, 0) + 0xb0;

		if (!rstcr)

				printk (KERN_EMERG "Error: reset control "

						"register not mapped!\n");

		}

			printk (KERN_EMERG "Error: reset control register "

					"not mapped!\n");

	} else

		printk (KERN_INFO "rstcr compatible register does not exist!\n");

	if (np)