mirror of
https://github.com/torvalds/linux.git
synced 2024-11-24 05:02:12 +00:00
f5a246eab9
This contains pretty many small commits covering fairly large range of
files in sound/ directory. Partly because of additional API support
and partly because of constantly developed ASoC and ARM stuff.
Some highlights:
- Introduced the helper function and documentation for exposing the
channel map via control API, as discussed in Plumbers; most of PCI
drivers are covered, will follow more drivers later
- Most of drivers have been replaced with the new PM callbacks (if
the bus is supported)
- HD-audio controller got the support of runtime PM and the support of
D3 clock-stop. Also changing the power_save option in sysfs kicks
off immediately to enable / disable the power-save mode.
- Another significant code change in HD-audio is the rewrite of
firmware loading code. Other than that, most of changes in HD-audio
are continued cleanups and standardization for the generic auto
parser and bug fixes (HBR, device-specific fixups), in addition to
the support of channel-map API.
- Addition of ASoC bindings for the compressed API, used by the
mid-x86 drivers.
- Lots of cleanups and API refreshes for ASoC codec drivers and
DaVinci.
- Conversion of OMAP to dmaengine.
- New machine driver for Wolfson Microelectronics Bells.
- New CODEC driver for Wolfson Microelectronics WM0010.
- Enhancements to the ux500 and wm2000 drivers
- A new driver for DA9055 and the support for regulator bypass mode.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iQIcBAABAgAGBQJQcpeWAAoJEGwxgFQ9KSmkpi4P/2etDDz5aEkEHNa1l4xEmFcm
ymiGTgjaalqpUAVbM/gYx9G59EFMEbzUl1BHAqE5La4wO/v9lNPb+VrdUo+B+NZ7
WSxIPWcNqdinSuoSqyYPjoPMVnhs3EMtNOqmf4jm1JOvdqA+4rO29xQVAqK/5Gfu
LpMOyPiRi5ODnbQ1BOIWwpKICioY/mLwGJudK3z0i/fYVA7gLub20f+w+sOjKIA4
wmwQAMTjAR798Cg/tVy4fQmf4SLw+c2nIgGe/PD+2gVlGXLNKBrJfMonHPTbmwKu
lmJO/EtnijNOnpbn6up7ryUQ9cSoZAUZOfdIOgmAeQgQ/LWR0f+zf2IQehSPwrul
g6hqOnQI2DNN7ugT3cYVbYnsh56TjyhnxhhxZgkapqh706QkqHGyKJNMRetzuXmP
1O//MnZJrFQWd6sOKLlTL2ZzRvnxEJcNVGaE6bbwZTfQMtPeo9l1842uIq1dLUtG
VxZb/svKUkMXv4is1dwUYUkpDsKxsgMEmabmuovceGf2N7jj/irkXgqxf6LWkaY1
JQ7ZFWUJyDzEMXRaFfzdGO15T532CfB84wvFX5xoPMwMste2AA7QuybFBVstXhKu
AtKNDgRJFUTlnLIxydpPBWdWH3UJdEaFwwsSfuNKI8OmmGKhWC/aP83k4hzueu9H
KYLvY/0ObMSMqiwh/ndQ
=uNqD
-----END PGP SIGNATURE-----
Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai:
"This contains pretty many small commits covering fairly large range of
files in sound/ directory. Partly because of additional API support
and partly because of constantly developed ASoC and ARM stuff.
Some highlights:
- Introduced the helper function and documentation for exposing the
channel map via control API, as discussed in Plumbers; most of PCI
drivers are covered, will follow more drivers later
- Most of drivers have been replaced with the new PM callbacks (if
the bus is supported)
- HD-audio controller got the support of runtime PM and the support
of D3 clock-stop. Also changing the power_save option in sysfs
kicks off immediately to enable / disable the power-save mode.
- Another significant code change in HD-audio is the rewrite of
firmware loading code. Other than that, most of changes in
HD-audio are continued cleanups and standardization for the generic
auto parser and bug fixes (HBR, device-specific fixups), in
addition to the support of channel-map API.
- Addition of ASoC bindings for the compressed API, used by the
mid-x86 drivers.
- Lots of cleanups and API refreshes for ASoC codec drivers and
DaVinci.
- Conversion of OMAP to dmaengine.
- New machine driver for Wolfson Microelectronics Bells.
- New CODEC driver for Wolfson Microelectronics WM0010.
- Enhancements to the ux500 and wm2000 drivers
- A new driver for DA9055 and the support for regulator bypass mode."
Fix up various arm soc header file reorg conflicts.
* tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (339 commits)
ALSA: hda - Add new codec ALC283 ALC290 support
ALSA: hda - avoid unneccesary indices on "Headphone Jack" controls
ALSA: hda - fix indices on boost volume on Conexant
ALSA: aloop - add locking to timer access
ALSA: hda - Fix hang caused by race during suspend.
sound: Remove unnecessary semicolon
ALSA: hda/realtek - Fix detection of ALC271X codec
ALSA: hda - Add inverted internal mic quirk for Lenovo IdeaPad U310
ALSA: hda - make Realtek/Sigmatel/Conexant use the generic unsol event
ALSA: hda - make a generic unsol event handler
ASoC: codecs: Add DA9055 codec driver
ASoC: eukrea-tlv320: Convert it to platform driver
ALSA: ASoC: add DT bindings for CS4271
ASoC: wm_hubs: Ensure volume updates are handled during class W startup
ASoC: wm5110: Adding missing volume update bits
ASoC: wm5110: Add OUT3R support
ASoC: wm5110: Add AEC loopback support
ASoC: wm5110: Rename EPOUT to HPOUT3
ASoC: arizona: Add more clock rates
ASoC: arizona: Add more DSP options for mixer input muxes
...
103 lines
3.6 KiB
C
103 lines
3.6 KiB
C
/*
|
|
* This file contains the processor specific definitions
|
|
* of the TI DM644x, DM355, DM365, and DM646x.
|
|
*
|
|
* Copyright (C) 2011 Texas Instruments Incorporated
|
|
* Copyright (c) 2007 Deep Root Systems, LLC
|
|
*
|
|
* 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 version 2.
|
|
*
|
|
* This program is distributed "as is" WITHOUT ANY WARRANTY of any
|
|
* kind, whether express or implied; without even the implied warranty
|
|
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*/
|
|
#ifndef __DAVINCI_H
|
|
#define __DAVINCI_H
|
|
|
|
#include <linux/clk.h>
|
|
#include <linux/videodev2.h>
|
|
#include <linux/davinci_emac.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/spi/spi.h>
|
|
#include <linux/platform_data/davinci_asp.h>
|
|
#include <linux/platform_data/keyscan-davinci.h>
|
|
#include <mach/hardware.h>
|
|
#include <mach/edma.h>
|
|
|
|
#include <media/davinci/vpfe_capture.h>
|
|
#include <media/davinci/vpif_types.h>
|
|
#include <media/davinci/vpss.h>
|
|
#include <media/davinci/vpbe_types.h>
|
|
#include <media/davinci/vpbe_venc.h>
|
|
#include <media/davinci/vpbe.h>
|
|
#include <media/davinci/vpbe_osd.h>
|
|
|
|
#define DAVINCI_SYSTEM_MODULE_BASE 0x01c40000
|
|
#define SYSMOD_VIDCLKCTL 0x38
|
|
#define SYSMOD_VPSS_CLKCTL 0x44
|
|
#define SYSMOD_VDD3P3VPWDN 0x48
|
|
#define SYSMOD_VSCLKDIS 0x6c
|
|
#define SYSMOD_PUPDCTL1 0x7c
|
|
|
|
extern void __iomem *davinci_sysmod_base;
|
|
#define DAVINCI_SYSMOD_VIRT(x) (davinci_sysmod_base + (x))
|
|
void davinci_map_sysmod(void);
|
|
|
|
/* DM355 base addresses */
|
|
#define DM355_ASYNC_EMIF_CONTROL_BASE 0x01e10000
|
|
#define DM355_ASYNC_EMIF_DATA_CE0_BASE 0x02000000
|
|
|
|
#define ASP1_TX_EVT_EN 1
|
|
#define ASP1_RX_EVT_EN 2
|
|
|
|
/* DM365 base addresses */
|
|
#define DM365_ASYNC_EMIF_CONTROL_BASE 0x01d10000
|
|
#define DM365_ASYNC_EMIF_DATA_CE0_BASE 0x02000000
|
|
#define DM365_ASYNC_EMIF_DATA_CE1_BASE 0x04000000
|
|
|
|
/* DM644x base addresses */
|
|
#define DM644X_ASYNC_EMIF_CONTROL_BASE 0x01e00000
|
|
#define DM644X_ASYNC_EMIF_DATA_CE0_BASE 0x02000000
|
|
#define DM644X_ASYNC_EMIF_DATA_CE1_BASE 0x04000000
|
|
#define DM644X_ASYNC_EMIF_DATA_CE2_BASE 0x06000000
|
|
#define DM644X_ASYNC_EMIF_DATA_CE3_BASE 0x08000000
|
|
|
|
/* DM646x base addresses */
|
|
#define DM646X_ASYNC_EMIF_CONTROL_BASE 0x20008000
|
|
#define DM646X_ASYNC_EMIF_CS2_SPACE_BASE 0x42000000
|
|
|
|
/* DM355 function declarations */
|
|
void __init dm355_init(void);
|
|
void dm355_init_spi0(unsigned chipselect_mask,
|
|
const struct spi_board_info *info, unsigned len);
|
|
void __init dm355_init_asp1(u32 evt_enable, struct snd_platform_data *pdata);
|
|
void dm355_set_vpfe_config(struct vpfe_config *cfg);
|
|
|
|
/* DM365 function declarations */
|
|
void __init dm365_init(void);
|
|
void __init dm365_init_asp(struct snd_platform_data *pdata);
|
|
void __init dm365_init_vc(struct snd_platform_data *pdata);
|
|
void __init dm365_init_ks(struct davinci_ks_platform_data *pdata);
|
|
void __init dm365_init_rtc(void);
|
|
void dm365_init_spi0(unsigned chipselect_mask,
|
|
const struct spi_board_info *info, unsigned len);
|
|
void dm365_set_vpfe_config(struct vpfe_config *cfg);
|
|
|
|
/* DM644x function declarations */
|
|
void __init dm644x_init(void);
|
|
void __init dm644x_init_asp(struct snd_platform_data *pdata);
|
|
int __init dm644x_init_video(struct vpfe_config *, struct vpbe_config *);
|
|
|
|
/* DM646x function declarations */
|
|
void __init dm646x_init(void);
|
|
void __init dm646x_init_mcasp0(struct snd_platform_data *pdata);
|
|
void __init dm646x_init_mcasp1(struct snd_platform_data *pdata);
|
|
int __init dm646x_init_edma(struct edma_rsv_info *rsv);
|
|
void dm646x_video_init(void);
|
|
void dm646x_setup_vpif(struct vpif_display_config *,
|
|
struct vpif_capture_config *);
|
|
#endif /*__DAVINCI_H */
|