iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mvebu arm for 5.18 (part 1)

Browse Source 
gpio clean-up for Orion
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQQYqXDMF3cvSLY+g9cLBhiOFHI71QUCYh4EyQAKCRALBhiOFHI7
 1R2JAKCJ2g2BUiOMU1tbYdu77kLTE9porQCfTztMcP+W/6Wo2fzr6/YZ91LT7a0=
 =rRNO
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmIeNIwACgkQmmx57+YA
 GNnZmRAAuEhFaTS8gY+KnvWs7YyOHa1KM/uPFWHK/hM9+VSrB1CA9lYDs6AZ02qx
 J3iHbtlSHBqxdRclkpLHEWV/kJcyJ7vAsAkzFQxbc5Z2iquTBD+WsDJzOUj000GN
 KXMc+Q1RHTyR3PrXeCHGzlMqRnXedqCMihjp+7mPLEL3gdsyLmJxxYK7BKJQZLsI
 vaLKWgMcmLT7nWUGuzxOjKH6g1IfZcPgEYbqoo+3MVbWs1TwNKJWxw5RdMwG3PrL
 okyVZ2cHgClx0um63G5GFvu45C1pl2bRUgoByGpbdo7vJT562rjtplxQqc7ejHpK
 fOP1rm89uFY0HL3fU0b8ULAMR7gauioKskWMOvjg3JzC7jPh5OFN0lVi6W9r5bHw
 H3Qjez36fFUr8/2HbdvbnLlVRiTAtnZxJsM4ux3isQZUSif4sQpzDBr82/GQDmR4
 4vjKcXFVMdsSx+BOCU6XRLPF9ZXEww5Nw4C/tLPDxzDO7+PKhU71fl1jVvAsqJ0J
 OTgSmIP5STaqA5cZ+aHH08Qpi1Qe5cIDHIyaQWLv1N3UVBqBzQsr4aWaPtpLnrxe
 BbenFsdlLN+wx1tHsAoPC3d7G9cUiuG21Ed7Epl7/En5ssaLKyc02tZqPUpoE3Ii
 PpMWaadf6DlBBCvlM1H5X+boROLoxpwh75LidBODgC+DshWR+jc=
 =vGOw
 -----END PGP SIGNATURE-----

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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-03-01 15:58:19 +01:00
commit a483b1b232
5 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-dove/irq.c
View File

@ -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);
}

3
arch/arm/mach-mv78xx0/irq.c
View File

@ -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);
}

2
arch/arm/mach-orion5x/irq.c
View File

@ -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);
}

8
arch/arm/plat-orion/gpio.c
View File

@ -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,

3
arch/arm/plat-orion/include/plat/orion-gpio.h
View File

@ -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]);