Merge changes...

* avtimer

Avtimer provides an interface for clients to enable avtimer block

on qdsp6. 64 bit AVtimer exposed by qdsp6 is used for audio and video

stream synchronization during capture and playback usecases.

Required properties:

- reg : physical address and length of avtimer register

- reg-names : AVtimer register name

  Required register resource entries are:

  "avtimer_lsb_addr" : AVtimer lsb physical address

  "avtimer_msb_addr" : AVtimer msb physical address

- compatible : Must be "qcom,avtimer"

Optional properties:

- clk-div : Divisor to divide the ticks value to get msec value.

 If the clock is at 27MHz, the ticks value read from AVTimer

 registers will have to be divided by 27, to achieve the msec value.

- clk-mult : Multiplier to multiply the ticks value in order to avoid

 a floating point operation if the clock is of decimal value.

 E.g. To get msec out of ticks from a 19.2MHz clock source, the ticks

 value will have to be divided by 19.2, which will then become a

 floating point operation. However, to avoid using a floating point

 operation, the msec can be calculated by multiplying ticks with 10

 and dividing the result by 192. i.e. msec = (ticks * 10) / 192;

Example:

	qcom,avtimer@90f7000 {

		compatible = "qcom,avtimer";

		reg = <0x90f700c 0x4>,

		      <0x90f7010 0x4>;

		reg-names = "avtimer_lsb_addr", "avtimer_msb_addr";

		qcom,clk-div = <27>;

		qcom,clk-mult = <10>;

	};

  EOF is reached and now DSP can start skipping padding delay. Also next write

  data would belong to next track

- set_next_track_param

This routine is called to send to DSP codec specific data of subsequent track

in gapless before first write.

Sequence flow for gapless would be:

- Open

- Get caps / codec caps

- Indicate next track data by sending set_next_track

- Set metadata of the next track

- then call partial_drain to flush most of buffer in DSP

- set codec specific data of subsequent track

- Fill data of the next track

- DSP switches to second track

	kernel_ulong_t driver_data;	/* Data private to the driver */

};

/* soundwire */

#define SOUNDWIRE_NAME_SIZE	32

#define SOUNDWIRE_MODULE_PREFIX "swr:"

struct swr_device_id {

	char name[SOUNDWIRE_NAME_SIZE];

	kernel_ulong_t driver_data;	/* Data private to the driver */

};

/* dmi */

enum dmi_field {

	DMI_NONE,

	bool metadata_set;

	bool next_track;

	void *private_data;

	struct snd_soc_pcm_runtime *be;

};

/**

 * @get_params: retrieve the codec parameters, mandatory

 * @set_metadata: Set the metadata values for a stream

 * @get_metadata: retrieves the requested metadata values from stream

 * @set_next_track_param: send codec specific data of subsequent track

 * in gapless

 * @trigger: Trigger operations like start, pause, resume, drain, stop.

 * This callback is mandatory

 * @pointer: Retrieve current h/w pointer information. Mandatory

			struct snd_compr_metadata *metadata);

	int (*get_metadata)(struct snd_compr_stream *stream,

			struct snd_compr_metadata *metadata);

	int (*set_next_track_param)(struct snd_compr_stream *stream,

			union snd_codec_options *codec_options);

	int (*trigger)(struct snd_compr_stream *stream, int cmd);

	int (*pointer)(struct snd_compr_stream *stream,

			struct snd_compr_tstamp *tstamp);

int snd_compress_deregister(struct snd_compr *device);

int snd_compress_new(struct snd_card *card, int device,

			int type, const char *id, struct snd_compr *compr);

void snd_compress_free(struct snd_card *card, struct snd_compr *compr);

/* dsp driver callback apis

 * For playback: driver should call snd_compress_fragment_elapsed() to let the

}

int snd_info_check_reserved_words(const char *str);

struct snd_info_entry *snd_info_create_subdir(struct module *mod,

					      const char *name,

					      struct snd_info_entry *parent);

#else

#define snd_seq_root NULL

					 void *private_data,

					 void (*read)(struct snd_info_entry *, struct snd_info_buffer *)) {}

static inline int snd_info_check_reserved_words(const char *str) { return 1; }

static inline struct snd_info_entry *snd_info_create_subdir(

				struct module *mod, const char *name,

				struct snd_info_entry *parent) { return NULL; }

#endif

/*