Commit af81cd4a authored by Komal Shah's avatar Komal Shah Committed by Tony Lindgren

ARM: OMAP: sx1-alsa cleanup. No code change

- whitespace removal.
- Remove unnecessary #includes.
Signed-off-by: default avatarKomal Shah <komal_shah802003@yahoo.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent f5403be5
......@@ -25,7 +25,7 @@
#include <sound/control.h>
static int current_playback_target = PLAYBACK_TARGET_LOUDSPEAKER;
static int current_rec_src = REC_SRC_SINGLE_ENDED_MICIN_HED;
static int current_rec_src = REC_SRC_SINGLE_ENDED_MICIN_HED;
static int current_volume; /* current volume, we cant read it */
static int current_fm_volume; /* current FM radio volume, we cant read it */
......@@ -138,10 +138,10 @@ static int pcm_playback_target_put(struct snd_kcontrol *kcontrol,
if (cur_val == PLAYBACK_TARGET_LOUDSPEAKER) {
set_record_source(REC_SRC_SINGLE_ENDED_MICIN_HED);
set_loudspeaker_to_playback_target();
} else if (cur_val == PLAYBACK_TARGET_HEADPHONE) {
} else if (cur_val == PLAYBACK_TARGET_HEADPHONE) {
set_record_source(REC_SRC_SINGLE_ENDED_MICIN_HND);
set_headphone_to_playback_target();
} else if (cur_val == PLAYBACK_TARGET_CELLPHONE) {
set_headphone_to_playback_target();
} else if (cur_val == PLAYBACK_TARGET_CELLPHONE) {
set_telephone_to_record_source();
set_telephone_to_playback_target();
}
......@@ -225,7 +225,7 @@ static int headset_playback_volume_put(struct snd_kcontrol *kcontrol,
static int headset_playback_switch_info(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo)
{
uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
uinfo->count = 1;
uinfo->value.integer.min = 0;
uinfo->value.integer.max = 1;
......@@ -283,7 +283,7 @@ static int fmradio_playback_volume_put(struct snd_kcontrol *kcontrol,
static int fmradio_playback_switch_info(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo)
{
uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
uinfo->count = 1;
uinfo->value.integer.min = 0;
uinfo->value.integer.max = 1;
......@@ -340,7 +340,7 @@ static int cellphone_input_switch_put(struct snd_kcontrol *kcontrol,
static int buzzer_input_switch_info(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo)
{
uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
uinfo->count = 1;
uinfo->value.integer.min = 0;
uinfo->value.integer.max = 1;
......
......@@ -18,8 +18,8 @@
*
*/
#ifndef OMAPALSATSC2101MIXER_H_
#define OMAPALSATSC2101MIXER_H_
#ifndef OMAPALSASX1MIXER_H_
#define OMAPALSASX1MIXER_H_
#include "omap-alsa-dma.h"
......
/*
* arch/arm/mach-omap1/omap-alsa-sx1.c
*
* Alsa codec Driver for Siemens SX1 board.
* based on omap-alsa-tsc2101.c and cn_test.c example by Evgeniy Polyakov
*
......@@ -21,7 +19,6 @@
#include <linux/slab.h>
#include <linux/pm.h>
#include <asm/mach-types.h>
#include <asm/arch/dma.h>
#include <asm/arch/clock.h>
#include <asm/arch/gpio.h>
......@@ -94,7 +91,7 @@ static snd_pcm_hw_constraint_list_t egold_hw_constraints_rates = {
static snd_pcm_hardware_t egold_snd_omap_alsa_playback = {
.info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER |
SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID),
.formats = (SNDRV_PCM_FMTBIT_S16_LE),
.formats = (SNDRV_PCM_FMTBIT_S16_LE),
.rates = (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |
SNDRV_PCM_RATE_16000 |
SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 |
......@@ -253,7 +250,7 @@ static int __init snd_omap_alsa_egold_probe(struct platform_device *pdev)
static struct platform_driver omap_alsa_driver = {
.probe = snd_omap_alsa_egold_probe,
.remove = snd_omap_alsa_remove,
.remove = snd_omap_alsa_remove,
.suspend = snd_omap_alsa_suspend,
.resume = snd_omap_alsa_resume,
.driver = {
......
/*
* arch/arc/mach-omap1/omap-alsa-sx1.h
*
* based on omap-alsa-tsc2101.h
* Based on omap-alsa-tsc2101.h
*
* Alsa Driver for Siemens SX1.
* Copyright (C) 2006 Vladimir Ananiev (vovan888 at gmail com)
......@@ -28,7 +26,7 @@
#define DEFAULT_SAMPLE_RATE 44100
/* fw15: 18356000 */
#define CODEC_CLOCK 18359000
#define CODEC_CLOCK 18359000
/* McBSP for playing music */
#define AUDIO_MCBSP OMAP_MCBSP1
/* McBSP for record/play audio from phone and mic */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment