net: qrtr: Uncomment makefile

During initial GKI bringup, some of the QRTR modules were causing
issues and the makefile was commented out to continue.

Uncomment the haven and tun transports and fix any compilation
errors that are from the kernel upgrade.

Change-Id: Ie58245fc52c866ce9bbbcd0fd45b86bc2bbc388c
Signed-off-by: Chris Lew <clew@codeaurora.org>
This commit is contained in:
Chris Lew 2021-01-15 13:54:19 -08:00
parent b4b6b51b8a
commit ae376cee64
2 changed files with 5 additions and 5 deletions

View File

@ -3,9 +3,9 @@ obj-$(CONFIG_QRTR) := qrtr.o ns.o
obj-$(CONFIG_QRTR_SMD) += qrtr-smd.o
qrtr-smd-y := smd.o
#obj-$(CONFIG_QRTR_TUN) += qrtr-tun.o
#qrtr-tun-y := tun.o
obj-$(CONFIG_QRTR_TUN) += qrtr-tun.o
qrtr-tun-y := tun.o
obj-$(CONFIG_QRTR_MHI) += qrtr-mhi.o
qrtr-mhi-y := mhi.o
#obj-$(CONFIG_QRTR_HAVEN) += qrtr-haven.o
#qrtr-haven-y := haven.o
obj-$(CONFIG_QRTR_HAVEN) += qrtr-haven.o
qrtr-haven-y := haven.o

View File

@ -533,7 +533,7 @@ static int qrtr_haven_map_memory(struct qrtr_haven_dev *qdev)
}
size = resource_size(&qdev->res);
qdev->base = devm_ioremap_nocache(dev, qdev->res.start, size);
qdev->base = devm_ioremap_resource(dev, &qdev->res);
if (!qdev->base) {
dev_err(dev, "ioremap failed!\n");
return -ENXIO;