caskd/openwrt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ath79: use ioremap kernel version independent

Browse Source 
As mangix pointed out on IRC, ioremap and ioremap_nocache are
functionally equivalent on kenrel 5.4 and 5.10.

Therefore we can use ioremap regardless of the kernel the driver
gets compiled for.

Signed-off-by: David Bauer <mail@david-bauer.net>
This commit is contained in:
David Bauer 2021-02-20 09:43:35 +01:00
parent 777e67301a
commit 81b44a3626
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
View File

@ -936,11 +936,7 @@ __ag71xx_link_adjust(struct ag71xx *ag, bool update)
* The wr, rr functions cannot be used since this hidden register * The wr, rr functions cannot be used since this hidden register
* is outside of the normal ag71xx register block. * is outside of the normal ag71xx register block.
*/ */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0)
void __iomem *dam = ioremap(0xb90001bc, 0x4); void __iomem *dam = ioremap(0xb90001bc, 0x4);
#else
void __iomem *dam = ioremap_nocache(0xb90001bc, 0x4);
#endif
if (dam) { if (dam) {
__raw_writel(__raw_readl(dam) & ~BIT(27), dam); __raw_writel(__raw_readl(dam) & ~BIT(27), dam);
(void)__raw_readl(dam); (void)__raw_readl(dam);
@ -1587,25 +1583,15 @@ static int ag71xx_probe(struct platform_device *pdev)
ag->pllregmap = NULL; ag->pllregmap = NULL;
} }
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0)
ag->mac_base = devm_ioremap(&pdev->dev, res->start, ag->mac_base = devm_ioremap(&pdev->dev, res->start,
res->end - res->start + 1); res->end - res->start + 1);
#else
ag->mac_base = devm_ioremap_nocache(&pdev->dev, res->start,
res->end - res->start + 1);
#endif
if (!ag->mac_base) if (!ag->mac_base)
return -ENOMEM; return -ENOMEM;
res = platform_get_resource(pdev, IORESOURCE_MEM, 1); res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
if (res) { if (res) {
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0)
ag->mii_base = devm_ioremap(&pdev->dev, res->start, ag->mii_base = devm_ioremap(&pdev->dev, res->start,
res->end - res->start + 1); res->end - res->start + 1);
#else
ag->mii_base = devm_ioremap_nocache(&pdev->dev, res->start,
res->end - res->start + 1);
#endif
if (!ag->mii_base) if (!ag->mii_base)
return -ENOMEM; return -ENOMEM;
} }