Merge branch 'topic/cs47l24' of... (3f97ab4c) · Commits · 戴 / test

sound/soc/codecs/Kconfig

+8 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ config SND_SOC_ALL_CODECS
		select SND_SOC_CS4271_SPI if SPI_MASTER
		select SND_SOC_CS42XX8_I2C if I2C
		select SND_SOC_CS4349 if I2C
		select SND_SOC_CS47L24 if MFD_CS47L24
		select SND_SOC_CX20442 if TTY
		select SND_SOC_DA7210 if SND_SOC_I2C_AND_SPI
		select SND_SOC_DA7213 if I2C
		@@ -195,10 +196,12 @@ config SND_SOC_88PM860X

		config SND_SOC_ARIZONA
		tristate
		default y if SND_SOC_CS47L24=y
		default y if SND_SOC_WM5102=y
		default y if SND_SOC_WM5110=y
		default y if SND_SOC_WM8997=y
		default y if SND_SOC_WM8998=y
		default m if SND_SOC_CS47L24=m
		default m if SND_SOC_WM5102=m
		default m if SND_SOC_WM5110=m
		default m if SND_SOC_WM8997=m
		@@ -211,9 +214,11 @@ config SND_SOC_WM_HUBS

		config SND_SOC_WM_ADSP
		tristate
		default y if SND_SOC_CS47L24=y
		default y if SND_SOC_WM5102=y
		default y if SND_SOC_WM5110=y
		default y if SND_SOC_WM2200=y
		default m if SND_SOC_CS47L24=m
		default m if SND_SOC_WM5102=m
		default m if SND_SOC_WM5110=m
		default m if SND_SOC_WM2200=m
		@@ -422,6 +427,9 @@ config SND_SOC_CS4349
		tristate "Cirrus Logic CS4349 CODEC"
		depends on I2C

		config SND_SOC_CS47L24
		tristate

		config SND_SOC_CX20442
		tristate
		depends on TTY

+2 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ snd-soc-cs4271-spi-objs := cs4271-spi.o
		snd-soc-cs42xx8-objs := cs42xx8.o
		snd-soc-cs42xx8-i2c-objs := cs42xx8-i2c.o
		snd-soc-cs4349-objs := cs4349.o
		snd-soc-cs47l24-objs := cs47l24.o
		snd-soc-cx20442-objs := cx20442.o
		snd-soc-da7210-objs := da7210.o
		snd-soc-da7213-objs := da7213.o
		@@ -242,6 +243,7 @@ obj-$(CONFIG_SND_SOC_CS4271_SPI) += snd-soc-cs4271-spi.o
		obj-$(CONFIG_SND_SOC_CS42XX8) += snd-soc-cs42xx8.o
		obj-$(CONFIG_SND_SOC_CS42XX8_I2C) += snd-soc-cs42xx8-i2c.o
		obj-$(CONFIG_SND_SOC_CS4349) += snd-soc-cs4349.o
		obj-$(CONFIG_SND_SOC_CS47L24) += snd-soc-cs47l24.o
		obj-$(CONFIG_SND_SOC_CX20442) += snd-soc-cx20442.o
		obj-$(CONFIG_SND_SOC_DA7210) += snd-soc-da7210.o
		obj-$(CONFIG_SND_SOC_DA7213) += snd-soc-da7213.o

0 → 100644

+1148 −0

File added.

Preview size limit exceeded, changes collapsed.

0 → 100644

+23 −0

Original line number	Diff line number	Diff line
		/*
		* cs47l24.h -- ALSA SoC Audio driver for Cirrus Logic CS47L24
		*
		* Copyright 2015 Cirrus Logic Inc.
		*
		* Author: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		*/

		#ifndef _CS47L24_H
		#define _CS47L24_H

		#include "arizona.h"

		#define CS47L24_FLL1 1
		#define CS47L24_FLL2 2
		#define CS47L24_FLL1_REFCLK 3
		#define CS47L24_FLL2_REFCLK 4

		#endif