mirror of https://gitee.com/openkylin/linux.git
irqchip fixes for 5.13, take #1
- Fix PXA Mainstone CPLD irq allocation in legacy mode - Restrict the Apple AIC controller to the Apple platform - Remove a few supperfluous messages on devm_ioremap_resource() failure -----BEGIN PGP SIGNATURE----- iQJDBAABCgAtFiEEn9UcU+C1Yxj9lZw9I9DQutE9ekMFAmChDPkPHG1hekBrZXJu ZWwub3JnAAoJECPQ0LrRPXpDUlsQALtJsa71MGNei13KqhNzfQArW7pFhgGbrmlN aPQHdJ78sUx4lPD8UHHiRt1s/sIN8IfJzw2COMnD15mZIeqomKtSaXvpOt7a8FbF 1Tkmcog+NdJhKGlN5YmJh3LJgWalsyuOmAoHBMhoD+bmV9tu8bXeXnCba4aNnBRS 57NjRE9e9tQ3WOUym65rwx/pxsrY1SMpPT4A7qOyVICEFPbxNB4A60i42C+EhhIn 9ahLGSVSDYPZFjBx0cSIBWoAnPSqkoiDHNhngDY499V3kkWNab5qyuyykJHDfLkl OzaLX1SiXBkt5gAoWIqrGDArknlDnjglSvoajl3TYBucKEpH/KjX/XVQgzHn9oHP XFa97LNMajwDHAdhInVi3XgZ/LsDcWzja+4w9RaRnh2VRqO5PhOMFKdIMAKk1O3x tsOfa5i9Dr6z74rPzgXdLH99WlnB8JqLNdnUzgADxOSCwUPFEnrAlTfeoCMq45u2 0Ho6VwzTb0oUYbRzGsGv9RIV7MsgnotGkSdgWsYdppj/711DBWv8fn2O33mUXzaD IeTjm+frVcQ6L4yT6O4JUoZfERX7oHS8KwokPv3hn+M28BsX2sRRtpy0fn3vHhlu 1UOlQ7xqk+DqMcO3JeOUa/Mz7eMFvQM3oC0uUBi95RrGh8NtySdSeV1/wcsspK+0 yAZR7mef =iLd3 -----END PGP SIGNATURE----- Merge tag 'irqchip-fixes-5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent Pull irqchip fixes from Marc Zyngier: - Fix PXA Mainstone CPLD irq allocation in legacy mode - Restrict the Apple AIC controller to the Apple platform - Remove a few supperfluous messages on devm_ioremap_resource() failure Link: https://lore.kernel.org/r/20210516122217.13234-1-maz@kernel.org
This commit is contained in:
commit
b4764905ea
|
@ -121,8 +121,13 @@ static int cplds_probe(struct platform_device *pdev)
|
|||
return fpga->irq;
|
||||
|
||||
base_irq = platform_get_irq(pdev, 1);
|
||||
if (base_irq < 0)
|
||||
if (base_irq < 0) {
|
||||
base_irq = 0;
|
||||
} else {
|
||||
ret = devm_irq_alloc_descs(&pdev->dev, base_irq, base_irq, CPLDS_NB_IRQ, 0);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
}
|
||||
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
fpga->base = devm_ioremap_resource(&pdev->dev, res);
|
||||
|
|
|
@ -596,7 +596,7 @@ config IRQ_IDT3243X
|
|||
config APPLE_AIC
|
||||
bool "Apple Interrupt Controller (AIC)"
|
||||
depends on ARM64
|
||||
default ARCH_APPLE
|
||||
depends on ARCH_APPLE || COMPILE_TEST
|
||||
help
|
||||
Support for the Apple Interrupt Controller found on Apple Silicon SoCs,
|
||||
such as the M1.
|
||||
|
|
|
@ -359,10 +359,8 @@ static int mvebu_icu_probe(struct platform_device *pdev)
|
|||
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
icu->base = devm_ioremap_resource(&pdev->dev, res);
|
||||
if (IS_ERR(icu->base)) {
|
||||
dev_err(&pdev->dev, "Failed to map icu base address.\n");
|
||||
if (IS_ERR(icu->base))
|
||||
return PTR_ERR(icu->base);
|
||||
}
|
||||
|
||||
/*
|
||||
* Legacy bindings: ICU is one node with one MSI parent: force manually
|
||||
|
|
|
@ -384,10 +384,8 @@ static int mvebu_sei_probe(struct platform_device *pdev)
|
|||
|
||||
sei->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
sei->base = devm_ioremap_resource(sei->dev, sei->res);
|
||||
if (IS_ERR(sei->base)) {
|
||||
dev_err(sei->dev, "Failed to remap SEI resource\n");
|
||||
if (IS_ERR(sei->base))
|
||||
return PTR_ERR(sei->base);
|
||||
}
|
||||
|
||||
/* Retrieve the SEI capabilities with the interrupt ranges */
|
||||
sei->caps = of_device_get_match_data(&pdev->dev);
|
||||
|
|
|
@ -892,10 +892,8 @@ static int stm32_exti_probe(struct platform_device *pdev)
|
|||
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
host_data->base = devm_ioremap_resource(dev, res);
|
||||
if (IS_ERR(host_data->base)) {
|
||||
dev_err(dev, "Unable to map registers\n");
|
||||
if (IS_ERR(host_data->base))
|
||||
return PTR_ERR(host_data->base);
|
||||
}
|
||||
|
||||
for (i = 0; i < drv_data->bank_nr; i++)
|
||||
stm32_exti_chip_init(host_data, i, np);
|
||||
|
|
Loading…
Reference in New Issue