ASoC: Rename WM8915 to WM8996 (a9ba6151) · Commits · e / devices / android_kernel_teracube_2e

arch/arm/mach-s3c64xx/mach-crag6410.c

+9 −9

Original line number	Original line	Diff line number	Diff line
	@@ -65,7 +65,7 @@
	#include <plat/iic.h>		#include <plat/iic.h>
	#include <plat/pm.h>		#include <plat/pm.h>

	#include <sound/wm8915.h>		#include <sound/wm8996.h>
	#include <sound/wm8962.h>		#include <sound/wm8962.h>
	#include <sound/wm9081.h>		#include <sound/wm9081.h>

	@@ -614,7 +614,7 @@ static struct wm831x_pdata glenfarclas_pmic_pdata __initdata = {
	.disable_touch = true,		.disable_touch = true,
	};		};

	static struct wm8915_retune_mobile_config wm8915_retune[] = {		static struct wm8996_retune_mobile_config wm8996_retune[] = {
	{		{
	.name = "Sub LPF",		.name = "Sub LPF",
	.rate = 48000,		.rate = 48000,
	@@ -635,12 +635,12 @@ static struct wm8915_retune_mobile_config wm8915_retune[] = {
	},		},
	};		};

	static struct wm8915_pdata wm8915_pdata __initdata = {		static struct wm8996_pdata wm8996_pdata __initdata = {
	.ldo_ena = S3C64XX_GPN(7),		.ldo_ena = S3C64XX_GPN(7),
	.gpio_base = CODEC_GPIO_BASE,		.gpio_base = CODEC_GPIO_BASE,
	.micdet_def = 1,		.micdet_def = 1,
	.inl_mode = WM8915_DIFFERRENTIAL_1,		.inl_mode = WM8996_DIFFERRENTIAL_1,
	.inr_mode = WM8915_DIFFERRENTIAL_1,		.inr_mode = WM8996_DIFFERRENTIAL_1,

	.irq_flags = IRQF_TRIGGER_RISING,		.irq_flags = IRQF_TRIGGER_RISING,

	@@ -652,8 +652,8 @@ static struct wm8915_pdata wm8915_pdata __initdata = {
	0x020e, /* GPIO5 == CLKOUT */		0x020e, /* GPIO5 == CLKOUT */
	},		},

	.retune_mobile_cfgs = wm8915_retune,		.retune_mobile_cfgs = wm8996_retune,
	.num_retune_mobile_cfgs = ARRAY_SIZE(wm8915_retune),		.num_retune_mobile_cfgs = ARRAY_SIZE(wm8996_retune),
	};		};

	static struct wm8962_pdata wm8962_pdata __initdata = {		static struct wm8962_pdata wm8962_pdata __initdata = {
	@@ -679,8 +679,8 @@ static struct i2c_board_info i2c_devs1[] __initdata = {
	.platform_data = &glenfarclas_pmic_pdata },		.platform_data = &glenfarclas_pmic_pdata },

	{ I2C_BOARD_INFO("wm1250-ev1", 0x27) },		{ I2C_BOARD_INFO("wm1250-ev1", 0x27) },
	{ I2C_BOARD_INFO("wm8915", 0x1a),		{ I2C_BOARD_INFO("wm8996", 0x1a),
	.platform_data = &wm8915_pdata,		.platform_data = &wm8996_pdata,
	.irq = GLENFARCLAS_PMIC_IRQ_BASE + WM831X_IRQ_GPIO_2,		.irq = GLENFARCLAS_PMIC_IRQ_BASE + WM831X_IRQ_GPIO_2,
	},		},
	{ I2C_BOARD_INFO("wm9081", 0x6c),		{ I2C_BOARD_INFO("wm9081", 0x6c),

include/sound/wm8915.h→include/sound/wm8996.h

+14 −14

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* linux/sound/wm8915.h -- Platform data for WM8915		* linux/sound/wm8996.h -- Platform data for WM8996
	*		*
	* Copyright 2011 Wolfson Microelectronics. PLC.		* Copyright 2011 Wolfson Microelectronics. PLC.
	*		*
	@@ -8,14 +8,14 @@
	* published by the Free Software Foundation.		* published by the Free Software Foundation.
	*/		*/

	#ifndef __LINUX_SND_WM8903_H		#ifndef __LINUX_SND_WM8996_H
	#define __LINUX_SND_WM8903_H		#define __LINUX_SND_WM8996_H

	enum wm8915_inmode {		enum wm8996_inmode {
	WM8915_DIFFERRENTIAL_1 = 0, /* IN1xP - IN1xN */		WM8996_DIFFERRENTIAL_1 = 0, /* IN1xP - IN1xN */
	WM8915_INVERTING = 1, /* IN1xN */		WM8996_INVERTING = 1, /* IN1xN */
	WM8915_NON_INVERTING = 2, /* IN1xP */		WM8996_NON_INVERTING = 2, /* IN1xP */
	WM8915_DIFFERENTIAL_2 = 3, /* IN2xP - IN2xP */		WM8996_DIFFERENTIAL_2 = 3, /* IN2xP - IN2xP */
	};		};

	/**		/**
	@@ -25,23 +25,23 @@ enum wm8915_inmode {
	* Configurations are expected to be generated using the ReTune Mobile		* Configurations are expected to be generated using the ReTune Mobile
	* control panel in WISCE - see http://www.wolfsonmicro.com/wisce/		* control panel in WISCE - see http://www.wolfsonmicro.com/wisce/
	*/		*/
	struct wm8915_retune_mobile_config {		struct wm8996_retune_mobile_config {
	const char *name;		const char *name;
	int rate;		int rate;
	u16 regs[20];		u16 regs[20];
	};		};

	#define WM8915_SET_DEFAULT 0x10000		#define WM8996_SET_DEFAULT 0x10000

	struct wm8915_pdata {		struct wm8996_pdata {
	int irq_flags; /** Set IRQ trigger flags; default active low */		int irq_flags; /** Set IRQ trigger flags; default active low */

	int ldo_ena; /** GPIO for LDO1; -1 for none */		int ldo_ena; /** GPIO for LDO1; -1 for none */

	int micdet_def; /** Default MICDET_SRC/HP1FB_SRC/MICD_BIAS */		int micdet_def; /** Default MICDET_SRC/HP1FB_SRC/MICD_BIAS */

	enum wm8915_inmode inl_mode;		enum wm8996_inmode inl_mode;
	enum wm8915_inmode inr_mode;		enum wm8996_inmode inr_mode;

	u32 spkmute_seq; /** Value for register 0x802 */		u32 spkmute_seq; /** Value for register 0x802 */

	@@ -49,7 +49,7 @@ struct wm8915_pdata {
	u32 gpio_default[5];		u32 gpio_default[5];

	int num_retune_mobile_cfgs;		int num_retune_mobile_cfgs;
	struct wm8915_retune_mobile_config *retune_mobile_cfgs;		struct wm8996_retune_mobile_config *retune_mobile_cfgs;
	};		};

	#endif		#endif

sound/soc/codecs/Kconfig

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -78,7 +78,6 @@ config SND_SOC_ALL_CODECS
	select SND_SOC_WM8900 if I2C		select SND_SOC_WM8900 if I2C
	select SND_SOC_WM8903 if I2C		select SND_SOC_WM8903 if I2C
	select SND_SOC_WM8904 if I2C		select SND_SOC_WM8904 if I2C
	select SND_SOC_WM8915 if I2C
	select SND_SOC_WM8940 if I2C		select SND_SOC_WM8940 if I2C
	select SND_SOC_WM8955 if I2C		select SND_SOC_WM8955 if I2C
	select SND_SOC_WM8960 if I2C		select SND_SOC_WM8960 if I2C
	@@ -95,6 +94,7 @@ config SND_SOC_ALL_CODECS
	select SND_SOC_WM8993 if I2C		select SND_SOC_WM8993 if I2C
	select SND_SOC_WM8994 if MFD_WM8994		select SND_SOC_WM8994 if MFD_WM8994
	select SND_SOC_WM8995 if SND_SOC_I2C_AND_SPI		select SND_SOC_WM8995 if SND_SOC_I2C_AND_SPI
			select SND_SOC_WM8996 if I2C
	select SND_SOC_WM9081 if I2C		select SND_SOC_WM9081 if I2C
	select SND_SOC_WM9090 if I2C		select SND_SOC_WM9090 if I2C
	select SND_SOC_WM9705 if SND_SOC_AC97_BUS		select SND_SOC_WM9705 if SND_SOC_AC97_BUS
	@@ -329,9 +329,6 @@ config SND_SOC_WM8903
	config SND_SOC_WM8904		config SND_SOC_WM8904
	tristate		tristate

	config SND_SOC_WM8915
	tristate

	config SND_SOC_WM8940		config SND_SOC_WM8940
	tristate		tristate

	@@ -380,6 +377,9 @@ config SND_SOC_WM8994
	config SND_SOC_WM8995		config SND_SOC_WM8995
	tristate		tristate

			config SND_SOC_WM8996
			tristate

	config SND_SOC_WM9081		config SND_SOC_WM9081
	tristate		tristate

sound/soc/codecs/Makefile

+2 −2

sound/soc/codecs/wm8915.h

deleted100644 → 0

+0 −3717

File deleted.

Preview size limit exceeded, changes collapsed.

Original line number	Original line	Diff line number	Diff line
	@@ -63,7 +63,7 @@ snd-soc-wm8804-objs := wm8804.o
	snd-soc-wm8900-objs := wm8900.o		snd-soc-wm8900-objs := wm8900.o
	snd-soc-wm8903-objs := wm8903.o		snd-soc-wm8903-objs := wm8903.o
	snd-soc-wm8904-objs := wm8904.o		snd-soc-wm8904-objs := wm8904.o
	snd-soc-wm8915-objs := wm8915.o		snd-soc-wm8996-objs := wm8996.o
	snd-soc-wm8940-objs := wm8940.o		snd-soc-wm8940-objs := wm8940.o
	snd-soc-wm8955-objs := wm8955.o		snd-soc-wm8955-objs := wm8955.o
	snd-soc-wm8960-objs := wm8960.o		snd-soc-wm8960-objs := wm8960.o
	@@ -160,7 +160,7 @@ obj-$(CONFIG_SND_SOC_WM8804) += snd-soc-wm8804.o
	obj-$(CONFIG_SND_SOC_WM8900) += snd-soc-wm8900.o		obj-$(CONFIG_SND_SOC_WM8900) += snd-soc-wm8900.o
	obj-$(CONFIG_SND_SOC_WM8903) += snd-soc-wm8903.o		obj-$(CONFIG_SND_SOC_WM8903) += snd-soc-wm8903.o
	obj-$(CONFIG_SND_SOC_WM8904) += snd-soc-wm8904.o		obj-$(CONFIG_SND_SOC_WM8904) += snd-soc-wm8904.o
	obj-$(CONFIG_SND_SOC_WM8915) += snd-soc-wm8915.o		obj-$(CONFIG_SND_SOC_WM8996) += snd-soc-wm8996.o
	obj-$(CONFIG_SND_SOC_WM8940) += snd-soc-wm8940.o		obj-$(CONFIG_SND_SOC_WM8940) += snd-soc-wm8940.o
	obj-$(CONFIG_SND_SOC_WM8955) += snd-soc-wm8955.o		obj-$(CONFIG_SND_SOC_WM8955) += snd-soc-wm8955.o
	obj-$(CONFIG_SND_SOC_WM8960) += snd-soc-wm8960.o		obj-$(CONFIG_SND_SOC_WM8960) += snd-soc-wm8960.o