Skip to content

Commit 872e637

Browse files
nathanchancenathanchance
committed
Merge tag 'LA.UM.6.6.r1-11200-89xx.0' into kernel.lnx.3.18.r33-rel
"LA.UM.6.6.r1-11200-89xx.0" * tag 'LA.UM.6.6.r1-11200-89xx.0': lsm: check payload size validity in lsm_event_detect_status_v3 ARM: dts: msm: Enabled IAM20680 for MDM9x50 variants driver: iio: imu: iam20680 sensor enablement for MDM9x07 defconfig: msm: IAM20680 sensor enablement usb: gadget: f_ipc: Use timeout when waiting for request completion drivers: iio: imu: add IAM20680 DT Bindings msm: vidc: Ensure validity of shared Q indices drivers: iio: imu: avoid writing sysfs while buffering drivers: iio: imu: Enabled batching support for iam20680 driver: iio: imu: fix temperature issue of iam20680 driver: iio: imu: IAM20680 early buff implemented diag: Validate command length against size of command structure msm: sps: Update debug message format specifier Fix up non-directory creation in SGID directories diag: dci: Validate dci response length before parsing msm: camera : Lock Implementation for avoid race condition msm: kgsl: Fix race condition while making page as dirty msm: ais : Lock Implementation for avoid race condition msm: ais: handle the error value returned during get clock usb: f_gsi: Initiate remote-wakeup if notification already queued usb: f_gsi: Simplify handling of remote_wakeup timer ASoC: wcd9335: update tasha register for 12.288Mhz clk msm: camera_v2: handle the error value returned during get clock dsp: q6core: validate payload size before memory copy msm: mdss: avoid kickoff wait during validation phase asoc : msm: Fix zero size pointer issue lsm: check payload size validity before using it as array index msm: qdsp6v2: Check size of payload before access diag: dci: Validate dci client entries prior read drivers: tz_log : Check object size before copying ASoC: msm: Modify buf size check to prevent OOB error dsp: q6usm: Release spinlock before return if invalid payload size soc: qcom: qmi_encdec: Restrict string length in decode dsp: afe: check for payload size before payload access dsp: q6voice: Check size of shared memory buffer before access qdsp6v2: q6usm: Check size of payload before access qdsp6v2: q6usm: Check size of payload before access mremap: properly flush TLB before releasing the page UPSTREAM: binder: fix race that allows malicious free of live buffer drivers: soc: qcom: Added check to avoid opening multiple instance msm: adm: validate ADSP payload size before access soc: qcom: ipc_router_mhi_xprt: Reduce latency by using async DMA dsp: asm: validate payload size before access diag: Increment data ready only if it is first update dsp: validate token before usage as array index msm: ipa: fix to validate the ioctl WAN_IOC_SEND_LAN_CLIENT_MSG params msm: vidc: fix KCFI errors mm: get rid of vmacache_flush_all() entirely drivers: iio: imu: Add mutex lock to ensure proper iio buffer access ASoC: apq8009: Add mixer control to set afe loopback channels net: can: k61: Add blocking call for frame filter ioctl ASoC: Update tristate of WCD mics using 8009 machine driver call ARM: dts: msm: Move wcd9xxx-mic-tristate flag under codec node msm: asm: validate ADSP data before access dsp: codecs: fix range check for audio buffer copying ASoC: msm: qdsp6v2: add range check for audio port index msm: kgsl: Limit log frequency in case of context count maxed out msm: kgsl: Correctly limit max number of contexts per process msm: kgsl: Limit the maximum number of contexts diag: Update msg mask's ranges properly msm: ice: check for crypto engine availability dsp: asm: Add check for num_channels before calling q6asm_map_channels asoc: update be_name and adm_programable_channel_mixer parameters qdsp6v2: apr: check for packet size to header size comparison ARM: dts: msm: Add hard reset property for MSM8953 msm: ipa: Fix to validate the buffer size ARM: dts: msm: Remove voltage-soc-timeout-ms for 8909 power: vm-bms: Remove voltage_soc_timeout_work from vm-bms arm64: Move BP hardening to check_and_switch_context iommu: iommu-debug: don't pass null character to copy_to_user msm: ais: Fix for OOB security CR diag: Add missing protection while accessing session's info MA Lite 8.1.5 MA Lite 8.1.4a Signed-off-by: Nathan Chancellor <[email protected]>
2 parents 26fff50 + af8307f commit 872e637

File tree

94 files changed

+9883
-482
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+9883
-482
lines changed

Diff for: ‎Documentation/devicetree/bindings/iio/imu/invn-iam20680.txt

+83
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
The IAM20680 sensor is 6-axis gyroscope+accelerometer combo
2+
device which is made by InvenSense Inc.
3+
4+
Required properties:
5+
6+
- compatible : Should be "invn,iam20680".
7+
- reg : the I2C address which depends on the AD0 pin.
8+
- gpios : INVENSENSE GPIO in the format described by ../gpio/gpio.txt
9+
10+
Optional properties:
11+
- inven,vdd_ana-supply :
12+
- inven,vcc_i2c-supply :
13+
- inven,gpio_int1 :
14+
- axis_map_x :
15+
- axis_map_y :
16+
- axis_map_z :
17+
- negate_x :
18+
- negate_y :
19+
- negate_z :
20+
- fs_range :
21+
- poll_interval :
22+
- min_interval :
23+
- inven,secondary_reg :
24+
- inven,secondary_type :
25+
- inven,secondary_name :
26+
- inven,secondary_axis_map_x :
27+
- inven,secondary_axis_map_y :
28+
- inven,secondary_axis_map_z :
29+
- inven,secondary_negate_x :
30+
- inven,secondary_negate_y :
31+
- inven,secondary_negate_z :
32+
- inven,aux_type :
33+
- inven,aux_name :
34+
- inven,aux_reg :
35+
- inven,read_only_slave_type :
36+
- inven,read_only_slave_name :
37+
- inven,read_only_slave_reg :
38+
39+
Example:
40+
iam20680@69 {
41+
compatible = "inven,iam20680";
42+
reg = <0x69>;
43+
pinctrl-names = "default";
44+
pinctrl-0 = <&int1_default>;
45+
interrupt-parent = <&tlmm_pinmux>;
46+
interrupts = <78 IRQ_TYPE_EDGE_RISING>;
47+
inven,vdd_ana-supply = <&pm8941_l17>;
48+
inven,vcc_i2c-supply = <&pm8941_lvs1>;
49+
inven,gpio_int1 = <&msmgpio 73 0x00>;
50+
axis_map_x = <1>;
51+
axis_map_y = <0>;
52+
axis_map_z = <2>;
53+
negate_x = <1>;
54+
negate_y = <0>;
55+
negate_z = <0>;
56+
fs_range = <0x00>;
57+
poll_interval = <200>;
58+
min_interval = <5>;
59+
inven,secondary_reg = <0x0c>;
60+
/* If no compass sensor,
61+
* replace "compass" with "none"
62+
*/
63+
inven,secondary_type = "compass";
64+
inven,secondary_name = "ak09911";
65+
inven,secondary_axis_map_x = <1>;
66+
inven,secondary_axis_map_y = <0>;
67+
inven,secondary_axis_map_z = <2>;
68+
inven,secondary_negate_x = <1>;
69+
inven,secondary_negate_y = <1>;
70+
inven,secondary_negate_z = <1>;
71+
/* If no pressure sensor,
72+
* replace "pressure" with "none"
73+
*/
74+
inven,aux_type = "pressure";
75+
inven,aux_name = "bmp280";
76+
inven,aux_reg = <0x76>;
77+
/* If no ALS sensor
78+
* replace "als" with "none"
79+
*/
80+
inven,read_only_slave_type = "als";
81+
inven,read_only_slave_name = "apds9930";
82+
inven,read_only_slave_reg = <0x39>;
83+
};

Diff for: ‎Documentation/devicetree/bindings/power/qpnp-vm-bms.txt

-4
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ Parent node required properties:
5757
- qcom,calculate-soc-ms : The time period between subsequent SoC
5858
recalculations when the current SoC is above or equal
5959
qcom,low-soc-calculate-soc-threshold.
60-
- qcom,volatge-soc-timeout-ms : The timeout period after which the module starts
61-
reporting volage based SOC and does not use the VMBMS
62-
algorithm for SOC calculation.
6360
- qcom,bms-vadc: Corresponding VADC device's phandle.
6461
- qcom,bms-adc_tm: Corresponding ADC_TM device's phandle to set recurring
6562
measurements and receive notifications for vbatt.
@@ -148,7 +145,6 @@ pm8916_bms: qcom,qpnp-vm-bms {
148145
qcom,low-soc-fifo-length = <2>;
149146
qcom,calculate-soc-ms = <20000>;
150147
qcom,s3-ocv-tolerence-uv = <1200>;
151-
qcom,volatge-soc-timeout-ms = <60000>;
152148
qcom,battery-data = <&mtp_batterydata>;
153149
qcom,bms-vadc = <&pm8916_vadc>;
154150
qcom,bms-adc_tm = <&pm8916_adc_tm>;

Diff for: ‎Documentation/devicetree/bindings/vendor-prefixes.txt

+1
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ xlnx Xilinx
201201
zyxel ZyXEL Communications Corp.
202202
zarlink Zarlink Semiconductor
203203
bosch-sensortec» Bosch Sensortec GmbH
204+
inven InvenSense, Inc.
204205
lontium Lontium Semiconductor
205206
himax Himax Technologies, Inc.
206207
hxcommon Himax Technologies, Inc.

Diff for: ‎arch/arm/boot/dts/qcom/apq8009-dragon.dtsi

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, The Linux Foundation. All rights reserved.
2+
* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
33
*
44
* This program is free software; you can redistribute it and/or modify
55
* it under the terms of the GNU General Public License version 2 and
@@ -25,6 +25,7 @@
2525
sound-9335 {
2626
qcom,model = "apq8009-tashalite-snd-card-tdm";
2727
qcom,tdm-i2s-switch-enable = <&msm_gpio 88 0>;
28+
qcom,wcd9xxx-mic-tristate;
2829
qcom,audio-routing =
2930
"AIF4 VI", "MCLK",
3031
"RX_BIAS", "MCLK",
@@ -45,7 +46,6 @@
4546

4647
i2c@78b8000 {
4748
wcd9xxx_codec@d {
48-
qcom,wcd9xxx-mic-tristate;
4949
qcom,cdc-reset-gpio = <&msm_gpio 23 0>;
5050

5151
cdc-vdd-buck-supply = <&wcd_vdd_buck_1p8>;

Diff for: ‎arch/arm/boot/dts/qcom/mdm9607-pinctrl.dtsi

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
2+
* Copyright (c) 2015-2017,2019, The Linux Foundation. All rights reserved.
33
*
44
* This program is free software; you can redistribute it and/or modify
55
* it under the terms of the GNU General Public License version 2 and
@@ -235,7 +235,7 @@
235235
};
236236
};
237237

238-
bmi160_int1_default: bmi160_int1_default {
238+
sensor_int1_default: sensor_int1_default {
239239
mux {
240240
pins = "gpio78";
241241
function = "gpio";
@@ -247,7 +247,7 @@
247247
};
248248
};
249249

250-
bmi160_int2_default: bmi160_int2_default {
250+
sensor_int2_default: sensor_int2_default {
251251
mux {
252252
pins = "gpio79";
253253
function = "gpio";

Diff for: ‎arch/arm/boot/dts/qcom/mdm9607.dtsi

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
2+
* Copyright (c) 2015-2017,2019, The Linux Foundation. All rights reserved.
33
*
44
* This program is free software; you can redistribute it and/or modify
55
* it under the terms of the GNU General Public License version 2 and
@@ -530,7 +530,7 @@
530530
compatible = "bosch-sensortec,bmi160";
531531
reg = <0x68>;
532532
pinctrl-names = "default";
533-
pinctrl-0 = <&bmi160_int1_default &bmi160_int2_default>;
533+
pinctrl-0 = <&sensor_int1_default &sensor_int2_default>;
534534
interrupt-parent = <&tlmm_pinmux>;
535535
interrupts = <78 0x2002>;
536536
bmi,init-interval = <200>;

Diff for: ‎arch/arm/boot/dts/qcom/mdm9650-ccard.dtsi

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
1+
/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
22
*
33
* This program is free software; you can redistribute it and/or modify
44
* it under the terms of the GNU General Public License version 2 and
@@ -453,7 +453,7 @@
453453
};
454454
};
455455

456-
bmi160_int1_default: bmi160_int1_default {
456+
sensor_int1_default: sensor_int1_default {
457457
mux {
458458
pins = "gpio81";
459459
function = "gpio";
@@ -465,7 +465,7 @@
465465
};
466466
};
467467

468-
bmi160_int2_default: bmi160_int2_default {
468+
sensor_int2_default: sensor_int2_default {
469469
mux {
470470
pins = "gpio94";
471471
function = "gpio";
@@ -595,7 +595,7 @@
595595
compatible = "bosch-sensortec,bmi160";
596596
reg = <0x68>;
597597
pinctrl-names = "default";
598-
pinctrl-0 = <&bmi160_int1_default &bmi160_int2_default>;
598+
pinctrl-0 = <&sensor_int1_default &sensor_int2_default>;
599599
interrupt-parent = <&tlmm_pinmux>;
600600
interrupts = <81 0x2002>;
601601
bmi,init-interval = <200>;

Diff for: ‎arch/arm/boot/dts/qcom/mdm9650-cv2x.dtsi

+23-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
1+
/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
22
*
33
* This program is free software; you can redistribute it and/or modify
44
* it under the terms of the GNU General Public License version 2 and
@@ -88,13 +88,32 @@
8888
compatible = "bosch-sensortec,bmi160";
8989
reg = <0x68>;
9090
pinctrl-names = "default";
91-
pinctrl-0 = <&bmi160_int1_default &bmi160_int2_default>;
91+
pinctrl-0 = <&sensor_int1_default &sensor_int2_default>;
9292
interrupt-parent = <&tlmm_pinmux>;
9393
interrupts = <81 0x2002>;
9494
bmi,init-interval = <200>;
9595
bmi,place = <1>;
9696
bmi,gpio_irq = <&tlmm_pinmux 81 0x2002>;
9797
};
98+
99+
iam20680@69{
100+
compatible = "inven,iam20680";
101+
reg = <0x69>;
102+
pinctrl-names = "default";
103+
pinctrl-0 = <&sensor_int1_default &sensor_int2_default>;
104+
interrupt-parent = <&tlmm_pinmux>;
105+
interrupts = <81 IRQ_TYPE_EDGE_RISING>;
106+
axis_map_x = <1>;
107+
axis_map_y = <0>;
108+
axis_map_z = <2>;
109+
negate_x = <1>;
110+
negate_y = <0>;
111+
negate_z = <0>;
112+
inven,secondary_type = "none";
113+
inven,aux_type = "none";
114+
inven,read_only_slave_type = "none";
115+
};
116+
98117
};
99118

100119
&spi_1 {
@@ -148,7 +167,7 @@
148167
};
149168

150169
/* pinctrl redefinitions */
151-
&bmi160_int1_default {
170+
&sensor_int1_default {
152171
mux {
153172
pins = "gpio81";
154173
};
@@ -157,7 +176,7 @@
157176
};
158177
};
159178

160-
&bmi160_int2_default {
179+
&sensor_int2_default {
161180
mux {
162181
pins = "gpio94";
163182
};

Diff for: ‎arch/arm/boot/dts/qcom/mdm9650-pcie-ep-ttp.dts

+19-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, The Linux Foundation. All rights reserved.
2+
* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
33
*
44
* This program is free software; you can redistribute it and/or modify
55
* it under the terms of the GNU General Public License version 2 and
@@ -32,13 +32,30 @@
3232
compatible = "bosch-sensortec,bmi160";
3333
reg = <0x68>;
3434
pinctrl-names = "default";
35-
pinctrl-0 = <&bmi160_int1_default &bmi160_int2_default>;
35+
pinctrl-0 = <&sensor_int1_default &sensor_int2_default>;
3636
interrupt-parent = <&tlmm_pinmux>;
3737
interrupts = <0x0 0x2002>;
3838
bmi,init-interval = <200>;
3939
bmi,place = <1>;
4040
bmi,gpio_irq = <&tlmm_pinmux 0x0 0x2002>;
4141
};
42+
iam20680@69{
43+
compatible = "inven,iam20680";
44+
reg = <0x69>;
45+
pinctrl-names = "default";
46+
pinctrl-0 = <&sensor_int1_default &sensor_int2_default>;
47+
interrupt-parent = <&tlmm_pinmux>;
48+
interrupts = <0 IRQ_TYPE_EDGE_RISING>;
49+
axis_map_x = <1>;
50+
axis_map_y = <0>;
51+
axis_map_z = <2>;
52+
negate_x = <1>;
53+
negate_y = <0>;
54+
negate_z = <0>;
55+
inven,secondary_type = "none";
56+
inven,aux_type = "none";
57+
inven,read_only_slave_type = "none";
58+
};
4259
};
4360

4461
&i2c_3 {

Diff for: ‎arch/arm/boot/dts/qcom/mdm9650-pinctrl.dtsi

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
1+
/* Copyright (c) 2015-2017,2019, The Linux Foundation. All rights reserved.
22
*
33
* This program is free software; you can redistribute it and/or modify
44
* it under the terms of the GNU General Public License version 2 and
@@ -192,7 +192,7 @@
192192
};
193193
};
194194
};
195-
bmi160_int1_default: bmi160_int1_default {
195+
sensor_int1_default: sensor_int1_default {
196196
mux {
197197
pins = "gpio0";
198198
function = "gpio";
@@ -203,7 +203,7 @@
203203
bias-pull-down;
204204
};
205205
};
206-
bmi160_int2_default: bmi160_int2_default {
206+
sensor_int2_default: sensor_int2_default {
207207
mux {
208208
pins = "gpio1";
209209
function = "gpio";

Diff for: ‎arch/arm/boot/dts/qcom/mdm9650-ttp.dts

+19-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
2+
* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
33
*
44
* This program is free software; you can redistribute it and/or modify
55
* it under the terms of the GNU General Public License version 2 and
@@ -30,13 +30,30 @@
3030
compatible = "bosch-sensortec,bmi160";
3131
reg = <0x68>;
3232
pinctrl-names = "default";
33-
pinctrl-0 = <&bmi160_int1_default &bmi160_int2_default>;
33+
pinctrl-0 = <&sensor_int1_default &sensor_int2_default>;
3434
interrupt-parent = <&tlmm_pinmux>;
3535
interrupts = <0x0 0x2002>;
3636
bmi,init-interval = <200>;
3737
bmi,place = <1>;
3838
bmi,gpio_irq = <&tlmm_pinmux 0x0 0x2002>;
3939
};
40+
iam20680@69{
41+
compatible = "inven,iam20680";
42+
reg = <0x69>;
43+
pinctrl-names = "default";
44+
pinctrl-0 = <&sensor_int1_default &sensor_int2_default>;
45+
interrupt-parent = <&tlmm_pinmux>;
46+
interrupts = <0 IRQ_TYPE_EDGE_RISING>;
47+
axis_map_x = <1>;
48+
axis_map_y = <0>;
49+
axis_map_z = <2>;
50+
negate_x = <1>;
51+
negate_y = <0>;
52+
negate_z = <0>;
53+
inven,secondary_type = "none";
54+
inven,aux_type = "none";
55+
inven,read_only_slave_type = "none";
56+
};
4057
};
4158

4259
&i2c_3 {

Diff for: ‎arch/arm/boot/dts/qcom/msm-pm8909.dtsi

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.
1+
/* Copyright (c) 2014-2016, 2019, The Linux Foundation. All rights reserved.
22
*
33
* This program is free software; you can redistribute it and/or modify
44
* it under the terms of the GNU General Public License version 2 and
@@ -281,7 +281,6 @@
281281
qcom,low-voltage-calculate-soc-ms = <1000>;
282282
qcom,low-soc-calculate-soc-ms = <5000>;
283283
qcom,calculate-soc-ms = <20000>;
284-
qcom,volatge-soc-timeout-ms = <60000>;
285284
qcom,low-voltage-threshold = <3450000>;
286285
qcom,s3-ocv-tolerence-uv = <1200>;
287286
qcom,s2-fifo-length = <5>;

Diff for: ‎arch/arm/boot/dts/qcom/msm-pm8953.dtsi

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
2+
* Copyright (c) 2015-2016, 2018, The Linux Foundation. All rights reserved.
33
*
44
* This program is free software; you can redistribute it and/or modify
55
* it under the terms of the GNU General Public License version 2 and
@@ -35,6 +35,7 @@
3535
"resin-bark", "kpdpwr-resin-bark";
3636
qcom,pon-dbc-delay = <15625>;
3737
qcom,system-reset;
38+
qcom,store-hard-reset-reason;
3839

3940
qcom,pon_1 {
4041
qcom,pon-type = <0>;

0 commit comments

Comments
 (0)