Unverified Commit a483b1b2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-arm-5.18-1' of... 

Merge tag 'mvebu-arm-5.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into arm/soc

mvebu arm for 5.18 (part 1)

gpio clean-up for Orion

* tag 'mvebu-arm-5.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
  ARM: orion/gpio: Get rid of unused first parameter in orion_gpio_init()

Link: https://lore.kernel.org/r/87sfs1zrfn.fsf@BL-laptop


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d9bdba07 bba14b32

arch/arm/mach-dove/irq.c

+3 −3
Original line number Diff line number Diff line
@@ -73,12 +73,12 @@ void __init dove_init_irq(void) 
	/*

	 * Initialize gpiolib for GPIOs 0-71.

	 */

	orion_gpio_init(NULL, 0, 32, DOVE_GPIO_LO_VIRT_BASE, 0,

	orion_gpio_init(0, 32, DOVE_GPIO_LO_VIRT_BASE, 0,

			IRQ_DOVE_GPIO_START, gpio0_irqs);



	orion_gpio_init(NULL, 32, 32, DOVE_GPIO_HI_VIRT_BASE, 0,

	orion_gpio_init(32, 32, DOVE_GPIO_HI_VIRT_BASE, 0,

			IRQ_DOVE_GPIO_START + 32, gpio1_irqs);



	orion_gpio_init(NULL, 64, 8, DOVE_GPIO2_VIRT_BASE, 0,

	orion_gpio_init(64, 8, DOVE_GPIO2_VIRT_BASE, 0,

			IRQ_DOVE_GPIO_START + 64, gpio2_irqs);

}

arch/arm/mach-mv78xx0/irq.c

+1 −2
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ void __init mv78xx0_init_irq(void) 
	 * registers for core #1 are at an offset of 0x18 from those of

	 * core #0.)

	 */

	orion_gpio_init(NULL, 0, 32, GPIO_VIRT_BASE,

			mv78xx0_core_index() ? 0x18 : 0,

	orion_gpio_init(0, 32, GPIO_VIRT_BASE, mv78xx0_core_index() ? 0x18 : 0,

			IRQ_MV78XX0_GPIO_START, gpio0_irqs);

}

arch/arm/mach-orion5x/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -49,6 +49,6 @@ void __init orion5x_init_irq(void) 
	/*

	 * Initialize gpiolib for GPIOs 0-31.

	 */

	orion_gpio_init(NULL, 0, 32, GPIO_VIRT_BASE, 0,

	orion_gpio_init(0, 32, GPIO_VIRT_BASE, 0,

			IRQ_ORION5X_GPIO_START, gpio0_irqs);

}

arch/arm/plat-orion/gpio.c

+2 −6
Original line number Diff line number Diff line
@@ -516,8 +516,7 @@ static void orion_gpio_mask_irq(struct irq_data *d) 
	irq_gc_unlock(gc);

}



void __init orion_gpio_init(struct device_node *np,

			    int gpio_base, int ngpio,

void __init orion_gpio_init(int gpio_base, int ngpio,

			    void __iomem *base, int mask_offset,

			    int secondary_irq_base,

			    int irqs[4])
@@ -545,9 +544,6 @@ void __init orion_gpio_init(struct device_node *np, 
	ochip->chip.base = gpio_base;

	ochip->chip.ngpio = ngpio;

	ochip->chip.can_sleep = 0;

#ifdef CONFIG_OF

	ochip->chip.of_node = np;

#endif

	ochip->chip.dbg_show = orion_gpio_dbg_show;



	spin_lock_init(&ochip->lock);
@@ -605,7 +601,7 @@ void __init orion_gpio_init(struct device_node *np, 
			       IRQ_NOREQUEST, IRQ_LEVEL | IRQ_NOPROBE);



	/* Setup irq domain on top of the generic chip. */

	ochip->domain = irq_domain_add_legacy(np,

	ochip->domain = irq_domain_add_legacy(NULL,

					      ochip->chip.ngpio,

					      ochip->secondary_irq_base,

					      ochip->secondary_irq_base,

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

+1 −2
Original line number Diff line number Diff line
@@ -30,8 +30,7 @@ int orion_gpio_led_blink_set(struct gpio_desc *desc, int state, 
void orion_gpio_set_valid(unsigned pin, int mode);



/* Initialize gpiolib. */

void __init orion_gpio_init(struct device_node *np,

			    int gpio_base, int ngpio,

void __init orion_gpio_init(int gpio_base, int ngpio,

			    void __iomem *base, int mask_offset,

			    int secondary_irq_base,

			    int irq[4]);