Skip to content

P
Platform-independent core collection
Commit 21f2e94e authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

Merge branch 'hotfix/v1.1.2'

parents 96630ec6 0184795d
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 26 deletions
CHANGELOG.rst
View file @ 21f2e94e
......@@ -9,6 +9,14 @@ Change Log
- Format inspired by: `Keep a Changelog <https://keepachangelog.com/en/1.0.0/>`_
- Versioning scheme follows: `Semantic Versioning <https://semver.org/spec/v2.0.0.html>`_
1.1.2 - 2021-07-29
==================
https://www.ohwr.org/project/general-cores/tags/v1.1.2
Fixed
-----
- sw: improve compatibility with newer (> 3.10) Linux kernel versions
1.1.1 - 2020-09-14
==================
https://www.ohwr.org/project/general-cores/tags/v1.1.1
......
software/htvic/drivers/htvic.c
View file @ 21f2e94e
......@@ -269,29 +269,6 @@ static struct irq_chip htvic_chip = {
.irq_set_type = htvic_irq_set_type,
};
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
static int htvic_irq_domain_select(struct irq_domain *d, struct irq_fwspec *fwspec,
enum irq_domain_bus_token bus_token)
{
struct htvic_device *htvic = d->host_data;
/*
* FIXME this should point to htvic->pdev->dev.parent. Today it is not
* a problem for CERN-like installations, so we leave it like this
* so that the WR-stating kit works.
*/
struct device *dev = &htvic->pdev->dev;
struct device *req_dev;
if(fwspec->param_count != 2)
return 0;
req_dev = (struct device *) ((((unsigned long) fwspec->param[0]) << 32) |
(((unsigned long) fwspec->param[1]) & 0xFFFFFFFF));
return (dev == req_dev);
}
#endif
/**
* Given the hardware IRQ and the Linux IRQ number (virtirq), configure the
* Linux IRQ number in order to handle properly the incoming interrupts
......@@ -321,9 +298,6 @@ static int htvic_irq_domain_map(struct irq_domain *h,
static struct irq_domain_ops htvic_irq_domain_ops = {
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
.select = htvic_irq_domain_select,
#endif
.map = htvic_irq_domain_map,
};
......@@ -335,11 +309,26 @@ static int htvic_irq_mapping(struct htvic_device *htvic)
{
int i, irq;
#if KERNEL_VERSION(4, 4, 0) <= LINUX_VERSION_CODE
htvic->pdev->dev.fwnode = irq_domain_alloc_fwnode(NULL);
if (!htvic->pdev->dev.fwnode) {
dev_err(&htvic->pdev->dev, "Could not allocate fwnode");
return -ENOMEM;
}
htvic->domain = irq_domain_create_linear(htvic->pdev->dev.fwnode,
VIC_MAX_VECTORS,
&htvic_irq_domain_ops, htvic);
if (!htvic->domain) {
irq_domain_free_fwnode(htvic->pdev->dev.fwnode);
return -ENOMEM;
}
#else
htvic->domain = irq_domain_add_linear((void *)&htvic->pdev->dev,
VIC_MAX_VECTORS,
&htvic_irq_domain_ops, htvic);
if (!htvic->domain)
return -ENOMEM;
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)
htvic->domain->name = kasprintf(GFP_KERNEL, "%s",
dev_name(&htvic->pdev->dev));
......@@ -362,6 +351,9 @@ static int htvic_irq_mapping(struct htvic_device *htvic)
out:
irq_domain_remove(htvic->domain);
#if KERNEL_VERSION(4, 4, 0) <= LINUX_VERSION_CODE
irq_domain_free_fwnode(htvic->pdev->dev.fwnode);
#endif
return -EPERM;
}
......@@ -613,6 +605,9 @@ static int htvic_remove(struct platform_device *pdev)
* Clear the memory and restore flags when needed
*/
irq_domain_remove(htvic->domain);
#if KERNEL_VERSION(4, 4, 0) <= LINUX_VERSION_CODE
irq_domain_free_fwnode(htvic->pdev->dev.fwnode);
#endif
kfree(htvic);
dev_set_drvdata(&pdev->dev, NULL);
......
software/i2c-ocores/drivers/i2c/busses/i2c-ocores.c
View file @ 21f2e94e
......@@ -982,7 +982,11 @@ static int ocores_i2c_probe(struct platform_device *pdev)
/* add in known devices to the bus */
if (pdata) {
for (i = 0; i < pdata->num_devices; i++)
#if KERNEL_VERSION(5, 2, 0) <= LINUX_VERSION_CODE
i2c_new_client_device(&i2c->adap, pdata->devices + i);
#else
i2c_new_device(&i2c->adap, pdata->devices + i);
#endif
}
return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment