Merge remote-tracking branches 'asoc/topic/adau' and 'asoc/topic/adsp' into asoc-next (dd7a7bb5) · Commits · e / devices / android_kernel_fairphone_FP5

include/linux/platform_data/adau17x1.h

0 → 100644

+109 −0

Original line number	Diff line number	Diff line
		/*
		* Driver for ADAU1761/ADAU1461/ADAU1761/ADAU1961/ADAU1781/ADAU1781 codecs
		*
		* Copyright 2011-2014 Analog Devices Inc.
		* Author: Lars-Peter Clausen <lars@metafoo.de>
		*
		* Licensed under the GPL-2 or later.
		*/

		#ifndef __LINUX_PLATFORM_DATA_ADAU17X1_H__
		#define __LINUX_PLATFORM_DATA_ADAU17X1_H__

		/**
		* enum adau17x1_micbias_voltage - Microphone bias voltage
		* @ADAU17X1_MICBIAS_0_90_AVDD: 0.9 * AVDD
		* @ADAU17X1_MICBIAS_0_65_AVDD: 0.65 * AVDD
		*/
		enum adau17x1_micbias_voltage {
		ADAU17X1_MICBIAS_0_90_AVDD = 0,
		ADAU17X1_MICBIAS_0_65_AVDD = 1,
		};

		/**
		* enum adau1761_digmic_jackdet_pin_mode - Configuration of the JACKDET/MICIN pin
		* @ADAU1761_DIGMIC_JACKDET_PIN_MODE_NONE: Disable the pin
		* @ADAU1761_DIGMIC_JACKDET_PIN_MODE_DIGMIC: Configure the pin for usage as
		* digital microphone input.
		* @ADAU1761_DIGMIC_JACKDET_PIN_MODE_JACKDETECT: Configure the pin for jack
		* insertion detection.
		*/
		enum adau1761_digmic_jackdet_pin_mode {
		ADAU1761_DIGMIC_JACKDET_PIN_MODE_NONE,
		ADAU1761_DIGMIC_JACKDET_PIN_MODE_DIGMIC,
		ADAU1761_DIGMIC_JACKDET_PIN_MODE_JACKDETECT,
		};

		/**
		* adau1761_jackdetect_debounce_time - Jack insertion detection debounce time
		* @ADAU1761_JACKDETECT_DEBOUNCE_5MS: 5 milliseconds
		* @ADAU1761_JACKDETECT_DEBOUNCE_10MS: 10 milliseconds
		* @ADAU1761_JACKDETECT_DEBOUNCE_20MS: 20 milliseconds
		* @ADAU1761_JACKDETECT_DEBOUNCE_40MS: 40 milliseconds
		*/
		enum adau1761_jackdetect_debounce_time {
		ADAU1761_JACKDETECT_DEBOUNCE_5MS = 0,
		ADAU1761_JACKDETECT_DEBOUNCE_10MS = 1,
		ADAU1761_JACKDETECT_DEBOUNCE_20MS = 2,
		ADAU1761_JACKDETECT_DEBOUNCE_40MS = 3,
		};

		/**
		* enum adau1761_output_mode - Output mode configuration
		* @ADAU1761_OUTPUT_MODE_HEADPHONE: Headphone output
		* @ADAU1761_OUTPUT_MODE_HEADPHONE_CAPLESS: Capless headphone output
		* @ADAU1761_OUTPUT_MODE_LINE: Line output
		*/
		enum adau1761_output_mode {
		ADAU1761_OUTPUT_MODE_HEADPHONE,
		ADAU1761_OUTPUT_MODE_HEADPHONE_CAPLESS,
		ADAU1761_OUTPUT_MODE_LINE,
		};

		/**
		* struct adau1761_platform_data - ADAU1761 Codec driver platform data
		* @input_differential: If true the input pins will be configured in
		* differential mode.
		* @lineout_mode: Output mode for the LOUT/ROUT pins
		* @headphone_mode: Output mode for the LHP/RHP pins
		* @digmic_jackdetect_pin_mode: JACKDET/MICIN pin configuration
		* @jackdetect_debounce_time: Jack insertion detection debounce time.
		* Note: This value will only be used, if the JACKDET/MICIN pin is configured
		* for jack insertion detection.
		* @jackdetect_active_low: If true the jack insertion detection is active low.
		* Othwise it will be active high.
		* @micbias_voltage: Microphone voltage bias
		*/
		struct adau1761_platform_data {
		bool input_differential;
		enum adau1761_output_mode lineout_mode;
		enum adau1761_output_mode headphone_mode;

		enum adau1761_digmic_jackdet_pin_mode digmic_jackdetect_pin_mode;

		enum adau1761_jackdetect_debounce_time jackdetect_debounce_time;
		bool jackdetect_active_low;

		enum adau17x1_micbias_voltage micbias_voltage;
		};

		/**
		* struct adau1781_platform_data - ADAU1781 Codec driver platform data
		* @left_input_differential: If true configure the left input as
		* differential input.
		* @right_input_differential: If true configure the right input as differntial
		* input.
		* @use_dmic: If true configure the MIC pins as digital microphone pins instead
		* of analog microphone pins.
		* @micbias_voltage: Microphone voltage bias
		*/
		struct adau1781_platform_data {
		bool left_input_differential;
		bool right_input_differential;

		bool use_dmic;

		enum adau17x1_micbias_voltage micbias_voltage;
		};

		#endif

sound/soc/blackfin/Kconfig

+26 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,32 @@ config SND_SOC_BFIN_EVAL_ADAU1373
		Note: This driver assumes that first ADAU1373 DAI is connected to the
		first SPORT port on the BF5XX board.

		config SND_SOC_BFIN_EVAL_ADAU1X61
		tristate "Support for the EVAL-ADAU1X61 board on Blackfin eval boards"
		depends on SND_BF5XX_I2S && I2C
		select SND_BF5XX_SOC_I2S
		select SND_SOC_ADAU1761_I2C
		help
		Say Y if you want to add support for the Analog Devices EVAL-ADAU1X61
		board connected to one of the Blackfin evaluation boards like the
		BF5XX-STAMP or BF5XX-EZKIT.

		Note: This driver assumes that the ADAU1X61 is connected to the
		first SPORT port on the BF5XX board.

		config SND_SOC_BFIN_EVAL_ADAU1X81
		tristate "Support for the EVAL-ADAU1X81 boards on Blackfin eval boards"
		depends on SND_BF5XX_I2S && I2C
		select SND_BF5XX_SOC_I2S
		select SND_SOC_ADAU1781_I2C
		help
		Say Y if you want to add support for the Analog Devices EVAL-ADAU1X81
		board connected to one of the Blackfin evaluation boards like the
		BF5XX-STAMP or BF5XX-EZKIT.

		Note: This driver assumes that the ADAU1X81 is connected to the
		first SPORT port on the BF5XX board.

		config SND_SOC_BFIN_EVAL_ADAV80X
		tristate "Support for the EVAL-ADAV80X boards on Blackfin eval boards"
		depends on SND_BF5XX_I2S && SND_SOC_I2C_AND_SPI

sound/soc/blackfin/Makefile

+4 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,8 @@ snd-ssm2602-objs := bf5xx-ssm2602.o
		snd-ad73311-objs := bf5xx-ad73311.o
		snd-ad193x-objs := bf5xx-ad193x.o
		snd-soc-bfin-eval-adau1373-objs := bfin-eval-adau1373.o
		snd-soc-bfin-eval-adau1x61-objs := bfin-eval-adau1x61.o
		snd-soc-bfin-eval-adau1x81-objs := bfin-eval-adau1x81.o
		snd-soc-bfin-eval-adau1701-objs := bfin-eval-adau1701.o
		snd-soc-bfin-eval-adav80x-objs := bfin-eval-adav80x.o

		@@ -31,5 +33,7 @@ obj-$(CONFIG_SND_BF5XX_SOC_SSM2602) += snd-ssm2602.o
		obj-$(CONFIG_SND_BF5XX_SOC_AD73311) += snd-ad73311.o
		obj-$(CONFIG_SND_BF5XX_SOC_AD193X) += snd-ad193x.o
		obj-$(CONFIG_SND_SOC_BFIN_EVAL_ADAU1373) += snd-soc-bfin-eval-adau1373.o
		obj-$(CONFIG_SND_SOC_BFIN_EVAL_ADAU1X61) += snd-soc-bfin-eval-adau1x61.o
		obj-$(CONFIG_SND_SOC_BFIN_EVAL_ADAU1X81) += snd-soc-bfin-eval-adau1x81.o
		obj-$(CONFIG_SND_SOC_BFIN_EVAL_ADAU1701) += snd-soc-bfin-eval-adau1701.o
		obj-$(CONFIG_SND_SOC_BFIN_EVAL_ADAV80X) += snd-soc-bfin-eval-adav80x.o

sound/soc/blackfin/bfin-eval-adau1x61.c

0 → 100644

+142 −0

Original line number	Diff line number	Diff line
		/*
		* Machine driver for EVAL-ADAU1x61MINIZ on Analog Devices bfin
		* evaluation boards.
		*
		* Copyright 2011-2014 Analog Devices Inc.
		* Author: Lars-Peter Clausen <lars@metafoo.de>
		*
		* Licensed under the GPL-2 or later.
		*/

		#include <linux/module.h>
		#include <linux/device.h>
		#include <linux/slab.h>
		#include <sound/core.h>
		#include <sound/pcm.h>
		#include <sound/soc.h>
		#include <sound/pcm_params.h>

		#include "../codecs/adau17x1.h"

		static const struct snd_soc_dapm_widget bfin_eval_adau1x61_dapm_widgets[] = {
		SND_SOC_DAPM_LINE("In 1", NULL),
		SND_SOC_DAPM_LINE("In 2", NULL),
		SND_SOC_DAPM_LINE("In 3-4", NULL),

		SND_SOC_DAPM_LINE("Diff Out L", NULL),
		SND_SOC_DAPM_LINE("Diff Out R", NULL),
		SND_SOC_DAPM_LINE("Stereo Out", NULL),
		SND_SOC_DAPM_HP("Capless HP Out", NULL),
		};

		static const struct snd_soc_dapm_route bfin_eval_adau1x61_dapm_routes[] = {
		{ "LAUX", NULL, "In 3-4" },
		{ "RAUX", NULL, "In 3-4" },
		{ "LINP", NULL, "In 1" },
		{ "LINN", NULL, "In 1"},
		{ "RINP", NULL, "In 2" },
		{ "RINN", NULL, "In 2" },

		{ "In 1", NULL, "MICBIAS" },
		{ "In 2", NULL, "MICBIAS" },

		{ "Capless HP Out", NULL, "LHP" },
		{ "Capless HP Out", NULL, "RHP" },
		{ "Diff Out L", NULL, "LOUT" },
		{ "Diff Out R", NULL, "ROUT" },
		{ "Stereo Out", NULL, "LOUT" },
		{ "Stereo Out", NULL, "ROUT" },
		};

		static int bfin_eval_adau1x61_hw_params(struct snd_pcm_substream *substream,
		struct snd_pcm_hw_params *params)
		{
		struct snd_soc_pcm_runtime *rtd = substream->private_data;
		struct snd_soc_dai *codec_dai = rtd->codec_dai;
		int pll_rate;
		int ret;

		switch (params_rate(params)) {
		case 48000:
		case 8000:
		case 12000:
		case 16000:
		case 24000:
		case 32000:
		case 96000:
		pll_rate = 48000 * 1024;
		break;
		case 44100:
		case 7350:
		case 11025:
		case 14700:
		case 22050:
		case 29400:
		case 88200:
		pll_rate = 44100 * 1024;
		break;
		default:
		return -EINVAL;
		}

		ret = snd_soc_dai_set_pll(codec_dai, ADAU17X1_PLL,
		ADAU17X1_PLL_SRC_MCLK, 12288000, pll_rate);
		if (ret)
		return ret;

		ret = snd_soc_dai_set_sysclk(codec_dai, ADAU17X1_CLK_SRC_PLL, pll_rate,
		SND_SOC_CLOCK_IN);

		return ret;
		}

		static const struct snd_soc_ops bfin_eval_adau1x61_ops = {
		.hw_params = bfin_eval_adau1x61_hw_params,
		};

		static struct snd_soc_dai_link bfin_eval_adau1x61_dai = {
		.name = "adau1x61",
		.stream_name = "adau1x61",
		.cpu_dai_name = "bfin-i2s.0",
		.codec_dai_name = "adau-hifi",
		.platform_name = "bfin-i2s-pcm-audio",
		.codec_name = "adau1761.0-0038",
		.ops = &bfin_eval_adau1x61_ops,
		.dai_fmt = SND_SOC_DAIFMT_I2S \| SND_SOC_DAIFMT_NB_NF \|
		SND_SOC_DAIFMT_CBM_CFM,
		};

		static struct snd_soc_card bfin_eval_adau1x61 = {
		.name = "bfin-eval-adau1x61",
		.driver_name = "eval-adau1x61",
		.dai_link = &bfin_eval_adau1x61_dai,
		.num_links = 1,

		.dapm_widgets = bfin_eval_adau1x61_dapm_widgets,
		.num_dapm_widgets = ARRAY_SIZE(bfin_eval_adau1x61_dapm_widgets),
		.dapm_routes = bfin_eval_adau1x61_dapm_routes,
		.num_dapm_routes = ARRAY_SIZE(bfin_eval_adau1x61_dapm_routes),
		.fully_routed = true,
		};

		static int bfin_eval_adau1x61_probe(struct platform_device *pdev)
		{
		bfin_eval_adau1x61.dev = &pdev->dev;

		return devm_snd_soc_register_card(&pdev->dev, &bfin_eval_adau1x61);
		}

		static struct platform_driver bfin_eval_adau1x61_driver = {
		.driver = {
		.name = "bfin-eval-adau1x61",
		.owner = THIS_MODULE,
		.pm = &snd_soc_pm_ops,
		},
		.probe = bfin_eval_adau1x61_probe,
		};
		module_platform_driver(bfin_eval_adau1x61_driver);

		MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
		MODULE_DESCRIPTION("ALSA SoC bfin adau1x61 driver");
		MODULE_LICENSE("GPL");
		MODULE_ALIAS("platform:bfin-eval-adau1x61");

sound/soc/blackfin/bfin-eval-adau1x81.c

0 → 100644

+130 −0

Original line number	Diff line number	Diff line
		/*
		* Machine driver for EVAL-ADAU1x81 on Analog Devices bfin
		* evaluation boards.
		*
		* Copyright 2011-2014 Analog Devices Inc.
		* Author: Lars-Peter Clausen <lars@metafoo.de>
		*
		* Licensed under the GPL-2 or later.
		*/

		#include <linux/module.h>
		#include <linux/device.h>
		#include <linux/slab.h>
		#include <sound/core.h>
		#include <sound/pcm.h>
		#include <sound/soc.h>
		#include <sound/pcm_params.h>

		#include "../codecs/adau17x1.h"

		static const struct snd_soc_dapm_widget bfin_eval_adau1x81_dapm_widgets[] = {
		SND_SOC_DAPM_LINE("Stereo In", NULL),
		SND_SOC_DAPM_LINE("Beep", NULL),

		SND_SOC_DAPM_SPK("Speaker", NULL),
		SND_SOC_DAPM_HP("Headphone", NULL),
		};

		static const struct snd_soc_dapm_route bfin_eval_adau1x81_dapm_routes[] = {
		{ "BEEP", NULL, "Beep" },
		{ "LMIC", NULL, "Stereo In" },
		{ "LMIC", NULL, "Stereo In" },

		{ "Headphone", NULL, "AOUTL" },
		{ "Headphone", NULL, "AOUTR" },
		{ "Speaker", NULL, "SP" },
		};

		static int bfin_eval_adau1x81_hw_params(struct snd_pcm_substream *substream,
		struct snd_pcm_hw_params *params)
		{
		struct snd_soc_pcm_runtime *rtd = substream->private_data;
		struct snd_soc_dai *codec_dai = rtd->codec_dai;
		int pll_rate;
		int ret;

		switch (params_rate(params)) {
		case 48000:
		case 8000:
		case 12000:
		case 16000:
		case 24000:
		case 32000:
		case 96000:
		pll_rate = 48000 * 1024;
		break;
		case 44100:
		case 7350:
		case 11025:
		case 14700:
		case 22050:
		case 29400:
		case 88200:
		pll_rate = 44100 * 1024;
		break;
		default:
		return -EINVAL;
		}

		ret = snd_soc_dai_set_pll(codec_dai, ADAU17X1_PLL,
		ADAU17X1_PLL_SRC_MCLK, 12288000, pll_rate);
		if (ret)
		return ret;

		ret = snd_soc_dai_set_sysclk(codec_dai, ADAU17X1_CLK_SRC_PLL, pll_rate,
		SND_SOC_CLOCK_IN);

		return ret;
		}

		static const struct snd_soc_ops bfin_eval_adau1x81_ops = {
		.hw_params = bfin_eval_adau1x81_hw_params,
		};

		static struct snd_soc_dai_link bfin_eval_adau1x81_dai = {
		.name = "adau1x81",
		.stream_name = "adau1x81",
		.cpu_dai_name = "bfin-i2s.0",
		.codec_dai_name = "adau-hifi",
		.platform_name = "bfin-i2s-pcm-audio",
		.codec_name = "adau1781.0-0038",
		.ops = &bfin_eval_adau1x81_ops,
		.dai_fmt = SND_SOC_DAIFMT_I2S \| SND_SOC_DAIFMT_NB_NF \|
		SND_SOC_DAIFMT_CBM_CFM,
		};

		static struct snd_soc_card bfin_eval_adau1x81 = {
		.name = "bfin-eval-adau1x81",
		.driver_name = "eval-adau1x81",
		.dai_link = &bfin_eval_adau1x81_dai,
		.num_links = 1,

		.dapm_widgets = bfin_eval_adau1x81_dapm_widgets,
		.num_dapm_widgets = ARRAY_SIZE(bfin_eval_adau1x81_dapm_widgets),
		.dapm_routes = bfin_eval_adau1x81_dapm_routes,
		.num_dapm_routes = ARRAY_SIZE(bfin_eval_adau1x81_dapm_routes),
		.fully_routed = true,
		};

		static int bfin_eval_adau1x81_probe(struct platform_device *pdev)
		{
		bfin_eval_adau1x81.dev = &pdev->dev;

		return devm_snd_soc_register_card(&pdev->dev, &bfin_eval_adau1x81);
		}

		static struct platform_driver bfin_eval_adau1x81_driver = {
		.driver = {
		.name = "bfin-eval-adau1x81",
		.owner = THIS_MODULE,
		.pm = &snd_soc_pm_ops,
		},
		.probe = bfin_eval_adau1x81_probe,
		};
		module_platform_driver(bfin_eval_adau1x81_driver);

		MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
		MODULE_DESCRIPTION("ALSA SoC bfin adau1x81 driver");
		MODULE_LICENSE("GPL");
		MODULE_ALIAS("platform:bfin-eval-adau1x81");