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

Commit bf659213 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next

parents bc4efdb6 937e92dc

sound/soc/codecs/wm8962.c

+6 −3
Original line number Diff line number Diff line
@@ -3798,9 +3798,8 @@ static int wm8962_runtime_resume(struct device *dev) 
	ret = regulator_bulk_enable(ARRAY_SIZE(wm8962->supplies),

				    wm8962->supplies);

	if (ret != 0) {

		dev_err(dev,

			"Failed to enable supplies: %d\n", ret);

		return ret;

		dev_err(dev, "Failed to enable supplies: %d\n", ret);

		goto disable_clock;

	}



	regcache_cache_only(wm8962->regmap, false);
@@ -3838,6 +3837,10 @@ static int wm8962_runtime_resume(struct device *dev) 
	msleep(5);



	return 0;



disable_clock:

	clk_disable_unprepare(wm8962->pdata.mclk);

	return ret;

}



static int wm8962_runtime_suspend(struct device *dev)

sound/soc/codecs/wm8962.h

+3 −3
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 
#include <asm/types.h>

#include <sound/soc.h>



#define WM8962_SYSCLK_MCLK 1

#define WM8962_SYSCLK_FLL  2

#define WM8962_SYSCLK_PLL3 3

#define WM8962_SYSCLK_MCLK 0

#define WM8962_SYSCLK_FLL  1

#define WM8962_SYSCLK_PLL3 2



#define WM8962_FLL  1