Skip to content

Commit 3db1a3f

Browse files
torvaldstorvalds
committed
Merge tag 'staging-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging / IIO driver updates from Greg KH: "Here is the big staging and IIO driver pull request for 5.11-rc1 Lots of different things in here: - loads of driver updates - so many coding style cleanups - new IIO drivers - Android ION code is finally removed from the tree - wimax drivers are moved to staging on their way out of the kernel Nothing really exciting, just the constant grind of kernel development :) All have been in linux-next for a while with no reported issues" * tag 'staging-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (341 commits) staging: olpc_dcon: Do not call platform_device_unregister() in dcon_probe() staging: most: Fix spelling mistake "tranceiver" -> "transceiver" staging: qlge: remove duplicate word in comment staging: comedi: mf6x4: Fix AI end-of-conversion detection staging: greybus: Add TODO item about modernizing the pwm code pinctrl: ralink: add a pinctrl driver for the rt2880 family dt-bindings: pinctrl: rt2880: add binding document staging: rtl8723bs: remove ELEMENT_ID enum staging: rtl8723bs: remove unused macros staging: rtl8723bs: replace EID_EXTCapability staging: rtl8723bs: replace EID_BSSIntolerantChlReport staging: rtl8723bs: replace EID_BSSCoexistence staging: rtl8723bs: replace _MME_IE_ staging: rtl8723bs: replace _WAPI_IE_ staging: rtl8723bs: replace _EXT_SUPPORTEDRATES_IE_ staging: rtl8723bs: replace _ERPINFO_IE_ staging: rtl8723bs: replace _CHLGETXT_IE_ staging: rtl8723bs: replace _COUNTRY_IE_ staging: rtl8723bs: replace _IBSS_PARA_IE_ staging: rtl8723bs: replace _TIM_IE_ ...
2 parents 2911ed9 + 4996b46 commit 3db1a3f

File tree

434 files changed

+10177
-10875
lines changed

Some content is hidden

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

434 files changed

+10177
-10875
lines changed

‎Documentation/ABI/testing/sysfs-bus-iio

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1743,6 +1743,16 @@ Description:
17431743

17441744
Raw counter device counters direction for channel Y.
17451745

1746+
What: /sys/bus/iio/devices/iio:deviceX/in_voltageY_label
1747+
What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_label
1748+
KernelVersion: 5.8
1749+
Contact: [email protected]
1750+
Description:
1751+
Optional symbolic label to a device channel.
1752+
If a label is defined for this channel add that to the channel
1753+
specific attributes. This is useful for userspace to be able to
1754+
better identify an individual channel.
1755+
17461756
What: /sys/bus/iio/devices/iio:deviceX/in_phaseY_raw
17471757
KernelVersion: 4.18
17481758
Contact: [email protected]

‎Documentation/ABI/testing/sysfs-bus-iio-adc-mt6360

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
What: /sys/bus/iio/devices/iio:deviceX/in_voltage0_raw
2+
KernelVersion: 5.8.0
3+
Contact: [email protected]
4+
Description:
5+
Indicated MT6360 USBID ADC which connected to connector ID pin.
6+
Calculating with scale and offset returns voltage in uV
7+
8+
What: /sys/bus/iio/devices/iio:deviceX/in_voltage1_raw
9+
KernelVersion: 5.8.0
10+
Contact: [email protected]
11+
Description:
12+
Indicated MT6360 VBUS ADC with lower accuracy(+-75mA)
13+
higher measure range(1~22mV)
14+
Calculating with scale and offset returns voltage in uV
15+
16+
What: /sys/bus/iio/devices/iio:deviceX/in_voltage2_raw
17+
KernelVersion: 5.8.0
18+
Contact: [email protected]
19+
Description:
20+
Indicated MT6360 VBUS ADC with higher accuracy(+-30mA)
21+
lower measure range(1~9.76V)
22+
Calculating with scale and offset returns voltage in uV
23+
24+
What: /sys/bus/iio/devices/iio:deviceX/in_voltage3_raw
25+
KernelVersion: 5.8.0
26+
Contact: [email protected]
27+
Description:
28+
Indicated MT6360 VSYS ADC
29+
Calculating with scale and offset returns voltage in uV
30+
31+
What: /sys/bus/iio/devices/iio:deviceX/in_voltage4_raw
32+
KernelVersion: 5.8.0
33+
Contact: [email protected]
34+
Description:
35+
Indicated MT6360 VBAT ADC
36+
Calculating with scale and offset returns voltage in uV
37+
38+
What: /sys/bus/iio/devices/iio:deviceX/in_current5_raw
39+
KernelVersion: 5.8.0
40+
Contact: [email protected]
41+
Description:
42+
Indicated MT6360 IBUS ADC
43+
Calculating with scale and offset returns voltage in uA
44+
45+
What: /sys/bus/iio/devices/iio:deviceX/in_current6_raw
46+
KernelVersion: 5.8.0
47+
Contact: [email protected]
48+
Description:
49+
Indicated MT6360 IBAT ADC
50+
Calculating with scale and offset returns voltage in uA
51+
52+
What: /sys/bus/iio/devices/iio:deviceX/in_current7_raw
53+
KernelVersion: 5.8.0
54+
Contact: [email protected]
55+
Description:
56+
Indicated MT6360 CHG_VDDP ADC
57+
Calculating with scale and offset returns voltage in uV
58+
59+
What: /sys/bus/iio/devices/iio:deviceX/in_temp8_raw
60+
KernelVersion: 5.8.0
61+
Contact: [email protected]
62+
Description:
63+
Indicated MT6360 IC junction temperature
64+
Calculating with scale and offset returns temperature in degree
65+
66+
What: /sys/bus/iio/devices/iio:deviceX/in_voltage9_raw
67+
KernelVersion: 5.8.0
68+
Contact: [email protected]
69+
Description:
70+
Indicated MT6360 VREF_TS ADC
71+
Calculating with scale and offset returns voltage in uV
72+
73+
What: /sys/bus/iio/devices/iio:deviceX/in_voltage10_raw
74+
KernelVersion: 5.8.0
75+
Contact: [email protected]
76+
Description:
77+
Indicated MT6360 TS ADC
78+
Calculating with scale and offset returns voltage in uV

‎Documentation/devicetree/bindings/iio/accel/bma180.txt

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎Documentation/devicetree/bindings/iio/accel/bosch,bma180.yaml

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/iio/accel/bosch,bma180.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Bosch BMA023 / BMA150/ BMA180 / BMA25x / SMB380 triaxial accelerometers
8+
9+
maintainers:
10+
- Jonathan Cameron <[email protected]>
11+
12+
description: |
13+
https://media.digikey.com/pdf/Data%20Sheets/Bosch/BMA150.pdf
14+
http://omapworld.com/BMA180_111_1002839.pdf
15+
http://ae-bst.resource.bosch.com/media/products/dokumente/bma250/bst-bma250-ds002-05.pdf
16+
17+
properties:
18+
compatible:
19+
enum:
20+
- bosch,bma023
21+
- bosch,bma150
22+
- bosch,bma180
23+
- bosch,bma250
24+
- bosch,bma254
25+
- bosch,smb380
26+
27+
reg:
28+
maxItems: 1
29+
30+
vdd-supply: true
31+
32+
vddio-supply: true
33+
34+
interrupts:
35+
minItems: 1
36+
maxItems: 2
37+
description: |
38+
Type should be either IRQ_TYPE_LEVEL_HIGH or IRQ_TYPE_EDGE_RISING.
39+
For the bma250 the first interrupt listed must be the one
40+
connected to the INT1 pin, the second (optional) interrupt
41+
listed must be the one connected to the INT2 pin.
42+
43+
required:
44+
- compatible
45+
- reg
46+
47+
additionalProperties: false
48+
49+
examples:
50+
- |
51+
#include <dt-bindings/interrupt-controller/irq.h>
52+
i2c {
53+
#address-cells = <1>;
54+
#size-cells = <0>;
55+
accel@40 {
56+
compatible = "bosch,bma180";
57+
reg = <0x40>;
58+
interrupt-parent = <&gpio6>;
59+
interrupts = <18 (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_EDGE_RISING)>;
60+
};
61+
};
62+
...

‎Documentation/devicetree/bindings/iio/accel/bosch,bma255.yaml

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/iio/accel/bosch,bma255.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Bosch BMA255 and Similar Accelerometers
8+
9+
maintainers:
10+
- Linus Walleij <[email protected]>
11+
12+
description:
13+
3 axis accelerometers with varying range and I2C or SPI
14+
4-wire interface.
15+
16+
properties:
17+
compatible:
18+
enum:
19+
- bosch,bmc150
20+
- bosch,bmi055
21+
- bosch,bma255
22+
- bosch,bma250e
23+
- bosch,bma222
24+
- bosch,bma222e
25+
- bosch,bma280
26+
27+
reg:
28+
maxItems: 1
29+
30+
vdd-supply: true
31+
vddio-supply: true
32+
33+
interrupts:
34+
maxItems: 1
35+
36+
mount-matrix:
37+
description: an optional 3x3 mounting rotation matrix.
38+
39+
spi-max-frequency:
40+
maximum: 10000000
41+
42+
required:
43+
- compatible
44+
- reg
45+
46+
additionalProperties: false
47+
48+
examples:
49+
- |
50+
#include <dt-bindings/interrupt-controller/irq.h>
51+
i2c {
52+
#address-cells = <1>;
53+
#size-cells = <0>;
54+
accelerometer@8 {
55+
compatible = "bosch,bma222";
56+
reg = <0x08>;
57+
vddio-supply = <&vddio>;
58+
vdd-supply = <&vdd>;
59+
interrupts = <57 IRQ_TYPE_EDGE_FALLING>;
60+
};
61+
};
62+
- |
63+
# include <dt-bindings/interrupt-controller/irq.h>
64+
spi {
65+
#address-cells = <1>;
66+
#size-cells = <0>;
67+
accel@0 {
68+
compatible = "bosch,bma222";
69+
reg = <0>;
70+
spi-max-frequency = <10000000>;
71+
};
72+
};
73+
...

‎Documentation/devicetree/bindings/iio/accel/dmard06.txt

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎Documentation/devicetree/bindings/iio/accel/fsl,mma8452.yaml

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/iio/accel/fsl,mma8452.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title:
8+
Freescale MMA8451Q, MMA8452Q, MMA8453Q, MMA8652FC, MMA8653FC or FXLS8471Q
9+
triaxial accelerometer
10+
11+
maintainers:
12+
- Martin Kepplinger <[email protected]>
13+
14+
properties:
15+
compatible:
16+
enum:
17+
- fsl,mma8451
18+
- fsl,mma8452
19+
- fsl,mma8453
20+
- fsl,mma8652
21+
- fsl,mma8653
22+
- fsl,fxls8471
23+
24+
reg:
25+
maxItems: 1
26+
27+
interrupts:
28+
description:
29+
2 highly configurable interrupt lines exist.
30+
minItems: 1
31+
maxItems: 2
32+
33+
interrupt-names:
34+
description: Specify which interrupt line is in use.
35+
items:
36+
enum:
37+
- INT1
38+
- INT2
39+
minItems: 1
40+
maxItems: 2
41+
42+
vdd-supply: true
43+
vddio-supply: true
44+
45+
required:
46+
- compatible
47+
- reg
48+
49+
additionalProperties: false
50+
51+
examples:
52+
- |
53+
i2c {
54+
#address-cells = <1>;
55+
#size-cells = <0>;
56+
57+
accel@1d {
58+
compatible = "fsl,mma8453";
59+
reg = <0x1d>;
60+
interrupt-parent = <&gpio1>;
61+
interrupts = <5 0>;
62+
interrupt-names = "INT2";
63+
};
64+
};
65+
...

‎Documentation/devicetree/bindings/iio/accel/kionix,kxcjk1013.txt

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)