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

Commit 19e00f20 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Jason Cooper
Browse files

ARM: orion: remove no longer needed gpio DT code 



Following the move to pure DT-based probing of the GPIO controllers on
Orion5x, some code in plat-orion/orion-gpio.c can be removed as it is
no longer used.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Link: https://lkml.kernel.org/r/1398202002-28530-39-git-send-email-thomas.petazzoni@free-electrons.com


Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 880ff3e2

arch/arm/plat-orion/gpio.c

+0 −48
Original line number Diff line number Diff line
@@ -597,51 +597,3 @@ void __init orion_gpio_init(struct device_node *np, 


	orion_gpio_chip_count++;

}
 


#ifdef CONFIG_OF

static void __init orion_gpio_of_init_one(struct device_node *np,

					  int irq_gpio_base)

{

	int ngpio, gpio_base, mask_offset;

	void __iomem *base;

	int ret, i;

	int irqs[4];

	int secondary_irq_base;



	ret = of_property_read_u32(np, "ngpio", &ngpio);

	if (ret)

		goto out;

	ret = of_property_read_u32(np, "mask-offset", &mask_offset);

	if (ret == -EINVAL)

		mask_offset = 0;

	else

		goto out;

	base = of_iomap(np, 0);

	if (!base)

		goto out;



	secondary_irq_base = irq_gpio_base + (32 * orion_gpio_chip_count);

	gpio_base = 32 * orion_gpio_chip_count;



	/* Get the interrupt numbers. Each chip can have up to 4

	 * interrupt handlers, with each handler dealing with 8 GPIO

	 * pins. */



	for (i = 0; i < 4; i++)

		irqs[i] = irq_of_parse_and_map(np, i);



	orion_gpio_init(np, gpio_base, ngpio, base, mask_offset,

			secondary_irq_base, irqs);

	return;

out:

	pr_err("%s: %s: missing mandatory property\n", __func__, np->name);

}



void __init orion_gpio_of_init(int irq_gpio_base)

{

	struct device_node *np;



	for_each_compatible_node(np, NULL, "marvell,orion-gpio")

		orion_gpio_of_init_one(np, irq_gpio_base);

}

#endif

arch/arm/plat-orion/include/plat/orion-gpio.h

+0 −1
Original line number Diff line number Diff line
@@ -33,5 +33,4 @@ void __init orion_gpio_init(struct device_node *np, 
			    int secondary_irq_base,

			    int irq[4]);



void __init orion_gpio_of_init(int irq_gpio_base);

#endif