* [U-Boot] [PATCH 0/7] EXYNOS5: Add audio support for Snow
@ 2013-01-21 10:52 Rajeshwari Shinde
2013-01-21 10:52 ` [U-Boot] [PATCH 1/7] EXYNOS5: Add function to enable XXTI clock source Rajeshwari Shinde
` (6 more replies)
0 siblings, 7 replies; 17+ messages in thread
From: Rajeshwari Shinde @ 2013-01-21 10:52 UTC (permalink / raw)
To: u-boot
This patch set creats a new configuration file and DTS file for Snow.
Driver for MAX98095 is added and support for same is incorporated in
sound driver and Snow Board.
Rajeshwari Shinde (7):
EXYNOS5: Add function to enable XXTI clock source
Sound: MAX98095: Add the driver for codec
Sound: Support for MAX98095 codec in driver
EXYNOS5: GPIO to enable MAX98095
EXYNOS5: FDT: Add compatible strings for MAX98095
EXYNOS5: Add initial DTS file for Snow.
EXYNOS5: Snow: Add a configuration file
arch/arm/cpu/armv7/exynos/power.c | 11 +
arch/arm/include/asm/arch-exynos/power.h | 10 +
arch/arm/include/asm/arch-exynos/sound.h | 10 +-
board/samsung/dts/exynos5250-snow.dts | 69 ++++
board/samsung/smdk5250/smdk5250.c | 15 +
boards.cfg | 1 +
drivers/sound/Makefile | 1 +
drivers/sound/max98095.c | 550 ++++++++++++++++++++++++++++++
drivers/sound/max98095.h | 311 +++++++++++++++++
drivers/sound/sound.c | 13 +-
include/configs/exynos5250-dt.h | 1 -
include/configs/smdk5250.h | 1 +
include/configs/snow.h | 34 ++
include/fdtdec.h | 1 +
include/sound.h | 1 +
lib/fdtdec.c | 1 +
16 files changed, 1026 insertions(+), 4 deletions(-)
create mode 100644 board/samsung/dts/exynos5250-snow.dts
create mode 100644 drivers/sound/max98095.c
create mode 100644 drivers/sound/max98095.h
create mode 100644 include/configs/snow.h
--
1.7.4.4
^ permalink raw reply [flat|nested] 17+ messages in thread* [U-Boot] [PATCH 1/7] EXYNOS5: Add function to enable XXTI clock source 2013-01-21 10:52 [U-Boot] [PATCH 0/7] EXYNOS5: Add audio support for Snow Rajeshwari Shinde @ 2013-01-21 10:52 ` Rajeshwari Shinde 2013-01-22 14:51 ` Simon Glass 2013-01-21 10:52 ` [U-Boot] [PATCH 2/7] Sound: MAX98095: Add the driver for codec Rajeshwari Shinde ` (5 subsequent siblings) 6 siblings, 1 reply; 17+ messages in thread From: Rajeshwari Shinde @ 2013-01-21 10:52 UTC (permalink / raw) To: u-boot This patch adds funtion to enable XXTI clock source required by MAX98095 codec. Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com> --- arch/arm/cpu/armv7/exynos/power.c | 11 +++++++++++ arch/arm/include/asm/arch-exynos/power.h | 10 ++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/arch/arm/cpu/armv7/exynos/power.c b/arch/arm/cpu/armv7/exynos/power.c index 8572cfd..8de30c1 100644 --- a/arch/arm/cpu/armv7/exynos/power.c +++ b/arch/arm/cpu/armv7/exynos/power.c @@ -105,3 +105,14 @@ void power_ps_hold_setup(void) setbits_le32(&power->ps_hold_control, EXYNOS_PS_HOLD_CONTROL_DATA_HIGH); } + + +void power_enable_xclkout(void) +{ + struct exynos5_power *power = + (struct exynos5_power *)samsung_get_base_power(); + + /* use xxti for xclk out */ + clrsetbits_le32(&power->pmu_debug, PMU_DEBUG_CLKOUT_SEL_MASK, + PMU_DEBUG_XXTI); +} diff --git a/arch/arm/include/asm/arch-exynos/power.h b/arch/arm/include/asm/arch-exynos/power.h index 85e2cd9..f0eab16 100644 --- a/arch/arm/include/asm/arch-exynos/power.h +++ b/arch/arm/include/asm/arch-exynos/power.h @@ -872,4 +872,14 @@ void set_dp_phy_ctrl(unsigned int enable); * (e.g. power button). */ void power_ps_hold_setup(void); + +/* PMU_DEBUG bits [12:8] = 0x1000 selects XXTI + * clock source */ +#define PMU_DEBUG_XXTI 0x1000 +/* Mask bit[12:8] for xxti clock selection */ +#define PMU_DEBUG_CLKOUT_SEL_MASK 0x1f00 + +/* pmu debug is used for xclkout, enable xclkout with + * source as XXTI */ +void power_enable_xclkout(void); #endif -- 1.7.4.4 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 1/7] EXYNOS5: Add function to enable XXTI clock source 2013-01-21 10:52 ` [U-Boot] [PATCH 1/7] EXYNOS5: Add function to enable XXTI clock source Rajeshwari Shinde @ 2013-01-22 14:51 ` Simon Glass 0 siblings, 0 replies; 17+ messages in thread From: Simon Glass @ 2013-01-22 14:51 UTC (permalink / raw) To: u-boot Hi Rajeshwari, On Mon, Jan 21, 2013 at 2:52 AM, Rajeshwari Shinde <rajeshwari.s@samsung.com> wrote: > This patch adds funtion to enable XXTI clock source > required by MAX98095 codec. > > Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com> > --- > arch/arm/cpu/armv7/exynos/power.c | 11 +++++++++++ > arch/arm/include/asm/arch-exynos/power.h | 10 ++++++++++ > 2 files changed, 21 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/cpu/armv7/exynos/power.c b/arch/arm/cpu/armv7/exynos/power.c > index 8572cfd..8de30c1 100644 > --- a/arch/arm/cpu/armv7/exynos/power.c > +++ b/arch/arm/cpu/armv7/exynos/power.c > @@ -105,3 +105,14 @@ void power_ps_hold_setup(void) > setbits_le32(&power->ps_hold_control, > EXYNOS_PS_HOLD_CONTROL_DATA_HIGH); > } > + > + > +void power_enable_xclkout(void) > +{ > + struct exynos5_power *power = > + (struct exynos5_power *)samsung_get_base_power(); > + > + /* use xxti for xclk out */ > + clrsetbits_le32(&power->pmu_debug, PMU_DEBUG_CLKOUT_SEL_MASK, > + PMU_DEBUG_XXTI); > +} > diff --git a/arch/arm/include/asm/arch-exynos/power.h b/arch/arm/include/asm/arch-exynos/power.h > index 85e2cd9..f0eab16 100644 > --- a/arch/arm/include/asm/arch-exynos/power.h > +++ b/arch/arm/include/asm/arch-exynos/power.h > @@ -872,4 +872,14 @@ void set_dp_phy_ctrl(unsigned int enable); > * (e.g. power button). > */ > void power_ps_hold_setup(void); > + > +/* PMU_DEBUG bits [12:8] = 0x1000 selects XXTI > + * clock source */ > +#define PMU_DEBUG_XXTI 0x1000 > +/* Mask bit[12:8] for xxti clock selection */ > +#define PMU_DEBUG_CLKOUT_SEL_MASK 0x1f00 > + > +/* pmu debug is used for xclkout, enable xclkout with > + * source as XXTI */ Multi-line comment style? > +void power_enable_xclkout(void); > #endif > -- > 1.7.4.4 > Regards, Simon ^ permalink raw reply [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 2/7] Sound: MAX98095: Add the driver for codec 2013-01-21 10:52 [U-Boot] [PATCH 0/7] EXYNOS5: Add audio support for Snow Rajeshwari Shinde 2013-01-21 10:52 ` [U-Boot] [PATCH 1/7] EXYNOS5: Add function to enable XXTI clock source Rajeshwari Shinde @ 2013-01-21 10:52 ` Rajeshwari Shinde 2013-01-21 10:52 ` [U-Boot] [PATCH 3/7] Sound: Support for MAX98095 codec in driver Rajeshwari Shinde ` (4 subsequent siblings) 6 siblings, 0 replies; 17+ messages in thread From: Rajeshwari Shinde @ 2013-01-21 10:52 UTC (permalink / raw) To: u-boot This patch adds the driver for codec MAX98095 required by Snow Board Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com> --- drivers/sound/Makefile | 1 + drivers/sound/max98095.c | 550 ++++++++++++++++++++++++++++++++++++++++++++++ drivers/sound/max98095.h | 311 ++++++++++++++++++++++++++ 3 files changed, 862 insertions(+), 0 deletions(-) create mode 100644 drivers/sound/max98095.c create mode 100644 drivers/sound/max98095.h diff --git a/drivers/sound/Makefile b/drivers/sound/Makefile index 8fdffb1..1987ca1 100644 --- a/drivers/sound/Makefile +++ b/drivers/sound/Makefile @@ -28,6 +28,7 @@ LIB := $(obj)libsound.o COBJS-$(CONFIG_SOUND) += sound.o COBJS-$(CONFIG_I2S) += samsung-i2s.o COBJS-$(CONFIG_SOUND_WM8994) += wm8994.o +COBJS-$(CONFIG_SOUND_MAX98095) += max98095.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/sound/max98095.c b/drivers/sound/max98095.c new file mode 100644 index 0000000..0beee56 --- /dev/null +++ b/drivers/sound/max98095.c @@ -0,0 +1,550 @@ +/* + * max98095.c -- MAX98095 ALSA SoC Audio driver + * + * Copyright 2011 Maxim Integrated Products + * + * Modified for uboot by R. Chandrasekar (rcsekar at samsung.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. + */ +#include <asm/arch/clk.h> +#include <asm/arch/cpu.h> +#include <asm/arch/power.h> +#include <asm/gpio.h> +#include <asm/io.h> +#include <common.h> +#include <div64.h> +#include <fdtdec.h> +#include <i2c.h> +#include <sound.h> +#include "i2s.h" +#include "max98095.h" + +enum max98095_type { + MAX98095, +}; + +struct max98095_priv { + enum max98095_type devtype; + unsigned int sysclk; + unsigned int rate; + unsigned int fmt; +}; + +static struct sound_codec_info g_codec_info; +struct max98095_priv g_max98095_info; +unsigned int g_max98095_i2c_dev_addr; + +/* Index 0 is reserved. */ +int rate_table[] = {0, 8000, 11025, 16000, 22050, 24000, 32000, 44100, 48000, + 88200, 96000}; + +/* + * Writes value to a device register through i2c + * + * @param reg reg number to be write + * @param data data to be writen to the above registor + * + * @return int value 1 for change, 0 for no change or negative error code. + */ +static int max98095_i2c_write(unsigned int reg, unsigned char data) +{ + debug("%s: Write Addr : 0x%02X, Data : 0x%02X\n", + __func__, reg, data); + return i2c_write(g_max98095_i2c_dev_addr, reg, 1, &data, 1); +} + +/* + * Read a value from a device register through i2c + * + * @param reg reg number to be read + * @param data address of read data to be stored + * + * @return int value 0 for success, -1 in case of error. + */ +static unsigned int max98095_i2c_read(unsigned int reg, unsigned char *data) +{ + int ret; + + ret = i2c_read(g_max98095_i2c_dev_addr, reg, 1, data, 1); + if (ret != 0) { + debug("%s: Error while reading register %#04x\n", + __func__, reg); + return -1; + } + + return 0; +} + +/* + * update device register bits through i2c + * + * @param reg codec register + * @param mask register mask + * @param value new value + * + * @return int value 0 for success, non-zero error code. + */ +static int max98095_update_bits(unsigned int reg, unsigned char mask, + unsigned char value) +{ + int change, ret = 0; + unsigned char old, new; + + if (max98095_i2c_read(reg, &old) != 0) + return -1; + new = (old & ~mask) | (value & mask); + change = (old != new) ? 1 : 0; + if (change) + ret = max98095_i2c_write(reg, new); + if (ret < 0) + return ret; + + return change; +} + +/* + * codec mclk clock divider coefficients based on sampling rate + * + * @param rate sampling rate + * @param value address of indexvalue to be stored + * + * @return 0 for success or negative error code. + */ +static int rate_value(int rate, u8 *value) +{ + int i; + + for (i = 1; i < ARRAY_SIZE(rate_table); i++) { + if (rate_table[i] >= rate) { + *value = i; + return 0; + } + } + *value = 1; + + return -1; +} + +/* + * Sets hw params for max98095 + * + * @param max98095 max98095 information pointer + * @param rate Sampling rate + * @param bits_per_sample Bits per sample + * + * @return -1 for error and 0 Success. + */ +static int max98095_hw_params(struct max98095_priv *max98095, + unsigned int rate, unsigned int bits_per_sample) +{ + u8 regval; + int error; + + switch (bits_per_sample) { + case 16: + error = max98095_update_bits(M98095_034_DAI2_FORMAT, + M98095_DAI_WS, 0); + break; + case 24: + error = max98095_update_bits(M98095_034_DAI2_FORMAT, + M98095_DAI_WS, M98095_DAI_WS); + break; + default: + debug("%s: Illegal bits per sample %d.\n", + __func__, bits_per_sample); + return -1; + } + + if (rate_value(rate, ®val)) { + debug("%s: Failed to set sample rate to %d.\n", + __func__, rate); + return -1; + } + max98095->rate = rate; + + error |= max98095_update_bits(M98095_031_DAI2_CLKMODE, + M98095_CLKMODE_MASK, regval); + + /* Update sample rate mode */ + if (rate < 50000) + error |= max98095_update_bits(M98095_038_DAI2_FILTERS, + M98095_DAI_DHF, 0); + else + error |= max98095_update_bits(M98095_038_DAI2_FILTERS, + M98095_DAI_DHF, M98095_DAI_DHF); + + if (error < 0) { + debug("%s: Error setting hardware params.\n", __func__); + return -1; + } + + return 0; +} + +/* + * Configures Audio interface system clock for the given frequency + * + * @param max98095 max98095 information + * @param freq Sampling frequency in Hz + * + * @return -1 for error and 0 success. + */ +static int max98095_set_sysclk(struct max98095_priv *max98095, + unsigned int freq) +{ + int error = 0; + + /* Requested clock frequency is already setup */ + if (freq == max98095->sysclk) + return 0; + + /* Setup clocks for slave mode, and using the PLL + * PSCLK = 0x01 (when master clk is 10MHz to 20MHz) + * 0x02 (when master clk is 20MHz to 40MHz).. + * 0x03 (when master clk is 40MHz to 60MHz).. + */ + if ((freq >= 10000000) && (freq < 20000000)) { + error = max98095_i2c_write(M98095_026_SYS_CLK, 0x10); + } else if ((freq >= 20000000) && (freq < 40000000)) { + error = max98095_i2c_write(M98095_026_SYS_CLK, 0x20); + } else if ((freq >= 40000000) && (freq < 60000000)) { + error = max98095_i2c_write(M98095_026_SYS_CLK, 0x30); + } else { + debug("%s: Invalid master clock frequency\n", __func__); + return -1; + } + + debug("%s: Clock@%uHz\n", __func__, freq); + + if (error < 0) + return -1; + + max98095->sysclk = freq; + return 0; +} + +/* + * Sets Max98095 I2S format + * + * @param max98095 max98095 information + * @param fmt i2S format - supports a subset of the options defined + * in i2s.h. + * + * @return -1 for error and 0 Success. + */ +static int max98095_set_fmt(struct max98095_priv *max98095, int fmt) +{ + u8 regval = 0; + int error = 0; + + if (fmt == max98095->fmt) + return 0; + + max98095->fmt = fmt; + + switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { + case SND_SOC_DAIFMT_CBS_CFS: + /* Slave mode PLL */ + error |= max98095_i2c_write(M98095_032_DAI2_CLKCFG_HI, + 0x80); + error |= max98095_i2c_write(M98095_033_DAI2_CLKCFG_LO, + 0x00); + break; + case SND_SOC_DAIFMT_CBM_CFM: + /* Set to master mode */ + regval |= M98095_DAI_MAS; + break; + case SND_SOC_DAIFMT_CBS_CFM: + case SND_SOC_DAIFMT_CBM_CFS: + default: + debug("%s: Clock mode unsupported\n", __func__); + return -1; + } + + switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { + case SND_SOC_DAIFMT_I2S: + regval |= M98095_DAI_DLY; + break; + case SND_SOC_DAIFMT_LEFT_J: + break; + default: + debug("%s: Unrecognized format.\n", __func__); + return -1; + } + + switch (fmt & SND_SOC_DAIFMT_INV_MASK) { + case SND_SOC_DAIFMT_NB_NF: + break; + case SND_SOC_DAIFMT_NB_IF: + regval |= M98095_DAI_WCI; + break; + case SND_SOC_DAIFMT_IB_NF: + regval |= M98095_DAI_BCI; + break; + case SND_SOC_DAIFMT_IB_IF: + regval |= M98095_DAI_BCI | M98095_DAI_WCI; + break; + default: + debug("%s: Unrecognized inversion settings.\n", __func__); + return -1; + } + + error |= max98095_update_bits(M98095_034_DAI2_FORMAT, + M98095_DAI_MAS | M98095_DAI_DLY | M98095_DAI_BCI | + M98095_DAI_WCI, regval); + + error |= max98095_i2c_write(M98095_035_DAI2_CLOCK, + M98095_DAI_BSEL64); + + if (error < 0) { + debug("%s: Error setting i2s format.\n", __func__); + return -1; + } + + return 0; +} + +/* + * resets the audio codec + * + * @return -1 for error and 0 success. + */ +static int max98095_reset(void) +{ + int i, ret; + + /* + * Gracefully reset the DSP core and the codec hardware in a proper + * sequence. + */ + ret = max98095_i2c_write(M98095_00F_HOST_CFG, 0); + if (ret != 0) { + debug("%s: Failed to reset DSP: %d\n", __func__, ret); + return ret; + } + + ret = max98095_i2c_write(M98095_097_PWR_SYS, 0); + if (ret != 0) { + debug("%s: Failed to reset codec: %d\n", __func__, ret); + return ret; + } + + /* + * Reset to hardware default for registers, as there is not a soft + * reset hardware control register. + */ + for (i = M98095_010_HOST_INT_CFG; i < M98095_REG_MAX_CACHED; i++) { + ret = max98095_i2c_write(i, 0); + if (ret < 0) { + debug("%s: Failed to reset: %d\n", __func__, ret); + return ret; + } + } + + return 0; +} + +/* + * Intialise max98095 codec device + * + * @param max98095 max98095 information + * + * @returns -1 for error and 0 Success. + */ +static int max98095_device_init(struct max98095_priv *max98095) +{ + unsigned char id; + int error = 0; + + /* reset the codec, the DSP core, and disable all interrupts */ + error = max98095_reset(); + if (error != 0) { + debug("Reset\n"); + return error; + } + + /* initialize private data */ + max98095->sysclk = -1U; + max98095->rate = -1U; + max98095->fmt = -1U; + + error = max98095_i2c_read(M98095_0FF_REV_ID, &id); + if (error < 0) { + debug("%s: Failure reading hardware revision: %d\n", + __func__, id); + goto err_access; + } + debug("%s: Hardware revision: %c\n", __func__, (id - 0x40) + 'A'); + + error |= max98095_i2c_write(M98095_097_PWR_SYS, M98095_PWRSV); + + /* + * initialize registers to hardware default configuring audio + * interface2 to DAC + */ + error |= max98095_i2c_write(M98095_048_MIX_DAC_LR, + M98095_DAI2M_TO_DACL|M98095_DAI2M_TO_DACR); + + error |= max98095_i2c_write(M98095_092_PWR_EN_OUT, + M98095_SPK_SPREADSPECTRUM); + error |= max98095_i2c_write(M98095_045_CFG_DSP, M98095_DSPNORMAL); + error |= max98095_i2c_write(M98095_04E_CFG_HP, M98095_HPNORMAL); + + error |= max98095_i2c_write(M98095_02C_DAI1_IOCFG, + M98095_S1NORMAL|M98095_SDATA); + + error |= max98095_i2c_write(M98095_036_DAI2_IOCFG, + M98095_S2NORMAL|M98095_SDATA); + + error |= max98095_i2c_write(M98095_040_DAI3_IOCFG, + M98095_S3NORMAL|M98095_SDATA); + + /* take the codec out of the shut down */ + error |= max98095_update_bits(M98095_097_PWR_SYS, M98095_SHDNRUN, + M98095_SHDNRUN); + /* route DACL and DACR output to HO and Spekers */ + error |= max98095_i2c_write(M98095_050_MIX_SPK_LEFT, 0x01); /* DACL */ + error |= max98095_i2c_write(M98095_051_MIX_SPK_RIGHT, 0x01);/* DACR */ + error |= max98095_i2c_write(M98095_04C_MIX_HP_LEFT, 0x01); /* DACL */ + error |= max98095_i2c_write(M98095_04D_MIX_HP_RIGHT, 0x01); /* DACR */ + + /* power Enable */ + error |= max98095_i2c_write(M98095_091_PWR_EN_OUT, 0xF3); + + /* set Volume */ + error |= max98095_i2c_write(M98095_064_LVL_HP_L, 15); + error |= max98095_i2c_write(M98095_065_LVL_HP_R, 15); + error |= max98095_i2c_write(M98095_067_LVL_SPK_L, 16); + error |= max98095_i2c_write(M98095_068_LVL_SPK_R, 16); + + /* Enable DAIs */ + error |= max98095_i2c_write(M98095_093_BIAS_CTRL, 0x30); + error |= max98095_i2c_write(M98095_096_PWR_DAC_CK, 0x07); + +err_access: + if (error < 0) + return -1; + + return 0; +} + +static int max98095_do_init(struct sound_codec_info *pcodec_info, + int sampling_rate, int mclk_freq, + int bits_per_sample) +{ + int ret = 0; + + /* Enable codec clock */ + power_enable_xclkout(); + + /* shift the device address by 1 for 7 bit addressing */ + g_max98095_i2c_dev_addr = pcodec_info->i2c_dev_addr >> 1; + + if (pcodec_info->codec_type == CODEC_MAX_98095) + g_max98095_info.devtype = MAX98095; + else { + debug("%s: Codec id [%d] not defined\n", __func__, + pcodec_info->codec_type); + return -1; + } + + ret = max98095_device_init(&g_max98095_info); + if (ret < 0) { + debug("%s: max98095 codec chip init failed\n", __func__); + return ret; + } + + ret = max98095_set_sysclk(&g_max98095_info, mclk_freq); + if (ret < 0) { + debug("%s: max98095 codec set sys clock failed\n", __func__); + return ret; + } + + ret = max98095_hw_params(&g_max98095_info, sampling_rate, + bits_per_sample); + + if (ret == 0) { + ret = max98095_set_fmt(&g_max98095_info, + SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS); + } + + return ret; +} + +static int get_max98095_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_MAXIM_98095_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 = fdtdec_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 = %x\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_MAX_98095; + if (error == -1) { + debug("fail to get max98095 codec node properties\n"); + return -1; + } + + return 0; +} + +/* max98095 Device Initialisation */ +int max98095_init(const void *blob, int sampling_rate, int mclk_freq, + int bits_per_sample) +{ + int ret; + int old_bus = i2c_get_bus_num(); + struct sound_codec_info *pcodec_info = &g_codec_info; + + if (get_max98095_codec_values(pcodec_info, blob) < 0) { + debug("FDT Codec values failed\n"); + return -1; + } + + i2c_set_bus_num(pcodec_info->i2c_bus); + ret = max98095_do_init(pcodec_info, sampling_rate, mclk_freq, + bits_per_sample); + i2c_set_bus_num(old_bus); + + return ret; +} diff --git a/drivers/sound/max98095.h b/drivers/sound/max98095.h new file mode 100644 index 0000000..ae5eb14 --- /dev/null +++ b/drivers/sound/max98095.h @@ -0,0 +1,311 @@ +/* + * max98095.h -- MAX98095 ALSA SoC Audio driver + * + * Copyright 2011 Maxim Integrated Products + * + * 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 _MAX98095_H +#define _MAX98095_H + +/* + * MAX98095 Registers Definition + */ + +#define M98095_000_HOST_DATA 0x00 +#define M98095_001_HOST_INT_STS 0x01 +#define M98095_002_HOST_RSP_STS 0x02 +#define M98095_003_HOST_CMD_STS 0x03 +#define M98095_004_CODEC_STS 0x04 +#define M98095_005_DAI1_ALC_STS 0x05 +#define M98095_006_DAI2_ALC_STS 0x06 +#define M98095_007_JACK_AUTO_STS 0x07 +#define M98095_008_JACK_MANUAL_STS 0x08 +#define M98095_009_JACK_VBAT_STS 0x09 +#define M98095_00A_ACC_ADC_STS 0x0A +#define M98095_00B_MIC_NG_AGC_STS 0x0B +#define M98095_00C_SPK_L_VOLT_STS 0x0C +#define M98095_00D_SPK_R_VOLT_STS 0x0D +#define M98095_00E_TEMP_SENSOR_STS 0x0E +#define M98095_00F_HOST_CFG 0x0F +#define M98095_010_HOST_INT_CFG 0x10 +#define M98095_011_HOST_INT_EN 0x11 +#define M98095_012_CODEC_INT_EN 0x12 +#define M98095_013_JACK_INT_EN 0x13 +#define M98095_014_JACK_INT_EN 0x14 +#define M98095_015_DEC 0x15 +#define M98095_016_RESERVED 0x16 +#define M98095_017_RESERVED 0x17 +#define M98095_018_KEYCODE3 0x18 +#define M98095_019_KEYCODE2 0x19 +#define M98095_01A_KEYCODE1 0x1A +#define M98095_01B_KEYCODE0 0x1B +#define M98095_01C_OEMCODE1 0x1C +#define M98095_01D_OEMCODE0 0x1D +#define M98095_01E_XCFG1 0x1E +#define M98095_01F_XCFG2 0x1F +#define M98095_020_XCFG3 0x20 +#define M98095_021_XCFG4 0x21 +#define M98095_022_XCFG5 0x22 +#define M98095_023_XCFG6 0x23 +#define M98095_024_XGPIO 0x24 +#define M98095_025_XCLKCFG 0x25 +#define M98095_026_SYS_CLK 0x26 +#define M98095_027_DAI1_CLKMODE 0x27 +#define M98095_028_DAI1_CLKCFG_HI 0x28 +#define M98095_029_DAI1_CLKCFG_LO 0x29 +#define M98095_02A_DAI1_FORMAT 0x2A +#define M98095_02B_DAI1_CLOCK 0x2B +#define M98095_02C_DAI1_IOCFG 0x2C +#define M98095_02D_DAI1_TDM 0x2D +#define M98095_02E_DAI1_FILTERS 0x2E +#define M98095_02F_DAI1_LVL1 0x2F +#define M98095_030_DAI1_LVL2 0x30 +#define M98095_031_DAI2_CLKMODE 0x31 +#define M98095_032_DAI2_CLKCFG_HI 0x32 +#define M98095_033_DAI2_CLKCFG_LO 0x33 +#define M98095_034_DAI2_FORMAT 0x34 +#define M98095_035_DAI2_CLOCK 0x35 +#define M98095_036_DAI2_IOCFG 0x36 +#define M98095_037_DAI2_TDM 0x37 +#define M98095_038_DAI2_FILTERS 0x38 +#define M98095_039_DAI2_LVL1 0x39 +#define M98095_03A_DAI2_LVL2 0x3A +#define M98095_03B_DAI3_CLKMODE 0x3B +#define M98095_03C_DAI3_CLKCFG_HI 0x3C +#define M98095_03D_DAI3_CLKCFG_LO 0x3D +#define M98095_03E_DAI3_FORMAT 0x3E +#define M98095_03F_DAI3_CLOCK 0x3F +#define M98095_040_DAI3_IOCFG 0x40 +#define M98095_041_DAI3_TDM 0x41 +#define M98095_042_DAI3_FILTERS 0x42 +#define M98095_043_DAI3_LVL1 0x43 +#define M98095_044_DAI3_LVL2 0x44 +#define M98095_045_CFG_DSP 0x45 +#define M98095_046_DAC_CTRL1 0x46 +#define M98095_047_DAC_CTRL2 0x47 +#define M98095_048_MIX_DAC_LR 0x48 +#define M98095_049_MIX_DAC_M 0x49 +#define M98095_04A_MIX_ADC_LEFT 0x4A +#define M98095_04B_MIX_ADC_RIGHT 0x4B +#define M98095_04C_MIX_HP_LEFT 0x4C +#define M98095_04D_MIX_HP_RIGHT 0x4D +#define M98095_04E_CFG_HP 0x4E +#define M98095_04F_MIX_RCV 0x4F +#define M98095_050_MIX_SPK_LEFT 0x50 +#define M98095_051_MIX_SPK_RIGHT 0x51 +#define M98095_052_MIX_SPK_CFG 0x52 +#define M98095_053_MIX_LINEOUT1 0x53 +#define M98095_054_MIX_LINEOUT2 0x54 +#define M98095_055_MIX_LINEOUT_CFG 0x55 +#define M98095_056_LVL_SIDETONE_DAI12 0x56 +#define M98095_057_LVL_SIDETONE_DAI3 0x57 +#define M98095_058_LVL_DAI1_PLAY 0x58 +#define M98095_059_LVL_DAI1_EQ 0x59 +#define M98095_05A_LVL_DAI2_PLAY 0x5A +#define M98095_05B_LVL_DAI2_EQ 0x5B +#define M98095_05C_LVL_DAI3_PLAY 0x5C +#define M98095_05D_LVL_ADC_L 0x5D +#define M98095_05E_LVL_ADC_R 0x5E +#define M98095_05F_LVL_MIC1 0x5F +#define M98095_060_LVL_MIC2 0x60 +#define M98095_061_LVL_LINEIN 0x61 +#define M98095_062_LVL_LINEOUT1 0x62 +#define M98095_063_LVL_LINEOUT2 0x63 +#define M98095_064_LVL_HP_L 0x64 +#define M98095_065_LVL_HP_R 0x65 +#define M98095_066_LVL_RCV 0x66 +#define M98095_067_LVL_SPK_L 0x67 +#define M98095_068_LVL_SPK_R 0x68 +#define M98095_069_MICAGC_CFG 0x69 +#define M98095_06A_MICAGC_THRESH 0x6A +#define M98095_06B_SPK_NOISEGATE 0x6B +#define M98095_06C_DAI1_ALC1_TIME 0x6C +#define M98095_06D_DAI1_ALC1_COMP 0x6D +#define M98095_06E_DAI1_ALC1_EXPN 0x6E +#define M98095_06F_DAI1_ALC1_GAIN 0x6F +#define M98095_070_DAI1_ALC2_TIME 0x70 +#define M98095_071_DAI1_ALC2_COMP 0x71 +#define M98095_072_DAI1_ALC2_EXPN 0x72 +#define M98095_073_DAI1_ALC2_GAIN 0x73 +#define M98095_074_DAI1_ALC3_TIME 0x74 +#define M98095_075_DAI1_ALC3_COMP 0x75 +#define M98095_076_DAI1_ALC3_EXPN 0x76 +#define M98095_077_DAI1_ALC3_GAIN 0x77 +#define M98095_078_DAI2_ALC1_TIME 0x78 +#define M98095_079_DAI2_ALC1_COMP 0x79 +#define M98095_07A_DAI2_ALC1_EXPN 0x7A +#define M98095_07B_DAI2_ALC1_GAIN 0x7B +#define M98095_07C_DAI2_ALC2_TIME 0x7C +#define M98095_07D_DAI2_ALC2_COMP 0x7D +#define M98095_07E_DAI2_ALC2_EXPN 0x7E +#define M98095_07F_DAI2_ALC2_GAIN 0x7F +#define M98095_080_DAI2_ALC3_TIME 0x80 +#define M98095_081_DAI2_ALC3_COMP 0x81 +#define M98095_082_DAI2_ALC3_EXPN 0x82 +#define M98095_083_DAI2_ALC3_GAIN 0x83 +#define M98095_084_HP_NOISE_GATE 0x84 +#define M98095_085_AUX_ADC 0x85 +#define M98095_086_CFG_LINE 0x86 +#define M98095_087_CFG_MIC 0x87 +#define M98095_088_CFG_LEVEL 0x88 +#define M98095_089_JACK_DET_AUTO 0x89 +#define M98095_08A_JACK_DET_MANUAL 0x8A +#define M98095_08B_JACK_KEYSCAN_DBC 0x8B +#define M98095_08C_JACK_KEYSCAN_DLY 0x8C +#define M98095_08D_JACK_KEY_THRESH 0x8D +#define M98095_08E_JACK_DC_SLEW 0x8E +#define M98095_08F_JACK_TEST_CFG 0x8F +#define M98095_090_PWR_EN_IN 0x90 +#define M98095_091_PWR_EN_OUT 0x91 +#define M98095_092_PWR_EN_OUT 0x92 +#define M98095_093_BIAS_CTRL 0x93 +#define M98095_094_PWR_DAC_21 0x94 +#define M98095_095_PWR_DAC_03 0x95 +#define M98095_096_PWR_DAC_CK 0x96 +#define M98095_097_PWR_SYS 0x97 + +#define M98095_0FF_REV_ID 0xFF + +#define M98095_REG_CNT (0xFF+1) +#define M98095_REG_MAX_CACHED 0X97 + +/* MAX98095 Registers Bit Fields */ + +/* M98095_00F_HOST_CFG */ +#define M98095_SEG (1<<0) +#define M98095_XTEN (1<<1) +#define M98095_MDLLEN (1<<2) + +/* M98095_027_DAI1_CLKMODE, M98095_031_DAI2_CLKMODE, M98095_03B_DAI3_CLKMODE */ +#define M98095_CLKMODE_MASK 0xFF + +/* M98095_02A_DAI1_FORMAT, M98095_034_DAI2_FORMAT, M98095_03E_DAI3_FORMAT */ +#define M98095_DAI_MAS (1<<7) +#define M98095_DAI_WCI (1<<6) +#define M98095_DAI_BCI (1<<5) +#define M98095_DAI_DLY (1<<4) +#define M98095_DAI_TDM (1<<2) +#define M98095_DAI_FSW (1<<1) +#define M98095_DAI_WS (1<<0) + +/* M98095_02B_DAI1_CLOCK, M98095_035_DAI2_CLOCK, M98095_03F_DAI3_CLOCK */ +#define M98095_DAI_BSEL64 (1<<0) +#define M98095_DAI_DOSR_DIV2 (0<<5) +#define M98095_DAI_DOSR_DIV4 (1<<5) + +/* M98095_02C_DAI1_IOCFG, M98095_036_DAI2_IOCFG, M98095_040_DAI3_IOCFG */ +#define M98095_S1NORMAL (1<<6) +#define M98095_S2NORMAL (2<<6) +#define M98095_S3NORMAL (3<<6) +#define M98095_SDATA (3<<0) + +/* M98095_02E_DAI1_FILTERS, M98095_038_DAI2_FILTERS, M98095_042_DAI3_FILTERS */ +#define M98095_DAI_DHF (1<<3) + +/* M98095_045_DSP_CFG */ +#define M98095_DSPNORMAL (5<<4) + +/* M98095_048_MIX_DAC_LR */ +#define M98095_DAI1L_TO_DACR (1<<7) +#define M98095_DAI1R_TO_DACR (1<<6) +#define M98095_DAI2M_TO_DACR (1<<5) +#define M98095_DAI1L_TO_DACL (1<<3) +#define M98095_DAI1R_TO_DACL (1<<2) +#define M98095_DAI2M_TO_DACL (1<<1) +#define M98095_DAI3M_TO_DACL (1<<0) + +/* M98095_049_MIX_DAC_M */ +#define M98095_DAI1L_TO_DACM (1<<3) +#define M98095_DAI1R_TO_DACM (1<<2) +#define M98095_DAI2M_TO_DACM (1<<1) +#define M98095_DAI3M_TO_DACM (1<<0) + +/* M98095_04E_MIX_HP_CFG */ +#define M98095_HPNORMAL (3<<4) + +/* M98095_05F_LVL_MIC1, M98095_060_LVL_MIC2 */ +#define M98095_MICPRE_MASK (3<<5) +#define M98095_MICPRE_SHIFT 5 + +/* M98095_064_LVL_HP_L, M98095_065_LVL_HP_R */ +#define M98095_HP_MUTE (1<<7) + +/* M98095_066_LVL_RCV */ +#define M98095_REC_MUTE (1<<7) + +/* M98095_067_LVL_SPK_L, M98095_068_LVL_SPK_R */ +#define M98095_SP_MUTE (1<<7) + +/* M98095_087_CFG_MIC */ +#define M98095_MICSEL_MASK (3<<0) +#define M98095_DIGMIC_L (1<<2) +#define M98095_DIGMIC_R (1<<3) +#define M98095_DIGMIC2L (1<<4) +#define M98095_DIGMIC2R (1<<5) + +/* M98095_088_CFG_LEVEL */ +#define M98095_VSEN (1<<6) +#define M98095_ZDEN (1<<5) +#define M98095_BQ2EN (1<<3) +#define M98095_BQ1EN (1<<2) +#define M98095_EQ2EN (1<<1) +#define M98095_EQ1EN (1<<0) + +/* M98095_090_PWR_EN_IN */ +#define M98095_INEN (1<<7) +#define M98095_MB2EN (1<<3) +#define M98095_MB1EN (1<<2) +#define M98095_MBEN (3<<2) +#define M98095_ADREN (1<<1) +#define M98095_ADLEN (1<<0) + +/* M98095_091_PWR_EN_OUT */ +#define M98095_HPLEN (1<<7) +#define M98095_HPREN (1<<6) +#define M98095_SPLEN (1<<5) +#define M98095_SPREN (1<<4) +#define M98095_RECEN (1<<3) +#define M98095_DALEN (1<<1) +#define M98095_DAREN (1<<0) + +/* M98095_092_PWR_EN_OUT */ +#define M98095_SPK_FIXEDSPECTRUM (0<<4) +#define M98095_SPK_SPREADSPECTRUM (1<<4) + +/* M98095_097_PWR_SYS */ +#define M98095_SHDNRUN (1<<7) +#define M98095_PERFMODE (1<<3) +#define M98095_HPPLYBACK (1<<2) +#define M98095_PWRSV8K (1<<1) +#define M98095_PWRSV (1<<0) + +#define M98095_COEFS_PER_BAND 5 + +/* Equalizer filter coefficients */ +#define M98095_110_DAI1_EQ_BASE 0x10 +#define M98095_142_DAI2_EQ_BASE 0x42 + +/* Biquad filter coefficients */ +#define M98095_174_DAI1_BQ_BASE 0x74 +#define M98095_17E_DAI2_BQ_BASE 0x7E + +/* function prototype */ + +/* + * intialise max98095 sound codec device for the given configuration + * + * @param blob FDT node for codec values + * @param sampling_rate Sampling rate (Hz) + * @param mclk_freq MCLK Frequency (Hz) + * @param bits_per_sample bits per Sample (must be 16 or 24) + * + * @returns -1 for error and 0 Success. + */ +int max98095_init(const void *blob, int sampling_rate, int mclk_freq, + int bits_per_sample); + +#endif -- 1.7.4.4 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 3/7] Sound: Support for MAX98095 codec in driver 2013-01-21 10:52 [U-Boot] [PATCH 0/7] EXYNOS5: Add audio support for Snow Rajeshwari Shinde 2013-01-21 10:52 ` [U-Boot] [PATCH 1/7] EXYNOS5: Add function to enable XXTI clock source Rajeshwari Shinde 2013-01-21 10:52 ` [U-Boot] [PATCH 2/7] Sound: MAX98095: Add the driver for codec Rajeshwari Shinde @ 2013-01-21 10:52 ` Rajeshwari Shinde 2013-01-21 10:52 ` [U-Boot] [PATCH 4/7] EXYNOS5: GPIO to enable MAX98095 Rajeshwari Shinde ` (3 subsequent siblings) 6 siblings, 0 replies; 17+ messages in thread From: Rajeshwari Shinde @ 2013-01-21 10:52 UTC (permalink / raw) To: u-boot This patchs adds support for MAX98095 codec in sound driver. Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com> --- arch/arm/include/asm/arch-exynos/sound.h | 10 +++++++++- drivers/sound/sound.c | 13 +++++++++++-- include/sound.h | 1 + 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/asm/arch-exynos/sound.h b/arch/arm/include/asm/arch-exynos/sound.h index d1bd2f6..a216b00 100644 --- a/arch/arm/include/asm/arch-exynos/sound.h +++ b/arch/arm/include/asm/arch-exynos/sound.h @@ -33,6 +33,7 @@ #define I2S_RFS 256 #define I2S_BFS 32 +#ifdef CONFIG_SOUND_WM8994 /* I2C values */ #define AUDIO_I2C_BUS 1 #define AUDIO_I2C_REG 0x1a @@ -40,5 +41,12 @@ /* Audio Codec */ #define AUDIO_CODEC "wm8994" -#define AUDIO_COMPAT 1 +#else /* CONFIG_SOUND_MAX98095 */ +/* I2C values */ +#define AUDIO_I2C_BUS 7 +#define AUDIO_I2C_REG 0x22 + +/* Audio Codec */ +#define AUDIO_CODEC "max98095" +#endif #endif diff --git a/drivers/sound/sound.c b/drivers/sound/sound.c index fa8432d..a74590b 100644 --- a/drivers/sound/sound.c +++ b/drivers/sound/sound.c @@ -31,6 +31,7 @@ #include <sound.h> #include <asm/arch/sound.h> #include "wm8994.h" +#include "max98095.h" /* defines */ #define SOUND_400_HZ 400 @@ -143,17 +144,25 @@ static int codec_init(const void *blob, struct i2stx_info *pi2s_tx) #else codectype = AUDIO_CODEC; #endif +#ifdef CONFIG_SOUND_WM8994 if (!strcmp(codectype, "wm8994")) { /* Check the codec type and initialise the same */ ret = wm8994_init(blob, WM8994_AIF2, pi2s_tx->samplingrate, (pi2s_tx->samplingrate * (pi2s_tx->rfs)), pi2s_tx->bitspersample, pi2s_tx->channels); +#endif +#ifdef CONFIG_SOUND_MAX98095 + if (!strcmp(codectype, "max98095")) { + ret = max98095_init(blob, pi2s_tx->samplingrate, + (pi2s_tx->samplingrate * (pi2s_tx->rfs)), + pi2s_tx->bitspersample); +#endif } else { - debug("%s: Unknown code type %s\n", __func__, - codectype); + debug("%s: Unknown codec type %s\n", __func__, codectype); return -1; } + if (ret) { debug("%s: Codec init failed\n", __func__); return -1; diff --git a/include/sound.h b/include/sound.h index d73839d..94922f6 100644 --- a/include/sound.h +++ b/include/sound.h @@ -28,6 +28,7 @@ enum en_sound_codec { CODEC_WM_8994, CODEC_WM_8995, + CODEC_MAX_98095, CODEC_MAX }; -- 1.7.4.4 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 4/7] EXYNOS5: GPIO to enable MAX98095 2013-01-21 10:52 [U-Boot] [PATCH 0/7] EXYNOS5: Add audio support for Snow Rajeshwari Shinde ` (2 preceding siblings ...) 2013-01-21 10:52 ` [U-Boot] [PATCH 3/7] Sound: Support for MAX98095 codec in driver Rajeshwari Shinde @ 2013-01-21 10:52 ` Rajeshwari Shinde 2013-01-22 14:55 ` Simon Glass 2013-01-21 10:52 ` [U-Boot] [PATCH 5/7] EXYNOS5: FDT: Add compatible strings for MAX98095 Rajeshwari Shinde ` (2 subsequent siblings) 6 siblings, 1 reply; 17+ messages in thread From: Rajeshwari Shinde @ 2013-01-21 10:52 UTC (permalink / raw) To: u-boot This patch sets high a GPIO to enable the codec MAX98095 Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com> --- board/samsung/smdk5250/smdk5250.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/board/samsung/smdk5250/smdk5250.c b/board/samsung/smdk5250/smdk5250.c index 12cc03e..6f2e067 100644 --- a/board/samsung/smdk5250/smdk5250.c +++ b/board/samsung/smdk5250/smdk5250.c @@ -56,6 +56,18 @@ int board_usb_vbus_init(void) } #endif +#ifdef CONFIG_SOUND_MAX98095 +static void board_enable_audio_codec(void) +{ + struct exynos5_gpio_part1 *gpio1 = (struct exynos5_gpio_part1 *) + samsung_get_base_gpio_part1(); + + /* Enable MAX98095 Codec */ + s5p_gpio_direction_output(&gpio1->x1, 7, 1); + s5p_gpio_set_pull(&gpio1->x1, 7, GPIO_PULL_NONE); +} +#endif + int board_init(void) { gd->bd->bi_boot_params = (PHYS_SDRAM_1 + 0x100UL); @@ -65,6 +77,9 @@ int board_init(void) #ifdef CONFIG_USB_EHCI_EXYNOS board_usb_vbus_init(); #endif +#ifdef CONFIG_SOUND_MAX98095 + board_enable_audio_codec(); +#endif return 0; } -- 1.7.4.4 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 4/7] EXYNOS5: GPIO to enable MAX98095 2013-01-21 10:52 ` [U-Boot] [PATCH 4/7] EXYNOS5: GPIO to enable MAX98095 Rajeshwari Shinde @ 2013-01-22 14:55 ` Simon Glass 2013-01-23 10:05 ` Rajeshwari Birje 0 siblings, 1 reply; 17+ messages in thread From: Simon Glass @ 2013-01-22 14:55 UTC (permalink / raw) To: u-boot Hi Rajeshwari, On Mon, Jan 21, 2013 at 2:52 AM, Rajeshwari Shinde <rajeshwari.s@samsung.com> wrote: > This patch sets high a GPIO to enable the codec MAX98095 > > Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com> > --- > board/samsung/smdk5250/smdk5250.c | 15 +++++++++++++++ > 1 files changed, 15 insertions(+), 0 deletions(-) > > diff --git a/board/samsung/smdk5250/smdk5250.c b/board/samsung/smdk5250/smdk5250.c > index 12cc03e..6f2e067 100644 > --- a/board/samsung/smdk5250/smdk5250.c > +++ b/board/samsung/smdk5250/smdk5250.c > @@ -56,6 +56,18 @@ int board_usb_vbus_init(void) > } > #endif > > +#ifdef CONFIG_SOUND_MAX98095 > +static void board_enable_audio_codec(void) > +{ > + struct exynos5_gpio_part1 *gpio1 = (struct exynos5_gpio_part1 *) > + samsung_get_base_gpio_part1(); > + > + /* Enable MAX98095 Codec */ > + s5p_gpio_direction_output(&gpio1->x1, 7, 1); > + s5p_gpio_set_pull(&gpio1->x1, 7, GPIO_PULL_NONE); This GPIO is hard-coded - does the FDT version of this file do this differently? > +} > +#endif > + > int board_init(void) > { > gd->bd->bi_boot_params = (PHYS_SDRAM_1 + 0x100UL); > @@ -65,6 +77,9 @@ int board_init(void) > #ifdef CONFIG_USB_EHCI_EXYNOS > board_usb_vbus_init(); > #endif > +#ifdef CONFIG_SOUND_MAX98095 > + board_enable_audio_codec(); > +#endif > return 0; > } > > -- > 1.7.4.4 > Regards, Simon ^ permalink raw reply [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 4/7] EXYNOS5: GPIO to enable MAX98095 2013-01-22 14:55 ` Simon Glass @ 2013-01-23 10:05 ` Rajeshwari Birje 2013-01-25 20:40 ` Simon Glass 0 siblings, 1 reply; 17+ messages in thread From: Rajeshwari Birje @ 2013-01-23 10:05 UTC (permalink / raw) To: u-boot Hi Simon, Thank you for comments. On Tue, Jan 22, 2013 at 8:25 PM, Simon Glass <sjg@chromium.org> wrote: > Hi Rajeshwari, > > On Mon, Jan 21, 2013 at 2:52 AM, Rajeshwari Shinde > <rajeshwari.s@samsung.com> wrote: >> This patch sets high a GPIO to enable the codec MAX98095 >> >> Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com> >> --- >> board/samsung/smdk5250/smdk5250.c | 15 +++++++++++++++ >> 1 files changed, 15 insertions(+), 0 deletions(-) >> >> diff --git a/board/samsung/smdk5250/smdk5250.c b/board/samsung/smdk5250/smdk5250.c >> index 12cc03e..6f2e067 100644 >> --- a/board/samsung/smdk5250/smdk5250.c >> +++ b/board/samsung/smdk5250/smdk5250.c >> @@ -56,6 +56,18 @@ int board_usb_vbus_init(void) >> } >> #endif >> >> +#ifdef CONFIG_SOUND_MAX98095 >> +static void board_enable_audio_codec(void) >> +{ >> + struct exynos5_gpio_part1 *gpio1 = (struct exynos5_gpio_part1 *) >> + samsung_get_base_gpio_part1(); >> + >> + /* Enable MAX98095 Codec */ >> + s5p_gpio_direction_output(&gpio1->x1, 7, 1); >> + s5p_gpio_set_pull(&gpio1->x1, 7, GPIO_PULL_NONE); > > This GPIO is hard-coded - does the FDT version of this file do this differently? For FDT support of same we need gpio numbering feature which is still not merged in the mainline code. Hence currently the same has been hard coded for MAX98095 on Snow. > >> +} >> +#endif >> + >> int board_init(void) >> { >> gd->bd->bi_boot_params = (PHYS_SDRAM_1 + 0x100UL); >> @@ -65,6 +77,9 @@ int board_init(void) >> #ifdef CONFIG_USB_EHCI_EXYNOS >> board_usb_vbus_init(); >> #endif >> +#ifdef CONFIG_SOUND_MAX98095 >> + board_enable_audio_codec(); >> +#endif >> return 0; >> } >> >> -- >> 1.7.4.4 >> > > Regards, > Simon > _______________________________________________ > U-Boot mailing list > U-Boot at lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot -- Regards, Rajeshwari Shinde ^ permalink raw reply [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 4/7] EXYNOS5: GPIO to enable MAX98095 2013-01-23 10:05 ` Rajeshwari Birje @ 2013-01-25 20:40 ` Simon Glass 0 siblings, 0 replies; 17+ messages in thread From: Simon Glass @ 2013-01-25 20:40 UTC (permalink / raw) To: u-boot Hi Rajeshwari, On Wed, Jan 23, 2013 at 11:05 PM, Rajeshwari Birje <rajeshwari.birje@gmail.com> wrote: > Hi Simon, > > Thank you for comments. > > On Tue, Jan 22, 2013 at 8:25 PM, Simon Glass <sjg@chromium.org> wrote: >> Hi Rajeshwari, >> >> On Mon, Jan 21, 2013 at 2:52 AM, Rajeshwari Shinde >> <rajeshwari.s@samsung.com> wrote: >>> This patch sets high a GPIO to enable the codec MAX98095 >>> >>> Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com> >>> --- >>> board/samsung/smdk5250/smdk5250.c | 15 +++++++++++++++ >>> 1 files changed, 15 insertions(+), 0 deletions(-) >>> >>> diff --git a/board/samsung/smdk5250/smdk5250.c b/board/samsung/smdk5250/smdk5250.c >>> index 12cc03e..6f2e067 100644 >>> --- a/board/samsung/smdk5250/smdk5250.c >>> +++ b/board/samsung/smdk5250/smdk5250.c >>> @@ -56,6 +56,18 @@ int board_usb_vbus_init(void) >>> } >>> #endif >>> >>> +#ifdef CONFIG_SOUND_MAX98095 >>> +static void board_enable_audio_codec(void) >>> +{ >>> + struct exynos5_gpio_part1 *gpio1 = (struct exynos5_gpio_part1 *) >>> + samsung_get_base_gpio_part1(); >>> + >>> + /* Enable MAX98095 Codec */ >>> + s5p_gpio_direction_output(&gpio1->x1, 7, 1); >>> + s5p_gpio_set_pull(&gpio1->x1, 7, GPIO_PULL_NONE); >> >> This GPIO is hard-coded - does the FDT version of this file do this differently? > For FDT support of same we need gpio numbering feature which is still > not merged in the mainline code. > Hence currently the same has been hard coded for MAX98095 on Snow. >> Yes I see, thank you. Acked-by: Simon Glass <sjg@chromium.org> >>> +} >>> +#endif >>> + >>> int board_init(void) >>> { >>> gd->bd->bi_boot_params = (PHYS_SDRAM_1 + 0x100UL); >>> @@ -65,6 +77,9 @@ int board_init(void) >>> #ifdef CONFIG_USB_EHCI_EXYNOS >>> board_usb_vbus_init(); >>> #endif >>> +#ifdef CONFIG_SOUND_MAX98095 >>> + board_enable_audio_codec(); >>> +#endif >>> return 0; >>> } >>> >>> -- >>> 1.7.4.4 >>> >> >> Regards, >> Simon >> _______________________________________________ >> U-Boot mailing list >> U-Boot at lists.denx.de >> http://lists.denx.de/mailman/listinfo/u-boot > > -- > Regards, > Rajeshwari Shinde ^ permalink raw reply [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 5/7] EXYNOS5: FDT: Add compatible strings for MAX98095 2013-01-21 10:52 [U-Boot] [PATCH 0/7] EXYNOS5: Add audio support for Snow Rajeshwari Shinde ` (3 preceding siblings ...) 2013-01-21 10:52 ` [U-Boot] [PATCH 4/7] EXYNOS5: GPIO to enable MAX98095 Rajeshwari Shinde @ 2013-01-21 10:52 ` Rajeshwari Shinde 2013-01-21 10:52 ` [U-Boot] [PATCH 6/7] EXYNOS5: Add initial DTS file for Snow Rajeshwari Shinde 2013-01-21 10:52 ` [U-Boot] [PATCH 7/7] EXYNOS5: Snow: Add a configuration file Rajeshwari Shinde 6 siblings, 0 replies; 17+ messages in thread From: Rajeshwari Shinde @ 2013-01-21 10:52 UTC (permalink / raw) To: u-boot Add required compatible information for MAX98095 codec Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com> --- include/fdtdec.h | 1 + lib/fdtdec.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/fdtdec.h b/include/fdtdec.h index f77d195..e76cdc1 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -79,6 +79,7 @@ enum fdt_compat_id { COMPAT_SAMSUNG_EXYNOS_EHCI, /* Exynos EHCI controller */ COMPAT_SAMSUNG_EXYNOS_USB_PHY, /* Exynos phy controller for usb2.0 */ COMPAT_MAXIM_MAX77686_PMIC, /* MAX77686 PMIC */ + COMPAT_MAXIM_98095_CODEC, /* MAX98095 Codec */ COMPAT_COUNT, }; diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 16921e1..a5f770f 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -54,6 +54,7 @@ static const char * const compat_names[COMPAT_COUNT] = { COMPAT(SAMSUNG_EXYNOS_EHCI, "samsung,exynos-ehci"), COMPAT(SAMSUNG_EXYNOS_USB_PHY, "samsung,exynos-usb-phy"), COMPAT(MAXIM_MAX77686_PMIC, "maxim,max77686_pmic"), + COMPAT(MAXIM_98095_CODEC, "maxim,max98095-codec"), }; const char *fdtdec_get_compatible(enum fdt_compat_id id) -- 1.7.4.4 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 6/7] EXYNOS5: Add initial DTS file for Snow. 2013-01-21 10:52 [U-Boot] [PATCH 0/7] EXYNOS5: Add audio support for Snow Rajeshwari Shinde ` (4 preceding siblings ...) 2013-01-21 10:52 ` [U-Boot] [PATCH 5/7] EXYNOS5: FDT: Add compatible strings for MAX98095 Rajeshwari Shinde @ 2013-01-21 10:52 ` Rajeshwari Shinde 2013-01-22 14:56 ` Simon Glass 2013-01-25 20:42 ` Simon Glass 2013-01-21 10:52 ` [U-Boot] [PATCH 7/7] EXYNOS5: Snow: Add a configuration file Rajeshwari Shinde 6 siblings, 2 replies; 17+ messages in thread From: Rajeshwari Shinde @ 2013-01-21 10:52 UTC (permalink / raw) To: u-boot This patch adds the DTS file for Snow Board. Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com> --- board/samsung/dts/exynos5250-snow.dts | 69 +++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) create mode 100644 board/samsung/dts/exynos5250-snow.dts diff --git a/board/samsung/dts/exynos5250-snow.dts b/board/samsung/dts/exynos5250-snow.dts new file mode 100644 index 0000000..af788a6 --- /dev/null +++ b/board/samsung/dts/exynos5250-snow.dts @@ -0,0 +1,69 @@ +/* + * SAMSUNG SMDK5250 board device tree source + * + * Copyright (c) 2012 Samsung Electronics Co., Ltd. + * http://www.samsung.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. +*/ + +/dts-v1/; +/include/ ARCH_CPU_DTS + +/ { + model = "Google Snow"; + compatible = "google,snow", "samsung,exynos5250"; + + aliases { + i2c0 = "/i2c at 12c60000"; + i2c1 = "/i2c at 12c70000"; + i2c2 = "/i2c at 12c80000"; + i2c3 = "/i2c at 12c90000"; + i2c4 = "/i2c at 12ca0000"; + i2c5 = "/i2c at 12cb0000"; + i2c6 = "/i2c at 12cc0000"; + i2c7 = "/i2c at 12cd0000"; + spi0 = "/spi at 12d20000"; + spi1 = "/spi at 12d30000"; + spi2 = "/spi at 12d40000"; + spi3 = "/spi at 131a0000"; + spi4 = "/spi at 131b0000"; + }; + + sromc at 12250000 { + bank = <1>; + srom-timing = <1 9 12 1 6 1 1>; + width = <2>; + lan at 5000000 { + compatible = "smsc,lan9215", "smsc,lan"; + reg = <0x5000000 0x100>; + phy-mode = "mii"; + }; + }; + + sound at 12d60000 { + samsung,i2s-epll-clock-frequency = <192000000>; + samsung,i2s-sampling-rate = <48000>; + samsung,i2s-bits-per-sample = <16>; + samsung,i2s-channels = <2>; + samsung,i2s-lr-clk-framesize = <256>; + samsung,i2s-bit-clk-framesize = <32>; + samsung,codec-type = "max98095"; + }; + + i2c at 12cd0000 { + soundcodec at 22 { + reg = <0x22>; + compatible = "maxim,max98095-codec"; + }; + }; + + i2c at 12c60000 { + pmic at 9 { + reg = <0x9>; + compatible = "maxim,max77686_pmic"; + }; + }; +}; -- 1.7.4.4 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 6/7] EXYNOS5: Add initial DTS file for Snow. 2013-01-21 10:52 ` [U-Boot] [PATCH 6/7] EXYNOS5: Add initial DTS file for Snow Rajeshwari Shinde @ 2013-01-22 14:56 ` Simon Glass 2013-01-25 20:42 ` Simon Glass 1 sibling, 0 replies; 17+ messages in thread From: Simon Glass @ 2013-01-22 14:56 UTC (permalink / raw) To: u-boot On Mon, Jan 21, 2013 at 2:52 AM, Rajeshwari Shinde <rajeshwari.s@samsung.com> wrote: > This patch adds the DTS file for Snow Board. > > Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com> Rajeshwari > --- > board/samsung/dts/exynos5250-snow.dts | 69 +++++++++++++++++++++++++++++++++ > 1 files changed, 69 insertions(+), 0 deletions(-) > create mode 100644 board/samsung/dts/exynos5250-snow.dts > > diff --git a/board/samsung/dts/exynos5250-snow.dts b/board/samsung/dts/exynos5250-snow.dts > new file mode 100644 > index 0000000..af788a6 > --- /dev/null > +++ b/board/samsung/dts/exynos5250-snow.dts > @@ -0,0 +1,69 @@ > +/* > + * SAMSUNG SMDK5250 board device tree source > + * > + * Copyright (c) 2012 Samsung Electronics Co., Ltd. > + * http://www.samsung.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. > +*/ > + > +/dts-v1/; > +/include/ ARCH_CPU_DTS > + > +/ { > + model = "Google Snow"; > + compatible = "google,snow", "samsung,exynos5250"; > + > + aliases { > + i2c0 = "/i2c at 12c60000"; > + i2c1 = "/i2c at 12c70000"; > + i2c2 = "/i2c at 12c80000"; > + i2c3 = "/i2c at 12c90000"; > + i2c4 = "/i2c at 12ca0000"; > + i2c5 = "/i2c at 12cb0000"; > + i2c6 = "/i2c at 12cc0000"; > + i2c7 = "/i2c at 12cd0000"; > + spi0 = "/spi at 12d20000"; > + spi1 = "/spi at 12d30000"; > + spi2 = "/spi at 12d40000"; > + spi3 = "/spi at 131a0000"; > + spi4 = "/spi at 131b0000"; > + }; > + > + sromc at 12250000 { > + bank = <1>; > + srom-timing = <1 9 12 1 6 1 1>; > + width = <2>; > + lan at 5000000 { > + compatible = "smsc,lan9215", "smsc,lan"; > + reg = <0x5000000 0x100>; > + phy-mode = "mii"; > + }; > + }; > + > + sound at 12d60000 { > + samsung,i2s-epll-clock-frequency = <192000000>; > + samsung,i2s-sampling-rate = <48000>; > + samsung,i2s-bits-per-sample = <16>; > + samsung,i2s-channels = <2>; > + samsung,i2s-lr-clk-framesize = <256>; > + samsung,i2s-bit-clk-framesize = <32>; > + samsung,codec-type = "max98095"; > + }; > + > + i2c at 12cd0000 { > + soundcodec at 22 { > + reg = <0x22>; > + compatible = "maxim,max98095-codec"; > + }; > + }; > + > + i2c at 12c60000 { > + pmic at 9 { > + reg = <0x9>; > + compatible = "maxim,max77686_pmic"; > + }; > + }; > +}; > -- > 1.7.4.4 > ^ permalink raw reply [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 6/7] EXYNOS5: Add initial DTS file for Snow. 2013-01-21 10:52 ` [U-Boot] [PATCH 6/7] EXYNOS5: Add initial DTS file for Snow Rajeshwari Shinde 2013-01-22 14:56 ` Simon Glass @ 2013-01-25 20:42 ` Simon Glass 1 sibling, 0 replies; 17+ messages in thread From: Simon Glass @ 2013-01-25 20:42 UTC (permalink / raw) To: u-boot On Mon, Jan 21, 2013 at 11:52 PM, Rajeshwari Shinde <rajeshwari.s@samsung.com> wrote: > This patch adds the DTS file for Snow Board. > > Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com> One question below, but: Acked-by: Simon Glass <sjg@chromium.org> > --- > board/samsung/dts/exynos5250-snow.dts | 69 +++++++++++++++++++++++++++++++++ > 1 files changed, 69 insertions(+), 0 deletions(-) > create mode 100644 board/samsung/dts/exynos5250-snow.dts > > diff --git a/board/samsung/dts/exynos5250-snow.dts b/board/samsung/dts/exynos5250-snow.dts > new file mode 100644 > index 0000000..af788a6 > --- /dev/null > +++ b/board/samsung/dts/exynos5250-snow.dts > @@ -0,0 +1,69 @@ > +/* > + * SAMSUNG SMDK5250 board device tree source > + * > + * Copyright (c) 2012 Samsung Electronics Co., Ltd. > + * http://www.samsung.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. > +*/ > + > +/dts-v1/; > +/include/ ARCH_CPU_DTS > + > +/ { > + model = "Google Snow"; > + compatible = "google,snow", "samsung,exynos5250"; > + > + aliases { > + i2c0 = "/i2c at 12c60000"; > + i2c1 = "/i2c at 12c70000"; > + i2c2 = "/i2c at 12c80000"; > + i2c3 = "/i2c at 12c90000"; > + i2c4 = "/i2c at 12ca0000"; > + i2c5 = "/i2c at 12cb0000"; > + i2c6 = "/i2c at 12cc0000"; > + i2c7 = "/i2c at 12cd0000"; > + spi0 = "/spi at 12d20000"; > + spi1 = "/spi at 12d30000"; > + spi2 = "/spi at 12d40000"; > + spi3 = "/spi at 131a0000"; > + spi4 = "/spi at 131b0000"; > + }; > + > + sromc at 12250000 { > + bank = <1>; > + srom-timing = <1 9 12 1 6 1 1>; > + width = <2>; > + lan at 5000000 { > + compatible = "smsc,lan9215", "smsc,lan"; > + reg = <0x5000000 0x100>; > + phy-mode = "mii"; > + }; > + }; > + > + sound at 12d60000 { > + samsung,i2s-epll-clock-frequency = <192000000>; > + samsung,i2s-sampling-rate = <48000>; > + samsung,i2s-bits-per-sample = <16>; > + samsung,i2s-channels = <2>; > + samsung,i2s-lr-clk-framesize = <256>; > + samsung,i2s-bit-clk-framesize = <32>; > + samsung,codec-type = "max98095"; > + }; > + > + i2c at 12cd0000 { > + soundcodec at 22 { > + reg = <0x22>; > + compatible = "maxim,max98095-codec"; > + }; > + }; > + > + i2c at 12c60000 { > + pmic at 9 { > + reg = <0x9>; > + compatible = "maxim,max77686_pmic"; Should this be - instead of _ ? > + }; > + }; > +}; > -- > 1.7.4.4 > ^ permalink raw reply [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 7/7] EXYNOS5: Snow: Add a configuration file 2013-01-21 10:52 [U-Boot] [PATCH 0/7] EXYNOS5: Add audio support for Snow Rajeshwari Shinde ` (5 preceding siblings ...) 2013-01-21 10:52 ` [U-Boot] [PATCH 6/7] EXYNOS5: Add initial DTS file for Snow Rajeshwari Shinde @ 2013-01-21 10:52 ` Rajeshwari Shinde 2013-01-22 14:58 ` Simon Glass 6 siblings, 1 reply; 17+ messages in thread From: Rajeshwari Shinde @ 2013-01-21 10:52 UTC (permalink / raw) To: u-boot This patch adds the configuration file for Snow Board and defines the same in boards.cfg. The Audio codec required for SMDK5250 and Snow are different hence they are defined in the corresponding configuration files. Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com> --- boards.cfg | 1 + include/configs/exynos5250-dt.h | 1 - include/configs/smdk5250.h | 1 + include/configs/snow.h | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 36 insertions(+), 1 deletions(-) create mode 100644 include/configs/snow.h diff --git a/boards.cfg b/boards.cfg index e4b0d44..f247b03 100644 --- a/boards.cfg +++ b/boards.cfg @@ -283,6 +283,7 @@ s5p_goni arm armv7 goni samsung smdkc100 arm armv7 smdkc100 samsung s5pc1xx origen arm armv7 origen samsung exynos s5pc210_universal arm armv7 universal_c210 samsung exynos +snow arm armv7 smdk5250 samsung exynos smdk5250 arm armv7 smdk5250 samsung exynos smdkv310 arm armv7 smdkv310 samsung exynos trats arm armv7 trats samsung exynos diff --git a/include/configs/exynos5250-dt.h b/include/configs/exynos5250-dt.h index a01fb96..7b9c393 100644 --- a/include/configs/exynos5250-dt.h +++ b/include/configs/exynos5250-dt.h @@ -297,7 +297,6 @@ #ifdef CONFIG_CMD_SOUND #define CONFIG_SOUND #define CONFIG_I2S -#define CONFIG_SOUND_WM8994 #endif /* Enable devicetree support */ diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h index 81f83a8..b23b5bc 100644 --- a/include/configs/smdk5250.h +++ b/include/configs/smdk5250.h @@ -30,4 +30,5 @@ #undef CONFIG_DEFAULT_DEVICE_TREE #define CONFIG_DEFAULT_DEVICE_TREE exynos5250-smdk5250 +#define CONFIG_SOUND_WM8994 #endif /* __CONFIG_SMDK_H */ diff --git a/include/configs/snow.h b/include/configs/snow.h new file mode 100644 index 0000000..be38635 --- /dev/null +++ b/include/configs/snow.h @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2012 Samsung Electronics + * + * Configuration settings for the SAMSUNG SMDK5250 board. + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#ifndef __CONFIG_SMDK_H +#define __CONFIG_SMDK_H + +#include <configs/exynos5250-dt.h> + +#undef CONFIG_DEFAULT_DEVICE_TREE +#define CONFIG_DEFAULT_DEVICE_TREE exynos5250-snow + +#define CONFIG_SOUND_MAX98095 +#endif /* __CONFIG_SMDK_H */ -- 1.7.4.4 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 7/7] EXYNOS5: Snow: Add a configuration file 2013-01-21 10:52 ` [U-Boot] [PATCH 7/7] EXYNOS5: Snow: Add a configuration file Rajeshwari Shinde @ 2013-01-22 14:58 ` Simon Glass 2013-01-23 10:13 ` Rajeshwari Birje 0 siblings, 1 reply; 17+ messages in thread From: Simon Glass @ 2013-01-22 14:58 UTC (permalink / raw) To: u-boot Hi Rajeshwari, On Mon, Jan 21, 2013 at 2:52 AM, Rajeshwari Shinde <rajeshwari.s@samsung.com> wrote: > This patch adds the configuration file for Snow Board and > defines the same in boards.cfg. > The Audio codec required for SMDK5250 and Snow are different > hence they are defined in the corresponding configuration files. > > Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com> > --- > boards.cfg | 1 + > include/configs/exynos5250-dt.h | 1 - > include/configs/smdk5250.h | 1 + > include/configs/snow.h | 34 ++++++++++++++++++++++++++++++++++ > 4 files changed, 36 insertions(+), 1 deletions(-) > create mode 100644 include/configs/snow.h > > diff --git a/boards.cfg b/boards.cfg > index e4b0d44..f247b03 100644 > --- a/boards.cfg > +++ b/boards.cfg > @@ -283,6 +283,7 @@ s5p_goni arm armv7 goni samsung > smdkc100 arm armv7 smdkc100 samsung s5pc1xx > origen arm armv7 origen samsung exynos > s5pc210_universal arm armv7 universal_c210 samsung exynos > +snow arm armv7 smdk5250 samsung exynos > smdk5250 arm armv7 smdk5250 samsung exynos > smdkv310 arm armv7 smdkv310 samsung exynos > trats arm armv7 trats samsung exynos > diff --git a/include/configs/exynos5250-dt.h b/include/configs/exynos5250-dt.h > index a01fb96..7b9c393 100644 > --- a/include/configs/exynos5250-dt.h > +++ b/include/configs/exynos5250-dt.h > @@ -297,7 +297,6 @@ > #ifdef CONFIG_CMD_SOUND > #define CONFIG_SOUND > #define CONFIG_I2S > -#define CONFIG_SOUND_WM8994 > #endif > > /* Enable devicetree support */ > diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h > index 81f83a8..b23b5bc 100644 > --- a/include/configs/smdk5250.h > +++ b/include/configs/smdk5250.h > @@ -30,4 +30,5 @@ > #undef CONFIG_DEFAULT_DEVICE_TREE > #define CONFIG_DEFAULT_DEVICE_TREE exynos5250-smdk5250 > > +#define CONFIG_SOUND_WM8994 > #endif /* __CONFIG_SMDK_H */ > diff --git a/include/configs/snow.h b/include/configs/snow.h > new file mode 100644 > index 0000000..be38635 > --- /dev/null > +++ b/include/configs/snow.h > @@ -0,0 +1,34 @@ > +/* > + * Copyright (C) 2012 Samsung Electronics > + * > + * Configuration settings for the SAMSUNG SMDK5250 board. > + * > + * See file CREDITS for list of people who contributed to this > + * project. > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation; either version 2 of > + * the License, or (at your option) any later version. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, > + * MA 02111-1307 USA > + */ > + > +#ifndef __CONFIG_SMDK_H > +#define __CONFIG_SMDK_H > + > +#include <configs/exynos5250-dt.h> > + > +#undef CONFIG_DEFAULT_DEVICE_TREE > +#define CONFIG_DEFAULT_DEVICE_TREE exynos5250-snow > + > +#define CONFIG_SOUND_MAX98095 Really it would be better if they could share the same config, with just the CONFIG_DEFAULT_DEVICE_TREE difference. Isn't there code to select the right codec based on the FDT nodes? Maybe I have this wrong, not sure. > +#endif /* __CONFIG_SMDK_H */ > -- > 1.7.4.4 > Regards, Simon ^ permalink raw reply [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 7/7] EXYNOS5: Snow: Add a configuration file 2013-01-22 14:58 ` Simon Glass @ 2013-01-23 10:13 ` Rajeshwari Birje 2013-01-25 21:03 ` Simon Glass 0 siblings, 1 reply; 17+ messages in thread From: Rajeshwari Birje @ 2013-01-23 10:13 UTC (permalink / raw) To: u-boot Hi Simon, Thank you for comments. On Tue, Jan 22, 2013 at 8:28 PM, Simon Glass <sjg@chromium.org> wrote: > Hi Rajeshwari, > > On Mon, Jan 21, 2013 at 2:52 AM, Rajeshwari Shinde > <rajeshwari.s@samsung.com> wrote: >> This patch adds the configuration file for Snow Board and >> defines the same in boards.cfg. >> The Audio codec required for SMDK5250 and Snow are different >> hence they are defined in the corresponding configuration files. >> >> Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com> >> --- >> boards.cfg | 1 + >> include/configs/exynos5250-dt.h | 1 - >> include/configs/smdk5250.h | 1 + >> include/configs/snow.h | 34 ++++++++++++++++++++++++++++++++++ >> 4 files changed, 36 insertions(+), 1 deletions(-) >> create mode 100644 include/configs/snow.h >> >> diff --git a/boards.cfg b/boards.cfg >> index e4b0d44..f247b03 100644 >> --- a/boards.cfg >> +++ b/boards.cfg >> @@ -283,6 +283,7 @@ s5p_goni arm armv7 goni samsung >> smdkc100 arm armv7 smdkc100 samsung s5pc1xx >> origen arm armv7 origen samsung exynos >> s5pc210_universal arm armv7 universal_c210 samsung exynos >> +snow arm armv7 smdk5250 samsung exynos >> smdk5250 arm armv7 smdk5250 samsung exynos >> smdkv310 arm armv7 smdkv310 samsung exynos >> trats arm armv7 trats samsung exynos >> diff --git a/include/configs/exynos5250-dt.h b/include/configs/exynos5250-dt.h >> index a01fb96..7b9c393 100644 >> --- a/include/configs/exynos5250-dt.h >> +++ b/include/configs/exynos5250-dt.h >> @@ -297,7 +297,6 @@ >> #ifdef CONFIG_CMD_SOUND >> #define CONFIG_SOUND >> #define CONFIG_I2S >> -#define CONFIG_SOUND_WM8994 >> #endif >> >> /* Enable devicetree support */ >> diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h >> index 81f83a8..b23b5bc 100644 >> --- a/include/configs/smdk5250.h >> +++ b/include/configs/smdk5250.h >> @@ -30,4 +30,5 @@ >> #undef CONFIG_DEFAULT_DEVICE_TREE >> #define CONFIG_DEFAULT_DEVICE_TREE exynos5250-smdk5250 >> >> +#define CONFIG_SOUND_WM8994 >> #endif /* __CONFIG_SMDK_H */ >> diff --git a/include/configs/snow.h b/include/configs/snow.h >> new file mode 100644 >> index 0000000..be38635 >> --- /dev/null >> +++ b/include/configs/snow.h >> @@ -0,0 +1,34 @@ >> +/* >> + * Copyright (C) 2012 Samsung Electronics >> + * >> + * Configuration settings for the SAMSUNG SMDK5250 board. >> + * >> + * See file CREDITS for list of people who contributed to this >> + * project. >> + * >> + * This program is free software; you can redistribute it and/or >> + * modify it under the terms of the GNU General Public License as >> + * published by the Free Software Foundation; either version 2 of >> + * the License, or (at your option) any later version. >> + * >> + * This program is distributed in the hope that it will be useful, >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >> + * GNU General Public License for more details. >> + * >> + * You should have received a copy of the GNU General Public License >> + * along with this program; if not, write to the Free Software >> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, >> + * MA 02111-1307 USA >> + */ >> + >> +#ifndef __CONFIG_SMDK_H >> +#define __CONFIG_SMDK_H >> + >> +#include <configs/exynos5250-dt.h> >> + >> +#undef CONFIG_DEFAULT_DEVICE_TREE >> +#define CONFIG_DEFAULT_DEVICE_TREE exynos5250-snow >> + >> +#define CONFIG_SOUND_MAX98095 > > Really it would be better if they could share the same config, with > just the CONFIG_DEFAULT_DEVICE_TREE difference. Isn't there code to > select the right codec based on the FDT nodes? > > Maybe I have this wrong, not sure. Actually we do decode the codec from DTS file. But we need to define this to compile the corresponding codec file. And I felt since the codec is different for both the boards we can add them in the respective config file. Also in case of Non FDT we define the values based on this codec define. > >> +#endif /* __CONFIG_SMDK_H */ >> -- >> 1.7.4.4 >> > > Regards, > Simon > _______________________________________________ > U-Boot mailing list > U-Boot at lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot -- Regards, Rajeshwari Shinde ^ permalink raw reply [flat|nested] 17+ messages in thread
* [U-Boot] [PATCH 7/7] EXYNOS5: Snow: Add a configuration file 2013-01-23 10:13 ` Rajeshwari Birje @ 2013-01-25 21:03 ` Simon Glass 0 siblings, 0 replies; 17+ messages in thread From: Simon Glass @ 2013-01-25 21:03 UTC (permalink / raw) To: u-boot Hi Rajeshwari, On Wed, Jan 23, 2013 at 11:13 PM, Rajeshwari Birje <rajeshwari.birje@gmail.com> wrote: > Hi Simon, > > Thank you for comments. > > On Tue, Jan 22, 2013 at 8:28 PM, Simon Glass <sjg@chromium.org> wrote: >> Hi Rajeshwari, >> >> On Mon, Jan 21, 2013 at 2:52 AM, Rajeshwari Shinde >> <rajeshwari.s@samsung.com> wrote: >>> This patch adds the configuration file for Snow Board and >>> defines the same in boards.cfg. >>> The Audio codec required for SMDK5250 and Snow are different >>> hence they are defined in the corresponding configuration files. >>> >>> Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com> >>> --- >>> boards.cfg | 1 + >>> include/configs/exynos5250-dt.h | 1 - >>> include/configs/smdk5250.h | 1 + >>> include/configs/snow.h | 34 ++++++++++++++++++++++++++++++++++ >>> 4 files changed, 36 insertions(+), 1 deletions(-) >>> create mode 100644 include/configs/snow.h >>> >>> diff --git a/boards.cfg b/boards.cfg >>> index e4b0d44..f247b03 100644 >>> --- a/boards.cfg >>> +++ b/boards.cfg >>> @@ -283,6 +283,7 @@ s5p_goni arm armv7 goni samsung >>> smdkc100 arm armv7 smdkc100 samsung s5pc1xx >>> origen arm armv7 origen samsung exynos >>> s5pc210_universal arm armv7 universal_c210 samsung exynos >>> +snow arm armv7 smdk5250 samsung exynos >>> smdk5250 arm armv7 smdk5250 samsung exynos >>> smdkv310 arm armv7 smdkv310 samsung exynos >>> trats arm armv7 trats samsung exynos >>> diff --git a/include/configs/exynos5250-dt.h b/include/configs/exynos5250-dt.h >>> index a01fb96..7b9c393 100644 >>> --- a/include/configs/exynos5250-dt.h >>> +++ b/include/configs/exynos5250-dt.h >>> @@ -297,7 +297,6 @@ >>> #ifdef CONFIG_CMD_SOUND >>> #define CONFIG_SOUND >>> #define CONFIG_I2S >>> -#define CONFIG_SOUND_WM8994 >>> #endif >>> >>> /* Enable devicetree support */ >>> diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h >>> index 81f83a8..b23b5bc 100644 >>> --- a/include/configs/smdk5250.h >>> +++ b/include/configs/smdk5250.h >>> @@ -30,4 +30,5 @@ >>> #undef CONFIG_DEFAULT_DEVICE_TREE >>> #define CONFIG_DEFAULT_DEVICE_TREE exynos5250-smdk5250 >>> >>> +#define CONFIG_SOUND_WM8994 >>> #endif /* __CONFIG_SMDK_H */ >>> diff --git a/include/configs/snow.h b/include/configs/snow.h >>> new file mode 100644 >>> index 0000000..be38635 >>> --- /dev/null >>> +++ b/include/configs/snow.h >>> @@ -0,0 +1,34 @@ >>> +/* >>> + * Copyright (C) 2012 Samsung Electronics >>> + * >>> + * Configuration settings for the SAMSUNG SMDK5250 board. >>> + * >>> + * See file CREDITS for list of people who contributed to this >>> + * project. >>> + * >>> + * This program is free software; you can redistribute it and/or >>> + * modify it under the terms of the GNU General Public License as >>> + * published by the Free Software Foundation; either version 2 of >>> + * the License, or (at your option) any later version. >>> + * >>> + * This program is distributed in the hope that it will be useful, >>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >>> + * GNU General Public License for more details. >>> + * >>> + * You should have received a copy of the GNU General Public License >>> + * along with this program; if not, write to the Free Software >>> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, >>> + * MA 02111-1307 USA >>> + */ >>> + >>> +#ifndef __CONFIG_SMDK_H >>> +#define __CONFIG_SMDK_H >>> + >>> +#include <configs/exynos5250-dt.h> >>> + >>> +#undef CONFIG_DEFAULT_DEVICE_TREE >>> +#define CONFIG_DEFAULT_DEVICE_TREE exynos5250-snow >>> + >>> +#define CONFIG_SOUND_MAX98095 >> >> Really it would be better if they could share the same config, with >> just the CONFIG_DEFAULT_DEVICE_TREE difference. Isn't there code to >> select the right codec based on the FDT nodes? >> >> Maybe I have this wrong, not sure. > Actually we do decode the codec from DTS file. > But we need to define this to compile the corresponding codec file. > And I felt since the codec is different for both the boards we can add > them in the respective config file. > Also in case of Non FDT we define the values based on this codec define. Well keep in mind that if we want the same U-Boot to boot on all exynos5250 boards then we will need to define both CONFIGs in the config file and rely on the FDT to make it work. What happens if you define both codecs in smdk5250.h? Also note that at built time we don't know whether we are booting on snow or smdk5250 (just as with the kernel), and we only find out when we start. Wasn't there a plan to have a exynos5250_dt.h config file? If so, then perhaps that file can define both codec CONFIGs, and your new snow file can include that instead? Regards, Simon >> >>> +#endif /* __CONFIG_SMDK_H */ >>> -- >>> 1.7.4.4 >>> >> >> Regards, >> Simon >> _______________________________________________ >> U-Boot mailing list >> U-Boot at lists.denx.de >> http://lists.denx.de/mailman/listinfo/u-boot > > -- > Regards, > Rajeshwari Shinde ^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2013-01-25 21:03 UTC | newest] Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2013-01-21 10:52 [U-Boot] [PATCH 0/7] EXYNOS5: Add audio support for Snow Rajeshwari Shinde 2013-01-21 10:52 ` [U-Boot] [PATCH 1/7] EXYNOS5: Add function to enable XXTI clock source Rajeshwari Shinde 2013-01-22 14:51 ` Simon Glass 2013-01-21 10:52 ` [U-Boot] [PATCH 2/7] Sound: MAX98095: Add the driver for codec Rajeshwari Shinde 2013-01-21 10:52 ` [U-Boot] [PATCH 3/7] Sound: Support for MAX98095 codec in driver Rajeshwari Shinde 2013-01-21 10:52 ` [U-Boot] [PATCH 4/7] EXYNOS5: GPIO to enable MAX98095 Rajeshwari Shinde 2013-01-22 14:55 ` Simon Glass 2013-01-23 10:05 ` Rajeshwari Birje 2013-01-25 20:40 ` Simon Glass 2013-01-21 10:52 ` [U-Boot] [PATCH 5/7] EXYNOS5: FDT: Add compatible strings for MAX98095 Rajeshwari Shinde 2013-01-21 10:52 ` [U-Boot] [PATCH 6/7] EXYNOS5: Add initial DTS file for Snow Rajeshwari Shinde 2013-01-22 14:56 ` Simon Glass 2013-01-25 20:42 ` Simon Glass 2013-01-21 10:52 ` [U-Boot] [PATCH 7/7] EXYNOS5: Snow: Add a configuration file Rajeshwari Shinde 2013-01-22 14:58 ` Simon Glass 2013-01-23 10:13 ` Rajeshwari Birje 2013-01-25 21:03 ` Simon Glass
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.