Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab8586d5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: bolero: Bringup fixes in Vipertooth"

parents 8e4d9058 a9c69199

asoc/codecs/bolero/bolero-cdc-regmap.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

asoc/codecs/bolero/va-macro.c

+1 −1
Original line number Diff line number Diff line
@@ -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;