From 0630ffe2249d845c9d2c3b2f6b347c21f5916b36 Mon Sep 17 00:00:00 2001 From: Mahesh Kumar Sharma Date: Wed, 28 Oct 2020 11:47:16 -0700 Subject: [PATCH] Bluetooth: Don't reserve TCS register address Do not reserve TCS iomemory, Access TCS register and remap it using devm_ioremap. Change-Id: I21fef89af38ec3a5ad110947c1a5adf590c4f2d6 Signed-off-by: Mahesh Kumar Sharma --- drivers/bluetooth/btpower.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/bluetooth/btpower.c b/drivers/bluetooth/btpower.c index d12c61c7aebe..2839bb96f594 100644 --- a/drivers/bluetooth/btpower.c +++ b/drivers/bluetooth/btpower.c @@ -1097,9 +1097,9 @@ static int btpower_get_tcs_table_info(struct platform_device *dev, pr_info("TCS CMD base address is %pa with length %pa\n", &tcs_table_info->tcs_cmd_base_addr, &addr_len); - tcs_cmd_base_addr = devm_ioremap_resource(&plat_dev->dev, res); - if (IS_ERR(tcs_cmd_base_addr)) { - ret = PTR_ERR(tcs_cmd_base_addr); + tcs_cmd_base_addr = devm_ioremap(&plat_dev->dev, res->start, addr_len); + if (!tcs_cmd_base_addr) { + ret = -EINVAL; pr_err("Failed to map TCS CMD address, err = %d\n", ret); goto out; @@ -1142,7 +1142,7 @@ static int btpower_enable_ipa_vreg(struct platform_device *dev, writel_relaxed(1, tcs_cmd); data_val = readl_relaxed(tcs_cmd); - pr_info("Configure S3E TCS Addr : %x with Data: %d\n" + pr_info("Configure S3E TCS Addr for iPA: %x with Data: %d\n" , addr_val, data_val); return 0; }