mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

irq/gpio: ixp4xx: Drop boardfile probe path 

The boardfiles for IXP4xx have been deleted. Delete all the
quirks and code dealing with that boot path and rely solely on
device tree boot.

Fix some missing static keywords that the kernel test robot
was complaining about while we're at it.

Cc: Bartosz Golaszewski <brgl@bgdev.pl>
Acked-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
This commit is contained in:
Linus Walleij 2022-04-21 22:06:54 +02:00 committed by Bartosz Golaszewski
parent 6588cb81e5
commit c83227a5d0
4 changed files with 17 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpio/Kconfig
View File

@ -354,6 +354,7 @@ config GPIO_IOP
config GPIO_IXP4XX
bool "Intel IXP4xx GPIO"
depends on ARCH_IXP4XX
depends on OF
select GPIO_GENERIC
select GPIOLIB_IRQCHIP
select IRQ_DOMAIN_HIERARCHY
@ -362,6 +363,7 @@ config GPIO_IXP4XX
IXP4xx series of chips.
If unsure, say N.
config GPIO_LOGICVC
tristate "Xylon LogiCVC GPIO support"
depends on MFD_SYSCON && OF

40
drivers/gpio/gpio-ixp4xx.c
View File

@ -14,8 +14,6 @@
#include <linux/of_irq.h>
#include <linux/platform_device.h>
#include <linux/bitops.h>
/* Include that go away with DT transition */
#include <linux/irqchip/irq-ixp4xx.h>
#define IXP4XX_REG_GPOUT 0x00
#define IXP4XX_REG_GPOE 0x04
@ -193,6 +191,7 @@ static int ixp4xx_gpio_probe(struct platform_device *pdev)
struct resource *res;
struct ixp4xx_gpio *g;
struct gpio_irq_chip *girq;
struct device_node *irq_parent;
int ret;
g = devm_kzalloc(dev, sizeof(*g), GFP_KERNEL);
@ -205,34 +204,17 @@ static int ixp4xx_gpio_probe(struct platform_device *pdev)
if (IS_ERR(g->base))
return PTR_ERR(g->base);
/*
* When we convert to device tree we will simply look up the
* parent irqdomain using irq_find_host(parent) as parent comes
* from IRQCHIP_DECLARE(), then use of_node_to_fwnode() to get
* the fwnode. For now we need this boardfile style code.
*/
if (np) {
struct device_node *irq_parent;
irq_parent = of_irq_find_parent(np);
if (!irq_parent) {
dev_err(dev, "no IRQ parent node\n");
return -ENODEV;
}
parent = irq_find_host(irq_parent);
if (!parent) {
dev_err(dev, "no IRQ parent domain\n");
return -ENODEV;
}
g->fwnode = of_node_to_fwnode(np);
} else {
parent = ixp4xx_get_irq_domain();
g->fwnode = irq_domain_alloc_fwnode(&res->start);
if (!g->fwnode) {
dev_err(dev, "no domain base\n");
return -ENODEV;
}
irq_parent = of_irq_find_parent(np);
if (!irq_parent) {
dev_err(dev, "no IRQ parent node\n");
return -ENODEV;
}
parent = irq_find_host(irq_parent);
if (!parent) {
dev_err(dev, "no IRQ parent domain\n");
return -ENODEV;
}
g->fwnode = of_node_to_fwnode(np);
/*
* Make sure GPIO 14 and 15 are NOT used as clocks but GPIO on

126
drivers/irqchip/irq-ixp4xx.c
View File

@ -13,7 +13,6 @@
#include <linux/irq.h>
#include <linux/io.h>
#include <linux/irqchip.h>
#include <linux/irqchip/irq-ixp4xx.h>
#include <linux/irqdomain.h>
#include <linux/of.h>
#include <linux/of_address.h>
@ -106,7 +105,8 @@ static void ixp4xx_irq_unmask(struct irq_data *d)
}
}
asmlinkage void __exception_irq_entry ixp4xx_handle_irq(struct pt_regs *regs)
static asmlinkage void __exception_irq_entry
ixp4xx_handle_irq(struct pt_regs *regs)
{
struct ixp4xx_irq *ixi = &ixirq;
unsigned long status;
@ -195,56 +195,6 @@ static const struct irq_domain_ops ixp4xx_irqdomain_ops = {
.free = irq_domain_free_irqs_common,
};
/**
* ixp4xx_get_irq_domain() - retrieve the ixp4xx irq domain
*
* This function will go away when we transition to DT probing.
*/
struct irq_domain *ixp4xx_get_irq_domain(void)
{
struct ixp4xx_irq *ixi = &ixirq;
return ixi->domain;
}
EXPORT_SYMBOL_GPL(ixp4xx_get_irq_domain);
/*
* This is the Linux IRQ to hwirq mapping table. This goes away when
* we have DT support as all IRQ resources are defined in the device
* tree. It will register all the IRQs that are not used by the hierarchical
* GPIO IRQ chip. The "holes" inbetween these IRQs will be requested by
* the GPIO driver using . This is a step-gap solution.
*/
struct ixp4xx_irq_chunk {
int irq;
int hwirq;
int nr_irqs;
};
static const struct ixp4xx_irq_chunk ixp4xx_irq_chunks[] = {
{
.irq = 16,
.hwirq = 0,
.nr_irqs = 6,
},
{
.irq = 24,
.hwirq = 8,
.nr_irqs = 11,
},
{
.irq = 46,
.hwirq = 30,
.nr_irqs = 2,
},
/* Only on the 436 variants */
{
.irq = 48,
.hwirq = 32,
.nr_irqs = 10,
},
};
/**
* ixp4x_irq_setup() - Common setup code for the IXP4xx interrupt controller
* @ixi: State container
@ -298,75 +248,8 @@ static int __init ixp4xx_irq_setup(struct ixp4xx_irq *ixi,
return 0;
}
/**
* ixp4xx_irq_init() - Function to initialize the irqchip from boardfiles
* @irqbase: physical base for the irq controller
* @is_356: if this is an IXP43x, IXP45x or IXP46x SoC variant
*/
void __init ixp4xx_irq_init(resource_size_t irqbase,
bool is_356)
{
struct ixp4xx_irq *ixi = &ixirq;
void __iomem *base;
struct fwnode_handle *fwnode;
struct irq_fwspec fwspec;
int nr_chunks;
int ret;
int i;
base = ioremap(irqbase, 0x100);
if (!base) {
pr_crit("IXP4XX: could not ioremap interrupt controller\n");
return;
}
fwnode = irq_domain_alloc_fwnode(&irqbase);
if (!fwnode) {
pr_crit("IXP4XX: no domain handle\n");
return;
}
ret = ixp4xx_irq_setup(ixi, base, fwnode, is_356);
if (ret) {
pr_crit("IXP4XX: failed to set up irqchip\n");
irq_domain_free_fwnode(fwnode);
}
nr_chunks = ARRAY_SIZE(ixp4xx_irq_chunks);
if (!is_356)
nr_chunks--;
/*
* After adding OF support, this is no longer needed: irqs
* will be allocated for the respective fwnodes.
*/
for (i = 0; i < nr_chunks; i++) {
const struct ixp4xx_irq_chunk *chunk = &ixp4xx_irq_chunks[i];
pr_info("Allocate Linux IRQs %d..%d HW IRQs %d..%d\n",
chunk->irq, chunk->irq + chunk->nr_irqs - 1,
chunk->hwirq, chunk->hwirq + chunk->nr_irqs - 1);
fwspec.fwnode = fwnode;
fwspec.param[0] = chunk->hwirq;
fwspec.param[1] = IRQ_TYPE_LEVEL_HIGH;
fwspec.param_count = 2;
ret = __irq_domain_alloc_irqs(ixi->domain,
chunk->irq,
chunk->nr_irqs,
NUMA_NO_NODE,
&fwspec,
false,
NULL);
if (ret < 0) {
pr_crit("IXP4XX: can not allocate irqs in hierarchy %d\n",
ret);
return;
}
}
}
EXPORT_SYMBOL_GPL(ixp4xx_irq_init);
#ifdef CONFIG_OF
int __init ixp4xx_of_init_irq(struct device_node *np,
struct device_node *parent)
static int __init ixp4xx_of_init_irq(struct device_node *np,
struct device_node *parent)
{
struct ixp4xx_irq *ixi = &ixirq;
void __iomem *base;
@ -400,4 +283,3 @@ IRQCHIP_DECLARE(ixp45x, "intel,ixp45x-interrupt",
ixp4xx_of_init_irq);
IRQCHIP_DECLARE(ixp46x, "intel,ixp46x-interrupt",
ixp4xx_of_init_irq);
#endif

12
include/linux/irqchip/irq-ixp4xx.h
View File

@ -1,12 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef __IRQ_IXP4XX_H
#define __IRQ_IXP4XX_H
#include <linux/ioport.h>
struct irq_domain;
void ixp4xx_irq_init(resource_size_t irqbase,
bool is_356);
struct irq_domain *ixp4xx_get_irq_domain(void);
#endif /* __IRQ_IXP4XX_H */