msm: vidc: Add extra data bit masks for MPEG-2

Add extra data bit masks for MPEG-2.

Change-Id: I7fd5ac232ea91b5ecb3c5795890e4c34f429c233
Signed-off-by: Rajeshwar Kurapaty <rkurapat@codeaurora.org>
wcnss: Add interface to Reset wcnss

Add wcnss reset interface, this interface generates an FIQ to Riva.
Upon receiving this interrupt, Riva will execute the ERR_FATAL
routine and invoke SSR.

CRs-fixed: 411579
Signed-off-by: Sameer Thalappil <sameert@codeaurora.org>

Conflicts:

	drivers/net/wireless/wcnss/wcnss_wlan.c

Signed-off-by: Sameer Thalappil <sameert@codeaurora.org>
(cherry picked from commit 098dfa7fea4431b6f93eda4badee7bc0649fe2df)

Conflicts:

	drivers/net/wireless/wcnss/wcnss_wlan.c
	include/linux/wcnss_wlan.h

Change-Id: I034bc2a2817e25c0d9ce663db84652122e8f0ef2
Signed-off-by: Ramakrishna Prasad N <crpn@codeaurora.org>

Conflicts:

	drivers/net/wireless/wcnss/wcnss_wlan.c
	include/linux/wcnss_wlan.h

Signed-off-by: Shruthi Krishna <skrish@codeaurora.org>
Merge "wcnss: Add interface to Reset wcnss"
video: msm: Unlock mutex before update notify

When update notify functions holds the entry_mutex, it blocks other MDP
ioctls from progressing causing a system freeze. Unlock the lock before
calling to prevent this.

Change-Id: I146b0a92ec844d90f4a8688bd77a38e298c2b9c0
Signed-off-by: Carl Vanderlip <carlv@codeaurora.org>
Merge "msm: vidc: Add extra data bit masks for MPEG-2"
Merge "video: msm: Unlock mutex before update notify"
msm_fb: display: turn vsync irq off at suspend

Turn off vsycn irq at suspend to prevent vsync irq firing
before vsycn enabled ioctl called at resume.

Change-Id: I2428cdeb5cf7008e50f6d8dabfad52416db2fff7
Signed-off-by: Kuogee Hsieh <khsieh@codeaurora.org>
(cherry picked from commit b05e8b1ec779ab5cc94f0847a99baa4d97eb4e10)

Conflicts:

	drivers/video/msm/mdp4_overlay_dsi_video.c
	drivers/video/msm/mdp4_overlay_dtv.c
	drivers/video/msm/mdp4_overlay_lcdc.c

Signed-off-by: Shruthi Krishna <skrish@codeaurora.org>
msm: Enable raw tables in iptable.

Enable ip tables raw table for v4,v6.
This is used by BandwidthController in netd to collect
active network statistics.

CRs-Fixed: 426698
Change-Id: I9138771b6898a90bb8b069bf186cc036b24f4e70
Signed-off-by: Alex Yakavenka <ayakav@codeaurora.org>
USB: gadget: Kconfig: Change Max VBUS power usage default value

Currently the VBUS Max power usage is set to default value of 2.
Change this value to default of 500 to honour the code that uses
CONFIG_USB_GADGET_VBUS_DRAW to set the bMaxPower.

Change-Id: If27b422c23ad2a010744f9660cc0b376d02649df
Signed-off-by: Chiranjeevi Velempati <cvelempa@codeaurora.org>
Merge "USB: gadget: Kconfig: Change Max VBUS power usage default value"
msm: socinfo: Add support for detecting Krait and Krait Pass 2

Add APIs for checking whether the current CPU is Krait and
Krait Pass 2

Change-Id: I5b28e8ae76b2df64675a6808092d792833931544
Signed-off-by: Jin Hong <jinh@codeaurora.org>
Signed-off-by: Shruthi Krishna <skrish@codeaurora.org>
msm: cache_erp: Handle recoverable L1 errors

Some CPU designs may be able to recover from certain types
of L1 instruction cache errors. Rather than panicing
whenever any kind of L1 error is encountered, add an option
to selectively panic on recoverable L1 errors

Change-Id: Id8beb0e58d41fa5319f4ca76c5f35e2162f8b704
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
(cherry picked from commit e1aba3d9b510d34e8309669d811a6f01568858dc)

Conflicts:

	arch/arm/mach-msm/Kconfig

Signed-off-by: Sudhir Sharma <sudsha@codeaurora.org>
Signed-off-by: Shruthi Krishna <skrish@codeaurora.org>
Merge "msm_fb: display: turn vsync irq off at suspend"
Merge "msm: Enable raw tables in iptable."
Merge "msm: socinfo: Add support for detecting Krait and Krait Pass 2"
Merge "msm: cache_erp: Handle recoverable L1 errors"
acpuclock-7201: add 800MHz for 7627aa
Merge remote branch 'caf/jb_mr1_chocolate' into jb_mr1_chocolate