Merge "msm: ultrasound: reorganize kernel driver under misc drivers"

	select MEMORY_HOLE_CARVEOUT

	select MSM_RPM_STATS_LOG

	select QMI_ENCDEC

	select MSM_ULTRASOUND_B

	select MSM_ULTRASOUND

	select MSM_RPM_LOG

	select ARCH_WANT_KMAP_ATOMIC_FLUSH

	select KRAIT_REGULATOR

	select MSM_DEVFREQ_CPUBW

	select MSM_PIL

	select ENABLE_VMALLOC_SAVINGS

	select MSM_ULTRASOUND_B

	select MSM_ULTRASOUND

	select MAXIMUM_CURRENT_THROTTLING

	select MSM_IRQ

	select PINCTRL

	help

	  This enables GSBI9 configured into UART.

config MSM_ULTRASOUND_B

config MSM_ULTRASOUND

	bool "QDSP6V2 HW Ultrasound support"

	help

	  Enable HW Ultrasound support in QDSP6V2.

obj-$(CONFIG_MSM_XPU_ERR_FATAL) += scm-xpu.o

obj-$(CONFIG_MSM_TEST_QMI_CLIENT) += kernel_test_service_v01.o test_qmi_client.o

obj-y += qdsp6v2/

obj-$(CONFIG_MSM_PCIE) += pcie.o pcie_irq.o pcie_phy.o

/* Copyright (c) 2011-2013, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * 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.

 *

 */

#ifndef __APR_US_H__

#define __APR_US_H__

#include <linux/qdsp6v2/apr.h>

/* ======================================================================= */

/*  Session Level commands */

#define USM_SESSION_CMD_RUN				0x00012306

struct usm_stream_cmd_run {

	struct apr_hdr hdr;

	u32            flags;

	u32            msw_ts;

	u32            lsw_ts;

} __packed;

/* Stream level commands */

#define USM_STREAM_CMD_OPEN_READ			0x00012309

struct usm_stream_cmd_open_read {

	struct apr_hdr hdr;

	u32            uMode;

	u32            src_endpoint;

	u32            pre_proc_top;

	u32            format;

} __packed;

#define USM_STREAM_CMD_OPEN_WRITE			0x00011271

struct usm_stream_cmd_open_write {

	struct apr_hdr hdr;

	u32            format;

} __packed;

#define USM_STREAM_CMD_CLOSE				0x0001230A

/* Encoder configuration definitions */

#define USM_STREAM_CMD_SET_ENC_PARAM			0x0001230B

/* Decoder configuration definitions */

#define USM_DATA_CMD_MEDIA_FORMAT_UPDATE		0x00011272

/* Encoder/decoder configuration block */

#define USM_PARAM_ID_ENCDEC_ENC_CFG_BLK			0x0001230D

/* Max number of static located ports (bytes) */

#define USM_MAX_PORT_NUMBER 8

/* Max number of static located transparent data (bytes) */

#define USM_MAX_CFG_DATA_SIZE 100

/* Parameter structures used in  USM_STREAM_CMD_SET_ENCDEC_PARAM command */

/* common declarations */

struct usm_cfg_common {

	u16 ch_cfg;

	u16 bits_per_sample;

	u32 sample_rate;

	u32 dev_id;

	u8 data_map[USM_MAX_PORT_NUMBER];

} __packed;

struct us_encdec_cfg {

	u32 format_id;

	struct usm_cfg_common cfg_common;

	u16 params_size;

	u8 *params;

} __packed;

/* Start/stop US signal detection */

#define USM_SESSION_CMD_SIGNAL_DETECT_MODE		0x00012719

struct usm_session_cmd_detect_info {

	struct apr_hdr hdr;

	u32 detect_mode;

	u32 skip_interval;

	u32 algorithm_cfg_size;

} __packed;

/* US signal detection result */

#define USM_SESSION_EVENT_SIGNAL_DETECT_RESULT		0x00012720

#endif /* __APR_US_H__ */

obj-$(CONFIG_MSM_ULTRASOUND_B) += ultrasound/

ccflags-y := -I$(src)/..

obj-$(CONFIG_MSM_ULTRASOUND_B) += usf.o usfcdev.o q6usm_b.o