Skip to content

Commit 8403ce7

Browse files
committed
Merge tag 'mfd-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull MFD updates from Lee Jones: "New Device Support: - Add support for Watchdog to ChromeOS Embedded Controller - Add support for GPIOs to ChromeOS Embedded Controller - Add supprt for Sound to MediaTek MT6357 CODEC New Functionality: - Add power-off functionality to Texas Instruments TWL series CODECs Fix-ups: - Device Tree binding adaptions/conversions/creation - Use/convert to new/better APIs/helpers/MACROs instead of hand-rolling implementations - Trivial; spelling, whitespace, clean-ups, etc - Remove superfluous code and simplify overall - Fix include lists; alphabetise, remove unused, explicitly add used - Use dev_err_probe() to clean-up error paths - Convert used cache type over to the Maple Tree in many instances - Constify a bunch of static structs - Refrain from over-riding resources provided via the firmware Bug Fixes: - Fix a clock related firmware bug on Dell XPS 9530 et al. - Repair incorrect IRQ designations - Increase buffer sizes to omit various snprintf compiler errors - Ensure errors are handled properly - Balance references and prevent resource leaks - Rectify Power Key interrupt processing - Fix Kconfig related build errors - Correct a bunch of register start-up default values" * tag 'mfd-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (65 commits) mfd: cs42l43: Fix wrong GPIO_FN_SEL and SPI_CLK_CONFIG1 defaults mfd: cs42l43: Fix wrong register defaults mfd: mt6397-core: Register mt6357 sound codec dt-bindings: mfd: syscon: Add ti,am62-usb-phy-ctrl compatible dt-bindings: mfd: dlg,da9063: Make #interrupt-cells required dt-bindings: mfd: Convert atmel-flexcom to json-schema mfd: kempld-core: Don't replace resources provided by ACPI mfd: cros_ec_dev: Add GPIO device if feature present on EC dt-bindings: mfd: cros-ec: Add properties for GPIO controller mfd: twl: Select MFD_CORE mfd: core: Constify the struct device_type usage mfd: rk8xx-core: Fix interrupt processing order for power key button mfd: twl4030-power: Accept standard property for power controller mfd: twl-core: Add power off implementation for twl603x dt-bindings: mfd: ti,twl: Document system-power-controller mfd: altera-sysmgr: Call of_node_put() only when of_parse_phandle() takes a ref mfd: syscon: Remove extern from function prototypes mfd: syscon: Call of_node_put() only when of_parse_phandle() takes a ref mfd: mc13xxx: Use bitfield helpers mfd: rc5t583: Convert to use maple tree register cache ...
2 parents a3df5d5 + 78334c3 commit 8403ce7

Some content is hidden

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

76 files changed

+1045
-634
lines changed

Documentation/devicetree/bindings/input/da9062-onkey.txt

Lines changed: 0 additions & 47 deletions
This file was deleted.
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/input/dlg,da9062-onkey.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Dialog DA9061/62/63 OnKey Module
8+
9+
maintainers:
10+
- Biju Das <[email protected]>
11+
12+
description: |
13+
This module is part of the DA9061/DA9062/DA9063. For more details about entire
14+
DA906{1,2,3} chips see Documentation/devicetree/bindings/mfd/dlg,da9063.yaml
15+
16+
This module provides the KEY_POWER event.
17+
18+
properties:
19+
compatible:
20+
oneOf:
21+
- enum:
22+
- dlg,da9062-onkey
23+
- dlg,da9063-onkey
24+
- items:
25+
- const: dlg,da9061-onkey
26+
- const: dlg,da9062-onkey
27+
28+
dlg,disable-key-power:
29+
type: boolean
30+
description:
31+
Disable power-down using a long key-press. If this entry exists
32+
the OnKey driver will remove support for the KEY_POWER key press
33+
when triggered using a long press of the OnKey.
34+
35+
required:
36+
- compatible
37+
38+
additionalProperties: false
Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/mfd/atmel,hlcdc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Atmel's HLCD Controller
8+
9+
maintainers:
10+
- Nicolas Ferre <[email protected]>
11+
- Alexandre Belloni <[email protected]>
12+
- Claudiu Beznea <[email protected]>
13+
14+
description:
15+
The Atmel HLCDC (HLCD Controller) IP available on Atmel SoCs exposes two
16+
subdevices, a PWM chip and a Display Controller.
17+
18+
properties:
19+
compatible:
20+
enum:
21+
- atmel,at91sam9n12-hlcdc
22+
- atmel,at91sam9x5-hlcdc
23+
- atmel,sama5d2-hlcdc
24+
- atmel,sama5d3-hlcdc
25+
- atmel,sama5d4-hlcdc
26+
- microchip,sam9x60-hlcdc
27+
- microchip,sam9x75-xlcdc
28+
29+
reg:
30+
maxItems: 1
31+
32+
interrupts:
33+
maxItems: 1
34+
35+
clocks:
36+
minItems: 3
37+
38+
clock-names:
39+
items:
40+
- const: periph_clk
41+
- const: sys_clk
42+
- const: slow_clk
43+
- const: lvds_pll_clk
44+
minItems: 3
45+
46+
display-controller:
47+
$ref: /schemas/display/atmel/atmel,hlcdc-display-controller.yaml
48+
49+
pwm:
50+
$ref: /schemas/pwm/atmel,hlcdc-pwm.yaml
51+
52+
required:
53+
- compatible
54+
- reg
55+
- clocks
56+
- clock-names
57+
- interrupts
58+
59+
additionalProperties: false
60+
61+
examples:
62+
- |
63+
#include <dt-bindings/clock/at91.h>
64+
#include <dt-bindings/dma/at91.h>
65+
#include <dt-bindings/interrupt-controller/arm-gic.h>
66+
67+
lcd_controller: lcd-controller@f0030000 {
68+
compatible = "atmel,sama5d3-hlcdc";
69+
reg = <0xf0030000 0x2000>;
70+
clocks = <&lcdc_clk>, <&lcdck>, <&clk32k>;
71+
clock-names = "periph_clk", "sys_clk", "slow_clk";
72+
interrupts = <36 IRQ_TYPE_LEVEL_HIGH 0>;
73+
74+
display-controller {
75+
compatible = "atmel,hlcdc-display-controller";
76+
pinctrl-names = "default";
77+
pinctrl-0 = <&pinctrl_lcd_base &pinctrl_lcd_rgb888>;
78+
#address-cells = <1>;
79+
#size-cells = <0>;
80+
81+
port@0 {
82+
#address-cells = <1>;
83+
#size-cells = <0>;
84+
reg = <0>;
85+
86+
hlcdc_panel_output: endpoint@0 {
87+
reg = <0>;
88+
remote-endpoint = <&panel_input>;
89+
};
90+
};
91+
};
92+
93+
pwm {
94+
compatible = "atmel,hlcdc-pwm";
95+
pinctrl-names = "default";
96+
pinctrl-0 = <&pinctrl_lcd_pwm>;
97+
#pwm-cells = <3>;
98+
};
99+
};
Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/mfd/atmel,sama5d2-flexcom.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Microchip Flexcom (Flexible Serial Communication Unit)
8+
9+
maintainers:
10+
- Kavyasree Kotagiri <[email protected]>
11+
12+
description:
13+
The Microchip Flexcom is just a wrapper which embeds a SPI controller,
14+
an I2C controller and an USART. Only one function can be used at a
15+
time and is chosen at boot time according to the device tree.
16+
17+
properties:
18+
compatible:
19+
oneOf:
20+
- const: atmel,sama5d2-flexcom
21+
- items:
22+
- const: microchip,sam9x7-flexcom
23+
- const: atmel,sama5d2-flexcom
24+
- items:
25+
- const: microchip,sama7g5-flexcom
26+
- const: atmel,sama5d2-flexcom
27+
28+
29+
reg:
30+
maxItems: 1
31+
32+
clocks:
33+
maxItems: 1
34+
35+
"#address-cells":
36+
const: 1
37+
38+
"#size-cells":
39+
const: 1
40+
41+
ranges:
42+
description:
43+
One range for the full I/O register region. (including USART,
44+
TWI and SPI registers).
45+
items:
46+
maxItems: 3
47+
48+
atmel,flexcom-mode:
49+
description: |
50+
Specifies the flexcom mode as follows:
51+
1: USART
52+
2: SPI
53+
3: I2C.
54+
$ref: /schemas/types.yaml#/definitions/uint32
55+
enum: [1, 2, 3]
56+
57+
patternProperties:
58+
"^serial@[0-9a-f]+$":
59+
type: object
60+
description:
61+
Child node describing USART. See atmel-usart.txt for details
62+
of USART bindings.
63+
64+
"^spi@[0-9a-f]+$":
65+
type: object
66+
description:
67+
Child node describing SPI. See ../spi/spi_atmel.txt for details
68+
of SPI bindings.
69+
70+
"^i2c@[0-9a-f]+$":
71+
$ref: /schemas/i2c/atmel,at91sam-i2c.yaml
72+
description:
73+
Child node describing I2C.
74+
75+
required:
76+
- compatible
77+
- reg
78+
- clocks
79+
- "#address-cells"
80+
- "#size-cells"
81+
- ranges
82+
- atmel,flexcom-mode
83+
84+
additionalProperties: false
85+
86+
examples:
87+
- |
88+
#include <dt-bindings/interrupt-controller/arm-gic.h>
89+
90+
flx0: flexcom@f8034000 {
91+
compatible = "atmel,sama5d2-flexcom";
92+
reg = <0xf8034000 0x200>;
93+
clocks = <&flx0_clk>;
94+
#address-cells = <1>;
95+
#size-cells = <1>;
96+
ranges = <0x0 0xf8034000 0x800>;
97+
atmel,flexcom-mode = <2>;
98+
};
99+
...

Documentation/devicetree/bindings/mfd/atmel-flexcom.txt

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

0 commit comments

Comments
 (0)