kernel: qca-ssdk: update to 12.4.5.r1
[openwrt/staging/jogo.git] / package / kernel / qca-nss-dp / patches / 0003-Drop-_nocache-variants-of-ioremap.patch
1 From c8c52512ff48bee578901c381a42f027e79eadf9 Mon Sep 17 00:00:00 2001
2 Message-Id: <c8c52512ff48bee578901c381a42f027e79eadf9.1620066716.git.baruch@tkos.co.il>
3 In-Reply-To: <40979666b4371012405715ffa61ab5760fcdc6b3.1620066716.git.baruch@tkos.co.il>
4 References: <40979666b4371012405715ffa61ab5760fcdc6b3.1620066716.git.baruch@tkos.co.il>
5 From: Baruch Siach <baruch@tkos.co.il>
6 Date: Mon, 3 May 2021 20:20:29 +0300
7 Subject: [PATCH 3/3] Drop _nocache variants of ioremap()
8
9 Recent kernels removed them.
10 ---
11 hal/dp_ops/edma_dp/edma_v1/edma_data_plane.c | 2 +-
12 hal/gmac_ops/qcom/qcom_if.c | 2 +-
13 hal/gmac_ops/syn/xgmac/syn_if.c | 2 +-
14 3 files changed, 3 insertions(+), 3 deletions(-)
15
16 --- a/hal/dp_ops/edma_dp/edma_v1/edma_data_plane.c
17 +++ b/hal/dp_ops/edma_dp/edma_v1/edma_data_plane.c
18 @@ -279,7 +279,7 @@ int edma_init(void)
19 /*
20 * Remap register resource
21 */
22 - edma_hw.reg_base = ioremap_nocache((edma_hw.reg_resource)->start,
23 + edma_hw.reg_base = ioremap((edma_hw.reg_resource)->start,
24 resource_size(edma_hw.reg_resource));
25 if (!edma_hw.reg_base) {
26 pr_warn("Unable to remap EDMA register memory.\n");
27 --- a/hal/gmac_ops/qcom/qcom_if.c
28 +++ b/hal/gmac_ops/qcom/qcom_if.c
29 @@ -418,7 +418,7 @@ static void *qcom_init(struct nss_gmac_h
30 qhd->nghd.mac_id = gmacpdata->macid;
31
32 /* Populate the mac base addresses */
33 - qhd->nghd.mac_base = devm_ioremap_nocache(&dp_priv->pdev->dev,
34 + qhd->nghd.mac_base = devm_ioremap(&dp_priv->pdev->dev,
35 res->start, resource_size(res));
36 if (!qhd->nghd.mac_base) {
37 netdev_dbg(ndev, "ioremap fail.\n");
38 --- a/hal/gmac_ops/syn/xgmac/syn_if.c
39 +++ b/hal/gmac_ops/syn/xgmac/syn_if.c
40 @@ -432,7 +432,7 @@ static void *syn_init(struct nss_gmac_ha
41
42 /* Populate the mac base addresses */
43 shd->nghd.mac_base =
44 - devm_ioremap_nocache(&dp_priv->pdev->dev, res->start,
45 + devm_ioremap(&dp_priv->pdev->dev, res->start,
46 resource_size(res));
47 if (!shd->nghd.mac_base) {
48 netdev_dbg(ndev, "ioremap fail.\n");