Merge branch 'android-msm-bonito-4.9-pi-dr2-security-next' into android-msm-bonito-4.9-pi-dr2
APR 2019.1
Bug: 123656629
Change-Id: Ie1096c32692249813429093f7fe5b46ae43f734c
Signed-off-by: Maggie White <maggiewhite@google.com>
diff --git a/arch/arm64/boot/dts/google/sdm670-b4s4-audio.dtsi b/arch/arm64/boot/dts/google/sdm670-b4s4-audio.dtsi
index a8aa589..f9c8e3e 100644
--- a/arch/arm64/boot/dts/google/sdm670-b4s4-audio.dtsi
+++ b/arch/arm64/boot/dts/google/sdm670-b4s4-audio.dtsi
@@ -311,7 +311,7 @@
cirrus,boost-ind-nanohenry = <1000>;
cirrus,boost-ctl-select = <0x01>;
cirrus,boost-ctl-millivolt = <10000>;
- cirrus,boost-peak-milliamp = <4500>;
+ cirrus,boost-peak-milliamp = <1800>;
cirrus,amp-gain-zc;
cirrus,ldm-mode-select = <0x01>;
cirrus,pdm-ldm-exit;
@@ -343,7 +343,7 @@
cirrus,boost-ind-nanohenry = <1000>;
cirrus,boost-ctl-select = <0x01>;
cirrus,boost-ctl-millivolt = <10000>;
- cirrus,boost-peak-milliamp = <4500>;
+ cirrus,boost-peak-milliamp = <1800>;
cirrus,amp-gain-zc;
cirrus,ldm-mode-select = <0x01>;
cirrus,pdm-ldm-exit;
diff --git a/arch/arm64/boot/dts/google/sdm670-camera-sensor-v2.dtsi b/arch/arm64/boot/dts/google/sdm670-camera-sensor-v2.dtsi
index cfe822f..5039cd5 100644
--- a/arch/arm64/boot/dts/google/sdm670-camera-sensor-v2.dtsi
+++ b/arch/arm64/boot/dts/google/sdm670-camera-sensor-v2.dtsi
@@ -159,6 +159,7 @@
actuator_rear: qcom,actuator@0 {
cell-index = <0>;
+ param-index = <5>;
reg = <0x0>;
compatible = "qcom,actuator";
cci-master = <0>;
diff --git a/drivers/input/touchscreen/synaptics_dsx_v27/synaptics_dsx_core.c b/drivers/input/touchscreen/synaptics_dsx_v27/synaptics_dsx_core.c
index 603635a..41bb6ac 100644
--- a/drivers/input/touchscreen/synaptics_dsx_v27/synaptics_dsx_core.c
+++ b/drivers/input/touchscreen/synaptics_dsx_v27/synaptics_dsx_core.c
@@ -1214,6 +1214,12 @@
break;
}
+ if (!fhandler->extra) {
+ pr_err("%s: fhandler->extra=NULL, fn_number=%hhu", __func__,
+ fhandler->fn_number);
+ return;
+ }
+
extra_data = (struct synaptics_rmi4_f12_extra_data *)fhandler->extra;
offset = extra_data->ctrl20_offset;
@@ -3435,6 +3441,9 @@
}
INIT_LIST_HEAD(&rmi->support_fn_list);
+ rmi4_data->f11_wakeup_gesture = false;
+ rmi4_data->f12_wakeup_gesture = false;
+
return;
}
@@ -4525,6 +4534,9 @@
int retval;
struct synaptics_rmi4_exp_fhandler *exp_fhandler;
+ pr_info("%s from %pS, rebuild = %d\n", __func__,
+ __builtin_return_address(0), rebuild);
+
mutex_lock(&(rmi4_data->rmi4_reset_mutex));
synaptics_rmi4_irq_enable(rmi4_data, false, false);
diff --git a/drivers/media/platform/msm/camera/cam_sensor_module/cam_fw_update/VCM_firmware.h b/drivers/media/platform/msm/camera/cam_sensor_module/cam_fw_update/VCM_firmware.h
index 679b9de..88fe803 100644
--- a/drivers/media/platform/msm/camera/cam_sensor_module/cam_fw_update/VCM_firmware.h
+++ b/drivers/media/platform/msm/camera/cam_sensor_module/cam_fw_update/VCM_firmware.h
@@ -72,18 +72,18 @@
{0x6A, 0x5F, 0, 0}
};
-/* Temperature parameters version E */
+/* Temperature parameters version E for B4S4 LTCFW*/
struct cam_sensor_i2c_reg_array VCM_LC898219_Temp_Params_verE[] = {
{0x14, 0x69, 0, 0},
{0x3F, 0x09, 0, 0},
{0x70, 0x00, 0, 0},
- {0x71, 0x70, 0, 0},
- {0x72, 0x0A, 0, 0},
+ {0x71, 0x50, 0, 0},
+ {0x72, 0x06, 0, 0},
{0x73, 0x00, 0, 0},
{0x74, 0x07, 0, 0},
{0x75, 0xFF, 0, 0},
- {0x76, 0x9D, 0, 0},
- {0x77, 0x4D, 0, 0},
+ {0x76, 0xA8, 0, 0},
+ {0x77, 0x4A, 0, 0},
};
/* Temperature parameters version H */
@@ -91,13 +91,13 @@
{0x14, 0x69, 0, 0},
{0x3F, 0x09, 0, 0},
{0x70, 0x00, 0, 0},
- {0x71, 0x70, 0, 0},
- {0x72, 0x09, 0, 0},
+ {0x71, 0x50, 0, 0},
+ {0x72, 0x06, 0, 0},
{0x73, 0x00, 0, 0},
{0x74, 0x07, 0, 0},
{0x75, 0xFF, 0, 0},
- {0x76, 0xA9, 0, 0},
- {0x77, 0x48, 0, 0},
+ {0x76, 0xA8, 0, 0},
+ {0x77, 0x4A, 0, 0},
};
struct cam_sensor_i2c_reg_array VCM_AK7375_DVT_R16[] = {
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 2cf2d5f..4a917c9 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -3746,6 +3746,8 @@
u32 reg;
evt = dwc->ev_buf;
+ if (!evt)
+ return IRQ_NONE;
/*
* With PCIe legacy interrupt, test shows that top-half irq handler can
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index a8a32f4..5109c7b 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -1269,16 +1269,6 @@
stream ? "capture" : "playback", fe->dai_link->name,
stream ? "<-" : "->", be->dai_link->name);
-#ifdef CONFIG_DEBUG_FS
- if (fe->debugfs_dpcm_root) {
- pr_debug("%s: debugfs create on '%s'\n",
- __func__, be->dai_link->name);
- dpcm->debugfs_state = debugfs_create_u32(be->dai_link->name, 0644,
- fe->debugfs_dpcm_root, &dpcm->state);
- } else {
- pr_debug("%s: debugfs nop\n", __func__);
- }
-#endif
return 1;
}
@@ -1330,10 +1320,6 @@
/* BEs still alive need new FE */
dpcm_be_reparent(fe, dpcm->be, stream);
-#ifdef CONFIG_DEBUG_FS
- if (fe->debugfs_dpcm_root)
- debugfs_remove(dpcm->debugfs_state);
-#endif
list_del(&dpcm->list_be);
list_del(&dpcm->list_fe);
kfree(dpcm);
