diff mbox series

[2/2] ASoC: wm8960: Make automatic the default clocking mode

Message ID 20230731-asoc-wm8960-clk-v1-2-69f9ffa2b10a@kernel.org (mailing list archive)
State Accepted
Commit 2bbc2df46e67be1a26b9c2b18a581b83e17ccb19
Headers show
Series ASoC: wm8960: Clocking tweaks | expand

Commit Message

Mark Brown July 31, 2023, 10:47 a.m. UTC
The wm8960 driver supports an automatic clocking mode which will use the
MCLK directly where possible and fall back to the PLL if there is no
suitable configuration directly using the MCLK.  Clock 0 will be used by
the generic cards when configuring things, currently this is a MCLK only
mode but using AUTO mode would be more functional.  Since the driver
still prefers to use MCLK directly where possible there should be no
negative impact on systems which are able to use MCLK directly.

As far as I can see nothing is using the system clock as part of the
ABI, the only reference I can see to a mode in a machine driver is the
Freescale i.MX card which uses the automatic mode with an explicit in
kernel call using the constant so will be unaffected.

Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/codecs/wm8960.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Charles Keepax July 31, 2023, 3:08 p.m. UTC | #1
On Mon, Jul 31, 2023 at 11:47:03AM +0100, Mark Brown wrote:
> The wm8960 driver supports an automatic clocking mode which will use the
> MCLK directly where possible and fall back to the PLL if there is no
> suitable configuration directly using the MCLK.  Clock 0 will be used by
> the generic cards when configuring things, currently this is a MCLK only
> mode but using AUTO mode would be more functional.  Since the driver
> still prefers to use MCLK directly where possible there should be no
> negative impact on systems which are able to use MCLK directly.
> 
> As far as I can see nothing is using the system clock as part of the
> ABI, the only reference I can see to a mode in a machine driver is the
> Freescale i.MX card which uses the automatic mode with an explicit in
> kernel call using the constant so will be unaffected.
> 
> Signed-off-by: Mark Brown <broonie@kernel.org>
> ---

Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>

Thanks,
Charles
diff mbox series

Patch

diff --git a/sound/soc/codecs/wm8960.h b/sound/soc/codecs/wm8960.h
index 63ba6c03c488..e8ff33b188e9 100644
--- a/sound/soc/codecs/wm8960.h
+++ b/sound/soc/codecs/wm8960.h
@@ -77,9 +77,9 @@ 
 #define WM8960_SYSCLK_DIV_1		(0 << 1)
 #define WM8960_SYSCLK_DIV_2		(2 << 1)
 
-#define WM8960_SYSCLK_MCLK		(0 << 0)
+#define WM8960_SYSCLK_AUTO		(0 << 0)
 #define WM8960_SYSCLK_PLL		(1 << 0)
-#define WM8960_SYSCLK_AUTO		(2 << 0)
+#define WM8960_SYSCLK_MCLK		(2 << 0)
 
 #define WM8960_DAC_DIV_1		(0 << 3)
 #define WM8960_DAC_DIV_1_5		(1 << 3)