Promotion of kernel.lnx.4.4-160814.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1052390   I51ac777abdf0d95c74535c20afbbd555c31c358a   ARM: dts: msm: add jdi 1080p video mode panel support fo
1043221   I16fb0bf884f0dbbce1cd9099ec5619d132379054   msm: mdss: fix race condition between iommu attach and s
1048135   I76357e44452a8c16fe96df47af06ddab021c8f3f   qcom-charger: smblib: update batt capacity status from b
1024495   Ib7f522d0143f5131880c8c1badf4e64461810e72   ice: added missing register dump in case of error for IC
1051878   I4692242f65bcf09baeab1a85681ec8c2f3b4cf61   ARM: dts: msm: Update USB bus voting to allow SVS on msm
1049921   I8112070f7dd1eb385996b4f228ad288b51771e25   qcom-charger: smblib: update ICL votings in parallel cha
1050659   I4037d7861657384eb5b4f67c52b2dbf4ad6e1c2c   iommu/arm-smmu: support static context banks
1045623   I3dc51f99018bb7a97fa01cd9aebe50d63671261e   msm: mdss: fix autorefresh configs for pp-split cases
1053076   I6bfe7aecd73a13401a218e89874f2225ac91d18f   ARM: dts: msm: Fix qsee_ipc_irq_bridge IRQ clear mask fo
1009284   If772bd86cc9b754fbc900eb47338429e9b841eef   msm: audio: soc: add null checks for hdmi ops
1009284   I54c1eee7a3e1d8f481a9bc629e28f13c5849a3db   ARM: dts: msm: add MSM External display node for msmcoba
963843   Ie2fb4b75b7f74013580bd3912372c64ddefc734e   ASoC: wcd: change classh settings as per impedance value
1052530   I7bf5cafd34bd9187a13043f0995a49d2f26b8b6b   qcom-charger: qpnp-fg-gen3: remove wakelock when reading
1031965   I6e983a1a1d843ddca46729c37a49cb85eda74cfe   msm: mdss: move sync_fence_install after release/retire
1050000   Ifcf05ffde0a054839e51d3f8173b8449fe177aa0   msm: kgsl: update GPU busy statistics
1043041   Ia6fc2dcfa7b5fd23eb2af5baf0acb9fd161fdd09   ARM: dts: msm: Modify csiphy timer clock rate on msmcoba
1024495   I737fad8f1cd89bad77836d4025c108f6c1918224   arm: dts: msm: Added missing features for HW Encryption
1009284   Ie8d1006d3f11091a861733485cb67939ad47fdfe   msm: mdss: add external display class helper
1052994   I845eb2014056203d203ee6be66de0cc161c2dedb   ARM: dts: msm: Remove clocks listed under the UFS GDSC n
1052390   I145da5e01bcdb3aa28804e851c97c00fa4d39114   ARM: dts: msm: add sharp 1080p cmd mode panel support fo
1021009   Ic01e031b70ac7d0c0705b486ad86a5cbca9fd923   msm: camera: Add VAF active and suspend handles to eepro
997556   I7a09aeb2a02c30fb851ef21dcaad194413f17955   ASoC: wcd9335: Update the Lineout path register configur
1053524   I424054dda82f954fdeef18d78cf90aaa33a97b18   ARM: dts: msm: update pinctrl for touch gpios in msmcoba
1041206   Idcffb2d897615dc2ba842b55086d5fd583cb19f6   ARM: dts: msm: Enable thermal mitigation for msmcobalt c
982110   I6643973a3b506d7f920e611ca51f06df94cc5a94   ASoC: wcd-mbhc: enable micbias for special headset
1053076   I22719898b86534f1821104a6a629e7fd37b0d823   soc: qcom: qsee_ipc_irq_bridge: Remove the redundant sub
1044164   Ib68da5c234ab270c401fa54adc99d4416a3cb987   ARM: dts: msm: Update the interrupt list for msmcobalt
1051682   Ic0c252450c4b6a4b98a032fb091e81d3100f7022   defconfig: msmcortex: Enable Seemp Log driver
1051284   I6d62d4f0d707e2e64c21d3b67763f9945adc6005   arm64: defconfig: msm: enable CPUSETS
1026677   I39bd10ccb7db3c4fe37ea609babdd6305fc19a7d   msm: mdss: fix dma fifo read watermark to 15/16 full

Change-Id: If3c0a404cc604ac853a1c479765c7593a2d8c60c
CRs-Fixed: 1044164, 1024495, 1043221, 1009284, 1043041, 1052390, 1041206, 1053524, 1051878, 963843, 1045623, 982110, 1026677, 1021009, 997556, 1052530, 1050659, 1053076, 1050000, 1031965, 1048135, 1051682, 1049921, 1052994, 1051284

3 files changed, 103 insertions, 5 deletions

diff --git a/include/linux/msm_ext_display.h b/include/linux/msm_ext_display.h
index c0a506fa66ec..81a95657a719 100644
--- a/include/linux/msm_ext_display.h
+++ b/include/linux/msm_ext_display.h
@@ -17,11 +17,15 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 
-/*
- * External display cable notify handler structure.
- * link A link for the linked list
- * status Current status of HDMI/DP cable connection
- * hpd_notify Callback function to provide cable status
+#define AUDIO_ACK_SET_ENABLE BIT(5)
+#define AUDIO_ACK_ENABLE BIT(4)
+#define AUDIO_ACK_CONNECT BIT(0)
+
+/**
+ * struct ext_disp_cable_notify - cable notify handler structure
+ * @link: a link for the linked list
+ * @status: current status of HDMI/DP cable connection
+ * @hpd_notify: callback function to provide cable status
  */
 struct ext_disp_cable_notify {
 	struct list_head link;
@@ -45,14 +49,96 @@ struct msm_ext_disp_audio_setup_params {
 	u32 sample_present;
 };
 
+/**
+ * External Display identifier for use to determine which interface
+ * the audio driver is interacting with.
+ */
+enum msm_ext_disp_type {
+	EXT_DISPLAY_TYPE_HDMI,
+	EXT_DISPLAY_TYPE_DP,
+	EXT_DISPLAY_TYPE_MAX
+};
+
+/**
+ * External Display cable state used by display interface to indicate
+ * connect/disconnect of interface.
+ */
+enum msm_ext_disp_cable_state {
+	EXT_DISPLAY_CABLE_DISCONNECT,
+	EXT_DISPLAY_CABLE_CONNECT,
+	EXT_DISPLAY_CABLE_STATE_MAX
+};
+
+/**
+ * External Display power state used by display interface to indicate
+ * power on/off of the interface.
+ */
+enum msm_ext_disp_power_state {
+	EXT_DISPLAY_POWER_OFF,
+	EXT_DISPLAY_POWER_ON,
+	EXT_DISPLAY_POWER_MAX
+};
+
+/**
+ * struct msm_ext_disp_intf_ops - operations exposed to display interface
+ * @hpd: updates external display interface state
+ * @notify: updates audio framework with interface state
+ */
+struct msm_ext_disp_intf_ops {
+	int (*hpd)(struct platform_device *pdev,
+			enum msm_ext_disp_type type,
+			enum msm_ext_disp_cable_state state);
+	int (*notify)(struct platform_device *pdev,
+			enum msm_ext_disp_cable_state state);
+	int (*ack)(struct platform_device *pdev,
+			u32 ack);
+};
+
+/**
+ * struct msm_ext_disp_audio_codec_ops - operations exposed to audio codec
+ * @audio_info_setup: configure audio on interface
+ * @get_audio_edid_blk: retrieve audio edid block
+ * @cable_status: cable connected/disconnected
+ * @get_intf_id: id of connected interface
+ */
 struct msm_ext_disp_audio_codec_ops {
 	int (*audio_info_setup)(struct platform_device *pdev,
 		struct msm_ext_disp_audio_setup_params *params);
 	int (*get_audio_edid_blk)(struct platform_device *pdev,
 		struct msm_ext_disp_audio_edid_blk *blk);
 	int (*cable_status)(struct platform_device *pdev, u32 vote);
+	int (*get_intf_id)(struct platform_device *pdev);
+};
+
+/*
+ * struct msm_ext_disp_init_data - data needed to register the display interface
+ * @disp: external display type
+ * @intf_ops: external display interface operations
+ * @codec_ops: audio codec operations
+ */
+struct msm_ext_disp_init_data {
+	enum msm_ext_disp_type type;
+	struct kobject *kobj;
+	struct msm_ext_disp_intf_ops intf_ops;
+	struct msm_ext_disp_audio_codec_ops codec_ops;
 };
 
+/*
+ * msm_ext_disp_register_audio_codec() - audio codec registration
+ * @pdev: platform device pointer
+ * @codec_ops: audio codec operations
+ */
+int msm_ext_disp_register_audio_codec(struct platform_device *pdev,
+		struct msm_ext_disp_audio_codec_ops *ops);
+
+/*
+ * msm_ext_disp_register_intf() - display interface registration
+ * @init_data: data needed to register the display interface
+ */
+int msm_ext_disp_register_intf(struct platform_device *pdev,
+		struct msm_ext_disp_init_data *init_data);
+
+/* TODO: remove all the display specific functions below */
 #ifdef CONFIG_FB_MSM_MDSS_DP_PANEL
 int msm_dp_register_audio_codec(struct platform_device *pdev,
 	struct msm_ext_disp_audio_codec_ops *ops);
diff --git a/include/uapi/linux/mfd/wcd9xxx/Kbuild b/include/uapi/linux/mfd/wcd9xxx/Kbuild
index da9fe03b0bed..8e55965bbe7e 100755
--- a/include/uapi/linux/mfd/wcd9xxx/Kbuild
+++ b/include/uapi/linux/mfd/wcd9xxx/Kbuild
@@ -1 +1,2 @@
+header-y += wcd9xxx_registers.h
 header-y += wcd9320_registers.h
diff --git a/include/linux/mfd/wcd9xxx/wcd9xxx_registers.h b/include/uapi/linux/mfd/wcd9xxx/wcd9xxx_registers.h
index 1dac14bd8427..a9fe10d8cd6e 100755..100644
--- a/include/linux/mfd/wcd9xxx/wcd9xxx_registers.h
+++ b/include/uapi/linux/mfd/wcd9xxx/wcd9xxx_registers.h
@@ -330,6 +330,8 @@
 #define WCD9XXX_A_ANA_HPH				(0x609)
 #define WCD9XXX_A_CDC_CLSH_CRC				(0xC01)
 #define WCD9XXX_FLYBACK_EN				(0x6A4)
+#define WCD9XXX_FLYBACK_VNEG_CTRL_1			(0x6A5)
+#define WCD9XXX_FLYBACK_VNEGDAC_CTRL_2			(0x6AF)
 #define WCD9XXX_RX_BIAS_FLYB_BUFF			(0x6C7)
 #define WCD9XXX_HPH_L_EN				(0x6D3)
 #define WCD9XXX_HPH_R_EN				(0x6D6)
@@ -341,4 +343,13 @@
 #define WCD9XXX_CDC_RX2_RX_PATH_CTL			(0xB69)
 #define WCD9XXX_CDC_CLK_RST_CTRL_MCLK_CONTROL		(0xD41)
 #define WCD9XXX_CLASSH_CTRL_CCL_1                       (0x69C)
+
+/* RX Gain control registers of codecs from and above WCD9335 */
+#define WCD9XXX_CDC_RX1_RX_VOL_CTL			(0xB59)
+#define WCD9XXX_CDC_RX1_RX_VOL_MIX_CTL			(0xB5C)
+#define WCD9XXX_CDC_RX1_RX_PATH_SEC1			(0xB5E)
+#define WCD9XXX_CDC_RX2_RX_VOL_CTL			(0xB6D)
+#define WCD9XXX_CDC_RX2_RX_VOL_MIX_CTL			(0xB70)
+#define WCD9XXX_CDC_RX2_RX_PATH_SEC1			(0xB72)
+
 #endif