Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "asoc: bolero: Bringup fixes in Vipertooth"

Browse source
This commit is contained in:
Linux Build Service Account 2018-07-09 20:42:38 -07:00 • committed by Gerrit - the friendly Code Review server
commit ab8586d542
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
asoc/codecs/bolero/bolero-cdc-regmap.c
View file

@ -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);

2
asoc/codecs/bolero/va-macro.c
View file

@ -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;