Skip to content

Commit 3a9b0a4

Browse files
committed
Merge tag 'mfd-next-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull MFD updates from Lee Jones: "Removed Drivers: - Remove support for TI TPS80031/TPS80032 PMICs New Device Support: - Add support for Magnetic Reader to TI AM335x - Add support for DA9063_EA to Dialog DA9063 - Add support for SC2730 PMIC to Spreadtrum SC27xx - Add support for MacBookPro16,2 ICL-N UART Intel LPSS PCI - Add support for lots of new PMICS in QCom SPMI PMIC - Add support for ADC to Diolan DLN2 New Functionality: - Add support for Power Off to Rockchip RK817 Fix-ups: - Simplify Regmap passing to child devices in hi6421-spmi-pmic - SPDX licensing updates in ti_am335x_tscadc - Improve error handling in ti_am335x_tscadc - Expedite clock search in ti_am335x_tscadc - Generic simplifications in ti_am335x_tscadc - Use generic macros/defines in ti_am335x_tscadc - Remove unused code in ti_am335x_tscadc, cros_ec_dev - Convert to GPIOD in wcd934x - Add namespacing in ti_am335x_tscadc - Restrict compilation to relevant arches in intel_pmt - Provide better description/documentation in exynos_lpass - Add SPI device ID table in altera-a10sr, motorola-cpcap, sprd-sc27xx-spi - Change IRQ handling in qcom-pm8xxx - Split out I2C and SPI code in arizona - Explicitly include used headers in altera-a10sr - Convert sysfs show() function to in sysfs_emit - Standardise *_exit() and *_remove() return values in mc13xxx, stmpe, tps65912 - Trivial (style/spelling/whitespace) fixups in ti_am335x_tscadc, qcom-spmi-pmic, max77686-private - Device Tree fix-ups in ti,am3359-tscadc, samsung,s2mps11, samsung,s2mpa01, samsung,s5m8767, brcm,misc, brcm,cru, syscon, qcom,tcsr, xylon,logicvc, max77686, x-powers,ac100, x-powers,axp152, x-powers,axp209-gpio, syscon, qcom,spmi-pmic Bug Fixes: - Balance refcounting (get/put) in ti_am335x_tscadc, mfd-core - Fix IRQ trigger type in sec-irq, max77693, max14577 - Repair off-by-one in altera-sysmgr - Add explicit 'select MFD_CORE' to MFD_SIMPLE_MFD_I2C" * tag 'mfd-next-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (95 commits) mfd: simple-mfd-i2c: Select MFD_CORE to fix build error mfd: tps80031: Remove driver mfd: max77686: Correct tab-based alignment of register addresses mfd: wcd934x: Replace legacy gpio interface for gpiod dt-bindings: mfd: qcom: pm8xxx: Add pm8018 compatible mfd: dln2: Add cell for initializing DLN2 ADC mfd: qcom-spmi-pmic: Add missing PMICs supported by socinfo mfd: qcom-spmi-pmic: Document ten more PMICs in the binding mfd: qcom-spmi-pmic: Sort compatibles in the driver mfd: qcom-spmi-pmic: Sort the compatibles in the binding mfd: janz-cmoio: Replace snprintf in show functions with sysfs_emit mfd: altera-a10sr: Include linux/module.h mfd: tps65912: Make tps65912_device_exit() return void mfd: stmpe: Make stmpe_remove() return void mfd: mc13xxx: Make mc13xxx_common_exit() return void dt-bindings: mfd: syscon: Add samsung,exynosautov9-sysreg compatible mfd: altera-sysmgr: Fix a mistake caused by resource_size conversion dt-bindings: gpio: Convert X-Powers AXP209 GPIO binding to a schema dt-bindings: mfd: syscon: Add rk3368 QoS register compatible mfd: arizona: Split of_match table into I2C and SPI versions ...
2 parents d20f7a0 + 5dc6daf commit 3a9b0a4

Some content is hidden

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

77 files changed

+2120
-2200
lines changed

Documentation/devicetree/bindings/clock/maxim,max77686.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Example:
4949
max77686: max77686@9 {
5050
compatible = "maxim,max77686";
5151
interrupt-parent = <&wakeup_eint>;
52-
interrupts = <26 0>;
52+
interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
5353
reg = <0x09>;
5454
#clock-cells = <1>;
5555

@@ -74,7 +74,7 @@ Example:
7474
max77802: max77802@9 {
7575
compatible = "maxim,max77802";
7676
interrupt-parent = <&wakeup_eint>;
77-
interrupts = <26 0>;
77+
interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
7878
reg = <0x09>;
7979
#clock-cells = <1>;
8080

Documentation/devicetree/bindings/gpio/gpio-axp209.txt

Lines changed: 0 additions & 75 deletions
This file was deleted.
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
%YAML 1.2
3+
---
4+
$id: "http://devicetree.org/schemas/gpio/x-powers,axp209-gpio.yaml#"
5+
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
6+
7+
title: X-Powers AXP209 GPIO Device Tree Bindings
8+
9+
maintainers:
10+
- Chen-Yu Tsai <[email protected]>
11+
12+
properties:
13+
"#gpio-cells":
14+
const: 2
15+
description: >
16+
The first cell is the pin number and the second is the GPIO flags.
17+
18+
compatible:
19+
oneOf:
20+
- enum:
21+
- x-powers,axp209-gpio
22+
- x-powers,axp813-gpio
23+
- items:
24+
- const: x-powers,axp803-gpio
25+
- const: x-powers,axp813-gpio
26+
27+
gpio-controller: true
28+
29+
patternProperties:
30+
"^.*-pins?$":
31+
$ref: /schemas/pinctrl/pinmux-node.yaml#
32+
33+
properties:
34+
pins:
35+
items:
36+
enum:
37+
- GPIO0
38+
- GPIO1
39+
- GPIO2
40+
41+
function:
42+
enum:
43+
- adc
44+
- ldo
45+
- gpio_in
46+
- gpio_out
47+
48+
required:
49+
- compatible
50+
- "#gpio-cells"
51+
- gpio-controller
52+
53+
additionalProperties: false
54+
55+
...

Documentation/devicetree/bindings/i2c/allwinner,sun6i-a31-p2wi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ examples:
5555
#size-cells = <0>;
5656
5757
axp221: pmic@68 {
58-
compatible = "x-powers,axp221";
58+
/* compatible = "x-powers,axp221"; */
5959
reg = <0x68>;
6060
};
6161
};
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/iio/adc/ti,am3359-adc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: TI AM3359 ADC
8+
9+
maintainers:
10+
- Miquel Raynal <[email protected]>
11+
12+
properties:
13+
compatible:
14+
enum:
15+
- ti,am3359-adc
16+
- ti,am4372-adc
17+
18+
'#io-channel-cells':
19+
const: 1
20+
21+
ti,adc-channels:
22+
description: List of analog inputs available for ADC. AIN0 = 0, AIN1 = 1 and
23+
so on until AIN7 = 7.
24+
$ref: /schemas/types.yaml#/definitions/uint32-array
25+
minItems: 1
26+
maxItems: 8
27+
28+
ti,chan-step-opendelay:
29+
description: List of open delays for each channel of ADC in the order of
30+
ti,adc-channels. The value corresponds to the number of ADC clock cycles
31+
to wait after applying the step configuration registers and before sending
32+
the start of ADC conversion. Maximum value is 0x3FFFF.
33+
$ref: /schemas/types.yaml#/definitions/uint32-array
34+
minItems: 1
35+
maxItems: 8
36+
37+
ti,chan-step-sampledelay:
38+
description: List of sample delays for each channel of ADC in the order of
39+
ti,adc-channels. The value corresponds to the number of ADC clock cycles
40+
to sample (to hold start of conversion high). Maximum value is 0xFF.
41+
$ref: /schemas/types.yaml#/definitions/uint32-array
42+
minItems: 1
43+
maxItems: 8
44+
45+
ti,chan-step-avg:
46+
description: Number of averages to be performed for each channel of ADC. If
47+
average is 16 (this is also the maximum) then input is sampled 16 times
48+
and averaged to get more accurate value. This increases the time taken by
49+
ADC to generate a sample. Maximum value is 16.
50+
$ref: /schemas/types.yaml#/definitions/uint32-array
51+
minItems: 1
52+
maxItems: 8
53+
54+
required:
55+
- compatible
56+
- '#io-channel-cells'
57+
- ti,adc-channels
58+
59+
additionalProperties: false
60+
61+
examples:
62+
- |
63+
adc {
64+
compatible = "ti,am3359-adc";
65+
#io-channel-cells = <1>;
66+
ti,adc-channels = <4 5 6 7>;
67+
ti,chan-step-opendelay = <0x098 0x3ffff 0x098 0x0>;
68+
ti,chan-step-sampledelay = <0xff 0x0 0xf 0x0>;
69+
ti,chan-step-avg = <16 2 4 8>;
70+
};
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/input/touchscreen/ti,am3359-tsc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: TI AM3359 Touchscreen controller
8+
9+
maintainers:
10+
- Miquel Raynal <[email protected]>
11+
12+
properties:
13+
compatible:
14+
const: ti,am3359-tsc
15+
16+
ti,wires:
17+
description: Wires refer to application modes i.e. 4/5/8 wire touchscreen
18+
support on the platform.
19+
$ref: /schemas/types.yaml#/definitions/uint32
20+
enum: [4, 5, 8]
21+
22+
ti,x-plate-resistance:
23+
description: X plate resistance
24+
$ref: /schemas/types.yaml#/definitions/uint32
25+
26+
ti,coordinate-readouts:
27+
description: The sequencer supports a total of 16 programmable steps. Each
28+
step is used to read a single coordinate. A single readout is enough but
29+
multiple reads can increase the quality. A value of 5 means, 5 reads for
30+
X, 5 for Y and 2 for Z (always). This utilises 12 of the 16 software steps
31+
available. The remaining 4 can be used by the ADC.
32+
$ref: /schemas/types.yaml#/definitions/uint32
33+
minimum: 1
34+
maximum: 6
35+
36+
ti,wire-config:
37+
description: Different boards could have a different order for connecting
38+
wires on touchscreen. We need to provide an 8-bit number where the
39+
first four bits represent the analog lines and the next 4 bits represent
40+
positive/negative terminal on that input line. Notations to represent the
41+
input lines and terminals respectively are as follows, AIN0 = 0, AIN1 = 1
42+
and so on until AIN7 = 7. XP = 0, XN = 1, YP = 2, YN = 3.
43+
$ref: /schemas/types.yaml#/definitions/uint32-array
44+
minItems: 4
45+
maxItems: 8
46+
47+
ti,charge-delay:
48+
description: Length of touch screen charge delay step in terms of ADC clock
49+
cycles. Charge delay value should be large in order to avoid false pen-up
50+
events. This value effects the overall sampling speed, hence need to be
51+
kept as low as possible, while avoiding false pen-up event. Start from a
52+
lower value, say 0x400, and increase value until false pen-up events are
53+
avoided. The pen-up detection happens immediately after the charge step,
54+
so this does in fact function as a hardware knob for adjusting the amount
55+
of "settling time".
56+
$ref: /schemas/types.yaml#/definitions/uint32
57+
58+
required:
59+
- compatible
60+
- ti,wires
61+
- ti,x-plate-resistance
62+
- ti,coordinate-readouts
63+
- ti,wire-config
64+
65+
additionalProperties: false
66+
67+
examples:
68+
- |
69+
tsc {
70+
compatible = "ti,am3359-tsc";
71+
ti,wires = <4>;
72+
ti,x-plate-resistance = <200>;
73+
ti,coordinate-readouts = <5>;
74+
ti,wire-config = <0x00 0x11 0x22 0x33>;
75+
ti,charge-delay = <0x400>;
76+
};

Documentation/devicetree/bindings/input/touchscreen/ti-tsc-adc.txt

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

0 commit comments

Comments
 (0)