Patchwork [U-Boot,6/7,V2] Sound: WM8994: Add FDT support to codec

login
register
mail settings
Submitter Rajeshwari Birje
Date Nov. 28, 2012, 6:10 a.m.
Message ID <1354083013-5213-7-git-send-email-rajeshwari.s@samsung.com>
Download mbox | patch
Permalink /patch/202372/
State Superseded
Headers show

Comments

Rajeshwari Birje - Nov. 28, 2012, 6:10 a.m.
This patch adds FDT support to the codec.

Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
---
Changes in V2:
        - New patch.
 drivers/sound/wm8994.c |   83 ++++++++++++++++++++++++++++++++++++++++++++++-
 drivers/sound/wm8994.h |    6 +--
 2 files changed, 83 insertions(+), 6 deletions(-)
Simon Glass - Nov. 28, 2012, 11:29 p.m.
Hi Rajeshwari,

On Tue, Nov 27, 2012 at 10:10 PM, Rajeshwari Shinde
<rajeshwari.s@samsung.com> wrote:
> This patch adds FDT support to the codec.
>
> Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
> ---
> Changes in V2:
>         - New patch.
>  drivers/sound/wm8994.c |   83 ++++++++++++++++++++++++++++++++++++++++++++++-
>  drivers/sound/wm8994.h |    6 +--
>  2 files changed, 83 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/sound/wm8994.c b/drivers/sound/wm8994.c
> index 293903a..4352b21 100644
> --- a/drivers/sound/wm8994.c
> +++ b/drivers/sound/wm8994.c
> @@ -31,6 +31,11 @@
>  #include <sound.h>
>  #include "wm8994.h"
>  #include "wm8994_registers.h"
> +#ifdef CONFIG_OF_CONTROL
> +#include <fdtdec.h>
> +#else
> +#include <asm/arch/sound.h>
> +#endif

Can you remove these #ifdefs?

>
>  /* defines for wm8994 system clock selection */
>  #define SEL_MCLK1      0x00
> @@ -77,6 +82,7 @@ static int bclk_divs[] = {
>
>  static struct wm8994_priv g_wm8994_info;
>  static unsigned char g_wm8994_i2c_dev_addr;
> +static struct sound_codec_info g_codec_info;
>
>  /*
>   * Initialise I2C for wm 8994
> @@ -747,13 +753,86 @@ err:
>         return -1;
>  }
>
> +/*
> + * Gets fdt values for wm8994 config parameters
> + *
> + * @param pcodec_info  codec information structure
> + * @param blob         FDT blob
> + * @return             int value, 0 for success
> + */
> +static int get_codec_values(struct sound_codec_info *pcodec_info,
> +                       const void *blob)
> +{
> +       int error = 0;
> +#ifdef CONFIG_OF_CONTROL
> +       enum fdt_compat_id compat;
> +       int node;
> +       int parent;
> +
> +       /* Get the node from FDT for codec */
> +       node = fdtdec_next_compatible(blob, 0, COMPAT_WOLFSON_WM8994_CODEC);
> +       if (node <= 0) {
> +               debug("EXYNOS_SOUND: No node for codec in device tree\n");
> +               debug("node = %d\n", node);
> +               return -1;
> +       }
> +
> +       parent = fdt_parent_offset(blob, node);
> +       if (parent < 0) {
> +               debug("%s: Cannot find node parent\n", __func__);
> +               return -1;
> +       }
> +
> +       compat = fd_dec_lookup(blob, parent);
> +       switch (compat) {
> +       case COMPAT_SAMSUNG_S3C2440_I2C:
> +               pcodec_info->i2c_bus = i2c_get_bus_num_fdt(parent);
> +               error |= pcodec_info->i2c_bus;
> +               debug("i2c bus = %d\n", pcodec_info->i2c_bus);
> +               pcodec_info->i2c_dev_addr = fdtdec_get_int(blob, node,
> +                                                       "reg", 0);
> +               error |= pcodec_info->i2c_dev_addr;
> +               debug("i2c dev addr = %d\n", pcodec_info->i2c_dev_addr);
> +               break;
> +       default:
> +               debug("%s: Unknown compat id %d\n", __func__, compat);
> +               return -1;
> +       }
> +#else
> +       pcodec_info->i2c_bus = AUDIO_I2C_BUS;
> +       pcodec_info->i2c_dev_addr = AUDIO_I2C_REG;
> +       debug("i2c dev addr = %d\n", pcodec_info->i2c_dev_addr);
> +#endif
> +
> +       pcodec_info->codec_type = CODEC_WM_8994;
> +
> +       if (error == -1) {
> +               debug("fail to get wm8994 codec node properties\n");
> +               return -1;
> +       }
> +
> +       return 0;
> +
> +}
> +
> +
>  /*wm8994 Device Initialisation */
> -int wm8994_init(struct sound_codec_info *pcodec_info,
> -                       enum en_audio_interface aif_id,
> +int wm8994_init(const void *blob, enum en_audio_interface aif_id,
>                         int sampling_rate, int mclk_freq,
>                         int bits_per_sample, unsigned int channels)
>  {
>         int ret = 0;
> +       struct sound_codec_info *pcodec_info = &g_codec_info;
> +
> +       /* Get the codec Values */
> +#ifdef CONFIG_OF_CONTROL
> +       if (get_codec_values(pcodec_info, blob) < 0) {
> +#else
> +       if (get_codec_values(pcodec_info, NULL) < 0) {
> +#endif

Since blob should be NULL if !defined CONFIG_OF_CONTROL. you should be
able to remove the #ifdef.

> +               debug("FDT Codec values failed\n");
> +                       return -1;

Remove one indent here.

> +       }
>
>         /* shift the device address by 1 for 7 bit addressing */
>         g_wm8994_i2c_dev_addr = pcodec_info->i2c_dev_addr;
> diff --git a/drivers/sound/wm8994.h b/drivers/sound/wm8994.h
> index a8f0de1..a1e8335 100644
> --- a/drivers/sound/wm8994.h
> +++ b/drivers/sound/wm8994.h
> @@ -69,8 +69,7 @@ enum wm8994_type {
>  /*
>   * intialise wm8994 sound codec device for the given configuration
>   *
> - * @param pcodec_info          pointer value of the sound codec info structure
> - *                             parsed from device tree
> + * @param blob                 FDT node for codec values
>   * @param aif_id               enum value of codec interface port in which
>   *                             soc i2s is connected
>   * @param sampling_rate                Sampling rate ranges between from 8khz to 96khz
> @@ -80,8 +79,7 @@ enum wm8994_type {
>   *
>   * @returns -1 for error  and 0  Success.
>   */
> -int wm8994_init(struct sound_codec_info *pcodec_info,
> -                       enum en_audio_interface aif_id,
> +int wm8994_init(const void *blob, enum en_audio_interface aif_id,
>                         int sampling_rate, int mclk_freq,
>                         int bits_per_sample, unsigned int channels);
>  #endif /*__WM8994_H__ */
> --
> 1.7.4.4
>

Regards,
Simon

Patch

diff --git a/drivers/sound/wm8994.c b/drivers/sound/wm8994.c
index 293903a..4352b21 100644
--- a/drivers/sound/wm8994.c
+++ b/drivers/sound/wm8994.c
@@ -31,6 +31,11 @@ 
 #include <sound.h>
 #include "wm8994.h"
 #include "wm8994_registers.h"
+#ifdef CONFIG_OF_CONTROL
+#include <fdtdec.h>
+#else
+#include <asm/arch/sound.h>
+#endif
 
 /* defines for wm8994 system clock selection */
 #define SEL_MCLK1	0x00
@@ -77,6 +82,7 @@  static int bclk_divs[] = {
 
 static struct wm8994_priv g_wm8994_info;
 static unsigned char g_wm8994_i2c_dev_addr;
+static struct sound_codec_info g_codec_info;
 
 /*
  * Initialise I2C for wm 8994
@@ -747,13 +753,86 @@  err:
 	return -1;
 }
 
+/*
+ * Gets fdt values for wm8994 config parameters
+ *
+ * @param pcodec_info	codec information structure
+ * @param blob		FDT blob
+ * @return		int value, 0 for success
+ */
+static int get_codec_values(struct sound_codec_info *pcodec_info,
+			const void *blob)
+{
+	int error = 0;
+#ifdef CONFIG_OF_CONTROL
+	enum fdt_compat_id compat;
+	int node;
+	int parent;
+
+	/* Get the node from FDT for codec */
+	node = fdtdec_next_compatible(blob, 0, COMPAT_WOLFSON_WM8994_CODEC);
+	if (node <= 0) {
+		debug("EXYNOS_SOUND: No node for codec in device tree\n");
+		debug("node = %d\n", node);
+		return -1;
+	}
+
+	parent = fdt_parent_offset(blob, node);
+	if (parent < 0) {
+		debug("%s: Cannot find node parent\n", __func__);
+		return -1;
+	}
+
+	compat = fd_dec_lookup(blob, parent);
+	switch (compat) {
+	case COMPAT_SAMSUNG_S3C2440_I2C:
+		pcodec_info->i2c_bus = i2c_get_bus_num_fdt(parent);
+		error |= pcodec_info->i2c_bus;
+		debug("i2c bus = %d\n", pcodec_info->i2c_bus);
+		pcodec_info->i2c_dev_addr = fdtdec_get_int(blob, node,
+							"reg", 0);
+		error |= pcodec_info->i2c_dev_addr;
+		debug("i2c dev addr = %d\n", pcodec_info->i2c_dev_addr);
+		break;
+	default:
+		debug("%s: Unknown compat id %d\n", __func__, compat);
+		return -1;
+	}
+#else
+	pcodec_info->i2c_bus = AUDIO_I2C_BUS;
+	pcodec_info->i2c_dev_addr = AUDIO_I2C_REG;
+	debug("i2c dev addr = %d\n", pcodec_info->i2c_dev_addr);
+#endif
+
+	pcodec_info->codec_type = CODEC_WM_8994;
+
+	if (error == -1) {
+		debug("fail to get wm8994 codec node properties\n");
+		return -1;
+	}
+
+	return 0;
+
+}
+
+
 /*wm8994 Device Initialisation */
-int wm8994_init(struct sound_codec_info *pcodec_info,
-			enum en_audio_interface aif_id,
+int wm8994_init(const void *blob, enum en_audio_interface aif_id,
 			int sampling_rate, int mclk_freq,
 			int bits_per_sample, unsigned int channels)
 {
 	int ret = 0;
+	struct sound_codec_info *pcodec_info = &g_codec_info;
+
+	/* Get the codec Values */
+#ifdef CONFIG_OF_CONTROL
+	if (get_codec_values(pcodec_info, blob) < 0) {
+#else
+	if (get_codec_values(pcodec_info, NULL) < 0) {
+#endif
+		debug("FDT Codec values failed\n");
+			return -1;
+	}
 
 	/* shift the device address by 1 for 7 bit addressing */
 	g_wm8994_i2c_dev_addr = pcodec_info->i2c_dev_addr;
diff --git a/drivers/sound/wm8994.h b/drivers/sound/wm8994.h
index a8f0de1..a1e8335 100644
--- a/drivers/sound/wm8994.h
+++ b/drivers/sound/wm8994.h
@@ -69,8 +69,7 @@  enum wm8994_type {
 /*
  * intialise wm8994 sound codec device for the given configuration
  *
- * @param pcodec_info		pointer value of the sound codec info structure
- *				parsed from device tree
+ * @param blob			FDT node for codec values
  * @param aif_id		enum value of codec interface port in which
  *				soc i2s is connected
  * @param sampling_rate		Sampling rate ranges between from 8khz to 96khz
@@ -80,8 +79,7 @@  enum wm8994_type {
  *
  * @returns -1 for error  and 0  Success.
  */
-int wm8994_init(struct sound_codec_info *pcodec_info,
-			enum en_audio_interface aif_id,
+int wm8994_init(const void *blob, enum en_audio_interface aif_id,
 			int sampling_rate, int mclk_freq,
 			int bits_per_sample, unsigned int channels);
 #endif /*__WM8994_H__ */