From a9c69199a77c68ee7f70b7644d234cbd0a882835 Mon Sep 17 00:00:00 2001 From: Mangesh Kunchamwar Date: Tue, 3 Jul 2018 18:00:40 +0530 Subject: [PATCH] asoc: bolero: Bringup fixes in Vipertooth Add bringup fixes for bolero regmap and va-macro micbias property setting. Change-Id: I536b7bf6ff625da1f2f639a93cf1f9174cfd6447 Signed-off-by: Mangesh Kunchamwar --- asoc/codecs/bolero/bolero-cdc-regmap.c | 4 ++-- asoc/codecs/bolero/va-macro.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/asoc/codecs/bolero/bolero-cdc-regmap.c b/asoc/codecs/bolero/bolero-cdc-regmap.c index 46c808607eca..f026c26f9aeb 100644 --- a/asoc/codecs/bolero/bolero-cdc-regmap.c +++ b/asoc/codecs/bolero/bolero-cdc-regmap.c @@ -758,7 +758,7 @@ static bool bolero_is_readable_register(struct device *dev, return false; reg_tbl = bolero_reg_access[macro_id]; - reg_offset = reg - macro_id_base_offset[macro_id]; + reg_offset = (reg - macro_id_base_offset[macro_id])/4; if (reg_tbl) return (reg_tbl[reg_offset] & RD_REG); @@ -783,7 +783,7 @@ static bool bolero_is_writeable_register(struct device *dev, return false; reg_tbl = bolero_reg_access[macro_id]; - reg_offset = reg - macro_id_base_offset[macro_id]; + reg_offset = (reg - macro_id_base_offset[macro_id])/4; if (reg_tbl) return (reg_tbl[reg_offset] & WR_REG); diff --git a/asoc/codecs/bolero/va-macro.c b/asoc/codecs/bolero/va-macro.c index 113e341f5367..a9c27e6d953d 100644 --- a/asoc/codecs/bolero/va-macro.c +++ b/asoc/codecs/bolero/va-macro.c @@ -1430,7 +1430,7 @@ static int va_macro_probe(struct platform_device *pdev) char __iomem *va_io_base; struct clk *va_core_clk; bool va_without_decimation = false; - const char *micb_supply_str = "va-vdd-micb-supply"; + const char *micb_supply_str = "va-vdd-micb"; const char *micb_voltage_str = "qcom,va-vdd-micb-voltage"; const char *micb_current_str = "qcom,va-vdd-micb-current"; int ret = 0;