From 83728d257501fd95ff3ffcbff1e4c976f48b36e6 Mon Sep 17 00:00:00 2001 From: Preetam Singh Ranawat Date: Thu, 18 Aug 2016 11:44:23 +0530 Subject: ALSA: compress: Add DSD format support for ALSA WCD934X audio codec supports playback of DSD (Direct Stream Digital) format. Extend ALSA (Advanced Linux Sound Architecture) compress to support DSD format. CRs-Fixed: 1056422 Change-Id: Ifb06674c251335a1d8cec71931355dca4c0e012d Signed-off-by: Preetam Singh Ranawat --- include/uapi/sound/compress_params.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include/uapi') diff --git a/include/uapi/sound/compress_params.h b/include/uapi/sound/compress_params.h index 4d9c4b5c29f3..47367c663011 100644 --- a/include/uapi/sound/compress_params.h +++ b/include/uapi/sound/compress_params.h @@ -97,7 +97,8 @@ #define SND_AUDIOCODEC_EAC3 ((__u32) 0x00000018) #define SND_AUDIOCODEC_ALAC ((__u32) 0x00000019) #define SND_AUDIOCODEC_APE ((__u32) 0x00000020) -#define SND_AUDIOCODEC_MAX SND_AUDIOCODEC_APE +#define SND_AUDIOCODEC_DSD ((__u32) 0x00000021) +#define SND_AUDIOCODEC_MAX SND_AUDIOCODEC_DSD /* * Profile and modes are listed with bit masks. This allows for a * more compact representation of fields that will not evolve -- cgit v1.2.3 From 879d57ac667a629b2b0e4790a87f99b0b0fb2644 Mon Sep 17 00:00:00 2001 From: Dinesh K Garg Date: Wed, 22 Jun 2016 11:13:53 -0700 Subject: msm: mink: Adding SMCInvoke Driver SMCInvoke driver is a misc driver to support communication between secure and non-secure world, based on new capability based model. Earlier, QSEECom driver had several problems such as exposing many interfaces to accomplish various tasks on secure world side. Ideally, driver should work as transparent as possible and provide just tunnel to communicate between secure and non secure world. SMCInvoke driver aims to achieve that. Change-Id: I439f8ad817ba66210c934115979c276577194c11 Signed-off-by: Dinesh K Garg --- include/uapi/linux/Kbuild | 1 + include/uapi/linux/smcinvoke.h | 45 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 include/uapi/linux/smcinvoke.h (limited to 'include/uapi') diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index 32172c8f7d37..0bac6947a1cb 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild @@ -520,3 +520,4 @@ header-y += android_pmem.h header-y += ipa_qmi_service_v01.h header-y += rmnet_ipa_fd_ioctl.h header-y += msm_ipa.h +header-y += smcinvoke.h diff --git a/include/uapi/linux/smcinvoke.h b/include/uapi/linux/smcinvoke.h new file mode 100644 index 000000000000..1dc9a63c15e5 --- /dev/null +++ b/include/uapi/linux/smcinvoke.h @@ -0,0 +1,45 @@ +#ifndef _UAPI_SMCINVOKE_H_ +#define _UAPI_SMCINVOKE_H_ + +#include +#include + +#define SMCINVOKE_USERSPACE_OBJ_NULL -1 + +struct smcinvoke_buf { + uint64_t addr; + uint64_t size; +}; + +struct smcinvoke_obj { + int64_t fd; + int64_t reserved; +}; + +union smcinvoke_arg { + struct smcinvoke_buf b; + struct smcinvoke_obj o; +}; + +/* + * struct smcinvoke_cmd_req: This structure is transparently sent to TEE + * @op - Operation to be performed + * @counts - number of aruments passed + * @result - result of invoke operation + * @argsize - size of each of arguments + * @args - args is pointer to buffer having all arguments + */ +struct smcinvoke_cmd_req { + uint32_t op; + uint32_t counts; + int32_t result; + uint32_t argsize; + uint64_t __user args; +}; + +#define SMCINVOKE_IOC_MAGIC 0x98 + +#define SMCINVOKE_IOCTL_INVOKE_REQ \ + _IOWR(SMCINVOKE_IOC_MAGIC, 1, struct smcinvoke_cmd_req) + +#endif /* _UAPI_SMCINVOKE_H_ */ -- cgit v1.2.3 From 759bf369a506ac862fffc50d1f301bf6329a4e55 Mon Sep 17 00:00:00 2001 From: Skylar Chang Date: Thu, 4 Aug 2016 13:46:03 -0700 Subject: msm: ipa3: add gateway info on wan_msg header change for CNE to pass gateway info to IPA Change-Id: I0f0a84a12c3ba514f7309b16c73f5b8ed631626d Signed-off-by: Skylar Chang --- include/uapi/linux/msm_ipa.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'include/uapi') diff --git a/include/uapi/linux/msm_ipa.h b/include/uapi/linux/msm_ipa.h index 60ebda8be9cb..6aa021e12930 100644 --- a/include/uapi/linux/msm_ipa.h +++ b/include/uapi/linux/msm_ipa.h @@ -95,6 +95,11 @@ */ #define IPA_MBIM_MAX_STREAM_NUM 8 +/** + * size of the ipv6 address + */ +#define IPA_WAN_MSG_IPv6_ADDR_GW_LEN 4 + /** * the attributes of the rule (routing or filtering) */ @@ -1435,12 +1440,15 @@ struct ipa_ecm_msg { * @name: name of the wan interface * * CnE need to pass the name of default wan iface when connected/disconnected. + * CNE need to pass the gw info in wlan AP+STA mode. * netmgr need to pass the name of wan eMBMS iface when connected. */ struct ipa_wan_msg { char upstream_ifname[IPA_RESOURCE_NAME_MAX]; char tethered_ifname[IPA_RESOURCE_NAME_MAX]; enum ipa_ip_type ip; + uint32_t ipv4_addr_gw; + uint32_t ipv6_addr_gw[IPA_WAN_MSG_IPv6_ADDR_GW_LEN]; }; /** -- cgit v1.2.3