1 files changed, 143 insertions, 93 deletions

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 65e9d03ed4f5..d31e8b7b2d5e 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -228,13 +228,17 @@ struct snd_soc_ops;
 struct snd_soc_dai_mode;
 struct snd_soc_pcm_runtime;
 struct snd_soc_dai;
+struct snd_soc_dai_driver;
 struct snd_soc_platform;
 struct snd_soc_dai_link;
+struct snd_soc_platform_driver;
 struct snd_soc_codec;
+struct snd_soc_codec_driver;
 struct soc_enum;
 struct snd_soc_ac97_ops;
 struct snd_soc_jack;
 struct snd_soc_jack_pin;
+
 #ifdef CONFIG_GPIOLIB
 struct snd_soc_jack_gpio;
 #endif
@@ -249,19 +253,18 @@ enum snd_soc_control_type {
         SND_SOC_SPI,
 };
 
-int snd_soc_register_platform(struct snd_soc_platform *platform);
-void snd_soc_unregister_platform(struct snd_soc_platform *platform);
-int snd_soc_register_codec(struct snd_soc_codec *codec);
-void snd_soc_unregister_codec(struct snd_soc_codec *codec);
+int snd_soc_register_platform(struct device *dev,
+                struct snd_soc_platform_driver *platform_drv);
+void snd_soc_unregister_platform(struct device *dev);
+int snd_soc_register_codec(struct device *dev,
+                struct snd_soc_codec_driver *codec_drv,
+                struct snd_soc_dai_driver *dai_drv, int num_dai);
+void snd_soc_unregister_codec(struct device *dev);
 int snd_soc_codec_volatile_register(struct snd_soc_codec *codec, int reg);
 int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
                                int addr_bits, int data_bits,
                                enum snd_soc_control_type control);
 
-/* pcm <-> DAI connect */
-void snd_soc_free_pcms(struct snd_soc_device *socdev);
-int snd_soc_new_pcms(struct snd_soc_device *socdev, int idx, const char *xid);
-
 /* Utility functions to get clock rates from various things */
 int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots);
 int snd_soc_params_to_frame_size(struct snd_pcm_hw_params *params);
@@ -273,7 +276,7 @@ int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream,
         const struct snd_pcm_hardware *hw);
 
 /* Jack reporting */
-int snd_soc_jack_new(struct snd_soc_card *card, const char *id, int type,
+int snd_soc_jack_new(struct snd_soc_codec *codec, const char *id, int type,
                      struct snd_soc_jack *jack);
 void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask);
 int snd_soc_jack_add_pins(struct snd_soc_jack *jack, int count,
@@ -390,7 +393,7 @@ struct snd_soc_jack_gpio {
 
 struct snd_soc_jack {
         struct snd_jack *jack;
-        struct snd_soc_card *card;
+        struct snd_soc_codec *codec;
         struct list_head pins;
         int status;
         struct blocking_notifier_head notifier;
@@ -398,15 +401,13 @@ struct snd_soc_jack {
 
 /* SoC PCM stream information */
 struct snd_soc_pcm_stream {
-        char *stream_name;
+        const char *stream_name;
         u64 formats;                    /* SNDRV_PCM_FMTBIT_* */
         unsigned int rates;             /* SNDRV_PCM_RATE_* */
         unsigned int rate_min;          /* min rate */
         unsigned int rate_max;          /* max rate */
         unsigned int channels_min;      /* min channels */
         unsigned int channels_max;      /* max channels */
-        unsigned int active;            /* stream is in use */
-        void *dma_data;                 /* used by platform code */
 };
 
 /* SoC audio ops */
@@ -419,44 +420,35 @@ struct snd_soc_ops {
         int (*trigger)(struct snd_pcm_substream *, int);
 };
 
-/* SoC Audio Codec */
+/* SoC Audio Codec device */
 struct snd_soc_codec {
-        char *name;
-        struct module *owner;
-        struct mutex mutex;
+        const char *name;
+        int id;
         struct device *dev;
-        struct snd_soc_device *socdev;
+        struct snd_soc_codec_driver *driver;
 
+        struct mutex mutex;
+        struct snd_soc_card *card;
         struct list_head list;
-
-        /* callbacks */
-        int (*set_bias_level)(struct snd_soc_codec *,
-                              enum snd_soc_bias_level level);
+        struct list_head card_list;
+        int num_dai;
 
         /* runtime */
-        struct snd_card *card;
         struct snd_ac97 *ac97;  /* for ad-hoc ac97 devices */
         unsigned int active;
-        unsigned int pcm_devs;
-        void *drvdata;
+        unsigned int idle_bias_off:1; /* Use BIAS_OFF instead of STANDBY */
+        unsigned int cache_only:1;  /* Suppress writes to hardware */
+        unsigned int cache_sync:1; /* Cache needs to be synced to hardware */
+        unsigned int suspended:1; /* Codec is in suspend PM state */
+        unsigned int probed:1; /* Codec has been probed */
+        unsigned int ac97_registered:1; /* Codec has been AC97 registered */
+        unsigned int sysfs_registered:1; /* codec has been sysfs registered */
 
         /* codec IO */
         void *control_data; /* codec control (i2c/3wire) data */
-        unsigned int (*read)(struct snd_soc_codec *, unsigned int);
-        int (*write)(struct snd_soc_codec *, unsigned int, unsigned int);
-        int (*display_register)(struct snd_soc_codec *, char *,
-                                size_t, unsigned int);
-        int (*volatile_register)(unsigned int);
-        int (*readable_register)(unsigned int);
         hw_write_t hw_write;
         unsigned int (*hw_read)(struct snd_soc_codec *, unsigned int);
         void *reg_cache;
-        short reg_cache_size;
-        short reg_cache_step;
-
-        unsigned int idle_bias_off:1; /* Use BIAS_OFF instead of STANDBY */
-        unsigned int cache_only:1;  /* Suppress writes to hardware */
-        unsigned int cache_sync:1; /* Cache needs to be synced to hardware */
 
         /* dapm */
         u32 pop_time;
@@ -466,10 +458,6 @@ struct snd_soc_codec {
         enum snd_soc_bias_level suspend_bias_level;
         struct delayed_work delayed_work;
 
-        /* codec DAI's */
-        struct snd_soc_dai *dai;
-        unsigned int num_dai;
-
 #ifdef CONFIG_DEBUG_FS
         struct dentry *debugfs_codec_root;
         struct dentry *debugfs_reg;
@@ -478,23 +466,40 @@ struct snd_soc_codec {
 #endif
 };
 
-/* codec device */
-struct snd_soc_codec_device {
-        int (*probe)(struct platform_device *pdev);
-        int (*remove)(struct platform_device *pdev);
-        int (*suspend)(struct platform_device *pdev, pm_message_t state);
-        int (*resume)(struct platform_device *pdev);
+/* codec driver */
+struct snd_soc_codec_driver {
+
+        /* driver ops */
+        int (*probe)(struct snd_soc_codec *);
+        int (*remove)(struct snd_soc_codec *);
+        int (*suspend)(struct snd_soc_codec *,
+                        pm_message_t state);
+        int (*resume)(struct snd_soc_codec *);
+
+        /* codec IO */
+        unsigned int (*read)(struct snd_soc_codec *, unsigned int);
+        int (*write)(struct snd_soc_codec *, unsigned int, unsigned int);
+        int (*display_register)(struct snd_soc_codec *, char *,
+                                size_t, unsigned int);
+        int (*volatile_register)(unsigned int);
+        int (*readable_register)(unsigned int);
+        short reg_cache_size;
+        short reg_cache_step;
+        short reg_word_size;
+        const void *reg_cache_default;
+
+        /* codec bias level */
+        int (*set_bias_level)(struct snd_soc_codec *,
+                              enum snd_soc_bias_level level);
 };
 
 /* SoC platform interface */
-struct snd_soc_platform {
-        char *name;
-        struct list_head list;
+struct snd_soc_platform_driver {
 
-        int (*probe)(struct platform_device *pdev);
-        int (*remove)(struct platform_device *pdev);
-        int (*suspend)(struct snd_soc_dai_link *dai_link);
-        int (*resume)(struct snd_soc_dai_link *dai_link);
+        int (*probe)(struct snd_soc_platform *);
+        int (*remove)(struct snd_soc_platform *);
+        int (*suspend)(struct snd_soc_dai *dai);
+        int (*resume)(struct snd_soc_dai *dai);
 
         /* pcm creation and destruction */
         int (*pcm_new)(struct snd_card *, struct snd_soc_dai *,
@@ -509,23 +514,31 @@ struct snd_soc_platform {
                 struct snd_soc_dai *);
 
         /* platform stream ops */
-        struct snd_pcm_ops *pcm_ops;
+        struct snd_pcm_ops *ops;
 };
 
-/* SoC machine DAI configuration, glues a codec and cpu DAI together */
-struct snd_soc_dai_link  {
-        char *name;                     /* Codec name */
-        char *stream_name;              /* Stream name */
+struct snd_soc_platform {
+        const char *name;
+        int id;
+        struct device *dev;
+        struct snd_soc_platform_driver *driver;
 
-        /* DAI */
-        struct snd_soc_dai *codec_dai;
-        struct snd_soc_dai *cpu_dai;
+        unsigned int suspended:1; /* platform is suspended */
+        unsigned int probed:1;
 
-        /* machine stream operations */
-        struct snd_soc_ops *ops;
+        struct snd_soc_card *card;
+        struct list_head list;
+        struct list_head card_list;
+};
 
-        /* codec/machine specific init - e.g. add machine controls */
-        int (*init)(struct snd_soc_codec *codec);
+struct snd_soc_dai_link {
+        /* config - must be set by machine driver */
+        const char *name;                       /* Codec name */
+        const char *stream_name;                /* Stream name */
+        const char *codec_name;         /* for multi-codec */
+        const char *platform_name;      /* for multi-platform */
+        const char *cpu_dai_name;
+        const char *codec_dai_name;
 
         /* Keep DAI active over suspend */
         unsigned int ignore_suspend:1;
@@ -533,21 +546,24 @@ struct snd_soc_dai_link  {
         /* Symmetry requirements */
         unsigned int symmetric_rates:1;
 
-        /* Symmetry data - only valid if symmetry is being enforced */
-        unsigned int rate;
+        /* codec/machine specific init - e.g. add machine controls */
+        int (*init)(struct snd_soc_pcm_runtime *rtd);
 
-        /* DAI pcm */
-        struct snd_pcm *pcm;
+        /* machine stream operations */
+        struct snd_soc_ops *ops;
 };
 
 /* SoC card */
 struct snd_soc_card {
-        char *name;
+        const char *name;
         struct device *dev;
+        struct snd_card *snd_card;
+        struct module *owner;
 
         struct list_head list;
+        struct mutex mutex;
 
-        int instantiated;
+        bool instantiated;
 
         int (*probe)(struct platform_device *pdev);
         int (*remove)(struct platform_device *pdev);
@@ -568,28 +584,38 @@ struct snd_soc_card {
         /* CPU <--> Codec DAI links  */
         struct snd_soc_dai_link *dai_link;
         int num_links;
+        struct snd_soc_pcm_runtime *rtd;
+        int num_rtd;
 
-        struct snd_soc_device *socdev;
-
-        struct snd_soc_codec *codec;
-
-        struct snd_soc_platform *platform;
-        struct delayed_work delayed_work;
         struct work_struct deferred_resume_work;
+
+        /* lists of probed devices belonging to this card */
+        struct list_head codec_dev_list;
+        struct list_head platform_dev_list;
+        struct list_head dai_dev_list;
 };
 
-/* SoC Device - the audio subsystem */
-struct snd_soc_device {
-        struct device *dev;
+/* SoC machine DAI configuration, glues a codec and cpu DAI together */
+struct snd_soc_pcm_runtime  {
+        struct device dev;
         struct snd_soc_card *card;
-        struct snd_soc_codec_device *codec_dev;
-        void *codec_data;
-};
+        struct snd_soc_dai_link *dai_link;
+
+        unsigned int complete:1;
+        unsigned int dev_registered:1;
 
-/* runtime channel data */
-struct snd_soc_pcm_runtime {
-        struct snd_soc_dai_link *dai;
-        struct snd_soc_device *socdev;
+        /* Symmetry data - only valid if symmetry is being enforced */
+        unsigned int rate;
+        long pmdown_time;
+
+        /* runtime devices */
+        struct snd_pcm *pcm;
+        struct snd_soc_codec *codec;
+        struct snd_soc_platform *platform;
+        struct snd_soc_dai *codec_dai;
+        struct snd_soc_dai *cpu_dai;
+
+        struct delayed_work delayed_work;
 };
 
 /* mixer control */
@@ -615,24 +641,48 @@ struct soc_enum {
 static inline unsigned int snd_soc_read(struct snd_soc_codec *codec,
                                         unsigned int reg)
 {
-        return codec->read(codec, reg);
+        return codec->driver->read(codec, reg);
 }
 
 static inline unsigned int snd_soc_write(struct snd_soc_codec *codec,
                                          unsigned int reg, unsigned int val)
 {
-        return codec->write(codec, reg, val);
+        return codec->driver->write(codec, reg, val);
 }
 
+/* device driver data */
+
 static inline void snd_soc_codec_set_drvdata(struct snd_soc_codec *codec,
-                                             void *data)
+                void *data)
 {
-        codec->drvdata = data;
+        dev_set_drvdata(codec->dev, data);
 }
 
 static inline void *snd_soc_codec_get_drvdata(struct snd_soc_codec *codec)
 {
-        return codec->drvdata;
+        return dev_get_drvdata(codec->dev);
+}
+
+static inline void snd_soc_platform_set_drvdata(struct snd_soc_platform *platform,
+                void *data)
+{
+        dev_set_drvdata(platform->dev, data);
+}
+
+static inline void *snd_soc_platform_get_drvdata(struct snd_soc_platform *platform)
+{
+        return dev_get_drvdata(platform->dev);
+}
+
+static inline void snd_soc_pcm_set_drvdata(struct snd_soc_pcm_runtime *rtd,
+                void *data)
+{
+        dev_set_drvdata(&rtd->dev, data);
+}
+
+static inline void *snd_soc_pcm_get_drvdata(struct snd_soc_pcm_runtime *rtd)
+{
+        return dev_get_drvdata(&rtd->dev);
 }
 
 #include <sound/soc-dai.h>