msm: 8064: change uart id for APQ8064 dma

MPQ8064 Hybrid is using GSBI5 with id 2 for uart and it
is conflicting with DMA which uses gsbi4 with same id.
So, changing id 1 for DMA board.

Change-Id: I5e7a5a424f0a5fef68764536a6526628ee00094b
Signed-off-by: Vikas Das <vdas@codeaurora.org>
Bluetooth: Update disconnect timer to 2 secs for incoming connection

This patch sets hci disconnect timer to 2 seconds even for incoming
connections during host initiated hci disconnect. Till now for
incoming connection, hci disconnect timer was set as 8 seconds, which
was adding unnecessary delay in disconnecting ACL even if DUT wanted
to explictly disconnect the link.

Change-Id: Ib0745daa1ccc43a16c4b386485015e81c25da697
CRs-Fixed: 515966
Signed-off-by: Hemant Gupta <hemantg@codeaurora.org>
msm: Fix reservation logic for ADSP heap

We define ADSP heap type as CMA. So, fix the boot time
reservation logic to not to include its size for any
reservation.

CRs-Fixed: 475240
Change-Id: I2ff92892858e83b772b3161d526c36ee9cf44c71
Signed-off-by: Chintan Pandya <cpandya@codeaurora.org>
msm_fb:hdmi:supporting odd channel numbers

This code change adds support in driver for sinks
with odd number of channels.

Change-Id: Ibd732f3004f8fedf81c9184b8babdd689ccb3af2
Signed-off-by: Sandeep Panda <spanda@codeaurora.org>
msm_fb:hdmi:increase the audio EDID buffer size.

Increase the audio EDID buffer size to maximum block
size to support multiple audio descriptor blocks.

Change-Id: I134172c13cd486032afebb2372423b5524959744
Signed-off-by: Sandeep Panda <spanda@codeaurora.org>
Merge "Bluetooth: Update disconnect timer to 2 secs for incoming connection"
Merge "msm: Fix reservation logic for ADSP heap"
ASOC: msm: Add support for odd channels on hdmi and use ca from k-control

- Add 3, 4, 5, and 7 channel render support on hdmi out

- Use channel allocation value set from userspace for
  hdmi audio info setup, presently this was configured
  based on channel count only and was hardcoded in kernel,
  but diffrent channel allocation  values are possible for
  same channel count where channel maps differ, audio loss
  was observed when channel allocation was not according to
  channel map and the same also caused hdmi compliance failure

CRs-Fixed: 515022
Change-Id: Ic6c2ba20a9e1edb86b027a46077e60e3d789f9c2
Signed-off-by: Dhananjay Kumar <dhakumar@codeaurora.org>
Merge "msm_fb:hdmi:supporting odd channel numbers"
Merge "ASOC: msm: Add support for odd channels on hdmi and use ca from k-control"
Merge "msm: 8064: change uart id for APQ8064 dma"
Merge "msm_fb:hdmi:increase the audio EDID buffer size."
Bluetooth : HID: Get the valid hci_conn while unlink

Since the context where unlink will be called is unaware of
validity of hci_conn pointer, fetch the valid hci_conn
before unlinking.

CRs-Fixed: 433361
Change-Id: Ief71997a3f007ea43431765c6cf543ab0d6416a8
Signed-off-by: Sumit Bajpai <sbajpai@codeaurora.org>
Bluetooth: hidp: Remove sysfs entry if hid connection is disconnected

This patch fixes the issue that sysfs entry for hid was not removed when
disconnection was initiated from remote end or if BT was reset. Sysfs
entry prevented reconnection from HID device.

CRs-Fixed: 468516, 473179
Change-Id: I40bcd27450cd8f87180d33b66969dde4f08a34f3
Signed-off-by: Hemant Gupta <hemantg@codeaurora.org>
ASOC: qdsp6: Add odd channel support for adm commands

- Use channel map obtained from userspace if the same is provided
  from there, this will support odd channels if userspace
  sets channel map for them appropriatly, If the channel map is not
  provided from userspcae default channel map  will be set based
  on channel count

CRs-Fixed: 514999
Change-Id: I8fb2878b57d0acf0d816c00623e521ada33f9591
Signed-off-by: Dhananjay Kumar <dhakumar@codeaurora.org>
Merge "ASOC: qdsp6: Add odd channel support for adm commands"
Merge "Bluetooth : HID: Get the valid hci_conn while unlink"
Merge "Bluetooth: hidp: Remove sysfs entry if hid connection is disconnected"