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

Commit 8bf41568 authored by Kyle Moffett's avatar Kyle Moffett Committed by Benjamin Herrenschmidt
Browse files

powerpc: Consolidate mpic_alloc() OF address translation 



Instead of using the open-coded "reg" property lookup and address
translation in mpic_alloc(), directly call of_address_to_resource().
This includes various workarounds for special cases which the naive
of_address_translate() does not.

Afterwards it is possible to remove the copiously copy-pasted calls to
of_address_translate() from the 85xx/86xx/powermac platforms.

Signed-off-by: default avatarKyle Moffett <Kyle.D.Moffett@boeing.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 582d3e09

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

+1 −8
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
void __init corenet_ds_pic_init(void)

{

	struct mpic *mpic;

	struct resource r;

	struct device_node *np = NULL;

	unsigned int flags = MPIC_PRIMARY | MPIC_BIG_ENDIAN |

				MPIC_BROKEN_FRR_NIRQS | MPIC_SINGLE_DEST_CPU;
@@ -48,16 +47,10 @@ void __init corenet_ds_pic_init(void) 
		return;

	}



	if (of_address_to_resource(np, 0, &r)) {

		printk(KERN_ERR "Failed to map mpic register space\n");

		of_node_put(np);

		return;

	}



	if (ppc_md.get_irq == mpic_get_coreint_irq)

		flags |= MPIC_ENABLE_COREINT;



	mpic = mpic_alloc(np, r.start, flags, 0, 256, " OpenPIC  ");

	mpic = mpic_alloc(np, 0, flags, 0, 256, " OpenPIC  ");

	BUG_ON(mpic == NULL);



	mpic_init(mpic);

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

+1 −8
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ static void machine_restart(char *cmd) 
static void __init ksi8560_pic_init(void)

{

	struct mpic *mpic;

	struct resource r;

	struct device_node *np;



	np = of_find_node_by_type(NULL, "open-pic");
@@ -68,13 +67,7 @@ static void __init ksi8560_pic_init(void) 
		return;

	}



	if (of_address_to_resource(np, 0, &r)) {

		printk(KERN_ERR "Could not map mpic register space\n");

		of_node_put(np);

		return;

	}



	mpic = mpic_alloc(np, r.start,

	mpic = mpic_alloc(np, 0,

			MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,

			0, 256, " OpenPIC  ");

	BUG_ON(mpic == NULL);

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

+1 −8
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
void __init mpc8536_ds_pic_init(void)

{

	struct mpic *mpic;

	struct resource r;

	struct device_node *np;



	np = of_find_node_by_type(NULL, "open-pic");
@@ -46,13 +45,7 @@ void __init mpc8536_ds_pic_init(void) 
		return;

	}



	if (of_address_to_resource(np, 0, &r)) {

		printk(KERN_ERR "Failed to map mpic register space\n");

		of_node_put(np);

		return;

	}



	mpic = mpic_alloc(np, r.start,

	mpic = mpic_alloc(np, 0,

			  MPIC_PRIMARY | MPIC_WANTS_RESET |

			  MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS,

			0, 256, " OpenPIC  ");

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

+1 −8
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ static int mpc85xx_exclude_device(struct pci_controller *hose, 
static void __init mpc85xx_ads_pic_init(void)

{

	struct mpic *mpic;

	struct resource r;

	struct device_node *np = NULL;



	np = of_find_node_by_type(np, "open-pic");
@@ -60,13 +59,7 @@ static void __init mpc85xx_ads_pic_init(void) 
		return;

	}



	if (of_address_to_resource(np, 0, &r)) {

		printk(KERN_ERR "Could not map mpic register space\n");

		of_node_put(np);

		return;

	}



	mpic = mpic_alloc(np, r.start,

	mpic = mpic_alloc(np, 0,

			MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,

			0, 256, " OpenPIC  ");

	BUG_ON(mpic == NULL);

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

+1 −8
Original line number Diff line number Diff line
@@ -188,7 +188,6 @@ static struct irqaction mpc85xxcds_8259_irqaction = { 
static void __init mpc85xx_cds_pic_init(void)

{

	struct mpic *mpic;

	struct resource r;

	struct device_node *np = NULL;



	np = of_find_node_by_type(np, "open-pic");
@@ -198,13 +197,7 @@ static void __init mpc85xx_cds_pic_init(void) 
		return;

	}



	if (of_address_to_resource(np, 0, &r)) {

		printk(KERN_ERR "Failed to map mpic register space\n");

		of_node_put(np);

		return;

	}



	mpic = mpic_alloc(np, r.start,

	mpic = mpic_alloc(np, 0,

			MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,

			0, 256, " OpenPIC  ");

	BUG_ON(mpic == NULL);