Skip to content

Commit 1a31c12

Browse files
torvaldstorvalds
committed
Merge tag 'mfd-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull MFD updates from Lee Jones: "New Drivers: - Add support for initialising shared (between children) Regmaps - Add support for Kontron SL28CPLD - Add support for ENE KB3930 Embedded Controller - Add support for Intel FPGA PAC MAX 10 BMC New Device Support: - Add support for Power to Ricoh RN5T618 - Add support for UART to Intel Lakefield - Add support for LP87524_Q1 to Texas Instruments LP87565 New Functionality: - Device Tree; ene-kb3930, sl28cpld, syscon, lp87565, lp87524-q1 - Use new helper dev_err_probe(); madera-core, stmfx, wcd934x - Use new GPIOD API; dm355evm_msp - Add wake-up capability; sprd-sc27xx-spi - Add ACPI support; kempld-core Fix-ups: - Trivial (spelling/whitespace); Kconfig, ab8500 - Fix for unused variables; khadas-mcu, kempld-core - Remove unused header file(s); mt6360-core - Use correct IRQ flags in docs; act8945a, gateworks-gsc, rohm,bd70528-pmic - Add COMPILE_TEST support; asic3, tmio_core - Add dependency on I2C; SL28CPLD Bug Fixes: - Fix memory leak(s); sm501 - Do not free regmap_config's 'name' until exit; syscon" * tag 'mfd-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (34 commits) mfd: kempld-core: Fix unused variable 'kempld_acpi_table' when !ACPI mfd: sl28cpld: Depend on I2C mfd: asic3: Build if COMPILE_TEST=y dt-bindings: mfd: Correct interrupt flags in examples mfd: Add ACPI support to Kontron PLD driver mfd: intel-m10-bmc: Add Intel MAX 10 BMC chip support for Intel FPGA PAC mfd: lp87565: Add LP87524-Q1 variant dt-bindings: mfd: Add LP87524-Q1 dt-bindings: mfd: lp87565: Convert to yaml mfd: mt6360: Remove unused include <linux/version.h> mfd: sm501: Fix leaks in probe() mfd: syscon: Don't free allocated name for regmap_config dt-bindings: mfd: syscon: Document Exynos3 and Exynos5433 compatibles dt-bindings: mfd: syscon: Merge Samsung Exynos Sysreg bindings dt-bindings: mfd: ab8500: Remove weird Unicode characters mfd: sprd: Add wakeup capability for PMIC IRQ mfd: intel-lpss: Add device IDs for UART ports for Lakefield mfd: dm355evm_msp: Convert LEDs to GPIO descriptor table mfd: wcd934x: Simplify with dev_err_probe() mfd: stmfx: Simplify with dev_err_probe() ...
2 parents f888bdf + 6d81dc3 commit 1a31c12

55 files changed

Lines changed: 2493 additions & 186 deletions

Some content is hidden

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

‎Documentation/ABI/testing/sysfs-driver-intel-m10-bmc‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
What: /sys/bus/spi/devices/.../bmc_version
2+
Date: June 2020
3+
KernelVersion: 5.10
4+
Contact: Xu Yilun <yilun.xu@intel.com>
5+
Description: Read only. Returns the hardware build version of Intel
6+
MAX10 BMC chip.
7+
Format: "0x%x".
8+
9+
What: /sys/bus/spi/devices/.../bmcfw_version
10+
Date: June 2020
11+
KernelVersion: 5.10
12+
Contact: Xu Yilun <yilun.xu@intel.com>
13+
Description: Read only. Returns the firmware version of Intel MAX10
14+
BMC chip.
15+
Format: "0x%x".

‎Documentation/devicetree/bindings/arm/samsung/sysreg.yaml‎

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

‎Documentation/devicetree/bindings/gpio/kontron,sl28cpld-gpio.yaml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/gpio/kontron,sl28cpld-gpio.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: GPIO driver for the sl28cpld board management controller
8+
9+
maintainers:
10+
- Michael Walle <michael@walle.cc>
11+
12+
description: |
13+
This module is part of the sl28cpld multi-function device. For more
14+
details see ../mfd/kontron,sl28cpld.yaml.
15+
16+
There are three flavors of the GPIO controller, one full featured
17+
input/output with interrupt support (kontron,sl28cpld-gpio), one
18+
output-only (kontron,sl28-gpo) and one input-only (kontron,sl28-gpi).
19+
20+
Each controller supports 8 GPIO lines.
21+
22+
properties:
23+
compatible:
24+
enum:
25+
- kontron,sl28cpld-gpio
26+
- kontron,sl28cpld-gpi
27+
- kontron,sl28cpld-gpo
28+
29+
reg:
30+
maxItems: 1
31+
32+
interrupts:
33+
maxItems: 1
34+
35+
"#interrupt-cells":
36+
const: 2
37+
38+
interrupt-controller: true
39+
40+
"#gpio-cells":
41+
const: 2
42+
43+
gpio-controller: true
44+
45+
gpio-line-names:
46+
minItems: 1
47+
maxItems: 8
48+
49+
required:
50+
- compatible
51+
- "#gpio-cells"
52+
- gpio-controller
53+
54+
additionalProperties: false

‎Documentation/devicetree/bindings/hwmon/kontron,sl28cpld-hwmon.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/hwmon/kontron,sl28cpld-hwmon.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Hardware monitoring driver for the sl28cpld board management controller
8+
9+
maintainers:
10+
- Michael Walle <michael@walle.cc>
11+
12+
description: |
13+
This module is part of the sl28cpld multi-function device. For more
14+
details see ../mfd/kontron,sl28cpld.yaml.
15+
16+
properties:
17+
compatible:
18+
enum:
19+
- kontron,sl28cpld-fan
20+
21+
reg:
22+
maxItems: 1
23+
24+
required:
25+
- compatible
26+
27+
additionalProperties: false

‎Documentation/devicetree/bindings/interrupt-controller/kontron,sl28cpld-intc.yaml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/interrupt-controller/kontron,sl28cpld-intc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Interrupt controller driver for the sl28cpld board management controller
8+
9+
maintainers:
10+
- Michael Walle <michael@walle.cc>
11+
12+
description: |
13+
This module is part of the sl28cpld multi-function device. For more
14+
details see ../mfd/kontron,sl28cpld.yaml.
15+
16+
The following interrupts are available. All types and levels are fixed
17+
and handled by the board management controller.
18+
19+
==== ============= ==================================
20+
IRQ line/device description
21+
==== ============= ==================================
22+
0 RTC_INT# Interrupt line from on-board RTC
23+
1 SMB_ALERT# Event on SMB_ALERT# line (P1)
24+
2 ESPI_ALERT0# Event on ESPI_ALERT0# line (S43)
25+
3 ESPI_ALERT1# Event on ESPI_ALERT1# line (S44)
26+
4 PWR_BTN# Event on PWR_BTN# line (P128)
27+
5 SLEEP# Event on SLEEP# line (S149)
28+
6 watchdog Interrupt of the internal watchdog
29+
7 n/a not used
30+
==== ============= ==================================
31+
32+
properties:
33+
compatible:
34+
enum:
35+
- kontron,sl28cpld-intc
36+
37+
reg:
38+
maxItems: 1
39+
40+
interrupts:
41+
maxItems: 1
42+
43+
"#interrupt-cells":
44+
const: 2
45+
46+
interrupt-controller: true
47+
48+
required:
49+
- compatible
50+
- interrupts
51+
- "#interrupt-cells"
52+
- interrupt-controller
53+
54+
additionalProperties: false

‎Documentation/devicetree/bindings/mfd/ab8500.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ ab8500-btemp : : vtvout : Battery Temperature
3131
: BAT_CTRL_INDB : : Battery Removal Indicator
3232
: BTEMP_LOW : : Btemp < BtempLow, if battery temperature is lower than -10°C
3333
: BTEMP_LOW_MEDIUM : : BtempLow < Btemp < BtempMedium,if battery temperature is between -10 and 0°C
34-
: BTEMP_MEDIUM_HIGH : : BtempMedium < Btemp < BtempHigh,if battery temperature is between 0°C and“MaxTemp
35-
: BTEMP_HIGH : : Btemp > BtempHigh, if battery temperature is higher than “MaxTemp
34+
: BTEMP_MEDIUM_HIGH : : BtempMedium < Btemp < BtempHigh,if battery temperature is between 0°C and MaxTemp
35+
: BTEMP_HIGH : : Btemp > BtempHigh, if battery temperature is higher than MaxTemp
3636
ab8500-charger : : vddadc : Charger interface
3737
: MAIN_CH_UNPLUG_DET : : main charger unplug detection management (not in 8505)
3838
: MAIN_CHARGE_PLUG_DET : : main charger plug detection management (not in 8505)

‎Documentation/devicetree/bindings/mfd/act8945a.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Example:
7171
pinctrl-names = "default";
7272
pinctrl-0 = <&pinctrl_charger_chglev &pinctrl_charger_lbo &pinctrl_charger_irq>;
7373
interrupt-parent = <&pioA>;
74-
interrupts = <45 GPIO_ACTIVE_LOW>;
74+
interrupts = <45 IRQ_TYPE_LEVEL_LOW>;
7575

7676
active-semi,chglev-gpios = <&pioA 12 GPIO_ACTIVE_HIGH>;
7777
active-semi,lbo-gpios = <&pioA 72 GPIO_ACTIVE_LOW>;

‎Documentation/devicetree/bindings/mfd/ene-kb3930.yaml‎

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-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/mfd/ene-kb3930.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: ENE KB3930 Embedded Controller bindings
8+
9+
description: |
10+
This binding describes the ENE KB3930 Embedded Controller attached to an
11+
I2C bus.
12+
13+
maintainers:
14+
- Lubomir Rintel <lkundrak@v3.sk>
15+
16+
properties:
17+
compatible:
18+
items:
19+
- enum:
20+
- dell,wyse-ariel-ec # Dell Wyse Ariel board (3020)
21+
- const: ene,kb3930
22+
reg:
23+
maxItems: 1
24+
25+
off-gpios:
26+
description: GPIO used with the shutdown protocol on Ariel
27+
maxItems: 2
28+
29+
system-power-controller: true
30+
31+
required:
32+
- compatible
33+
- reg
34+
35+
additionalProperties: false
36+
37+
examples:
38+
- |
39+
#include <dt-bindings/gpio/gpio.h>
40+
41+
i2c {
42+
#address-cells = <1>;
43+
#size-cells = <0>;
44+
45+
embedded-controller@58 {
46+
compatible = "dell,wyse-ariel-ec", "ene,kb3930";
47+
reg = <0x58>;
48+
system-power-controller;
49+
50+
off-gpios = <&gpio 126 GPIO_ACTIVE_HIGH>,
51+
<&gpio 127 GPIO_ACTIVE_HIGH>;
52+
};
53+
};
54+
55+
...

‎Documentation/devicetree/bindings/mfd/gateworks-gsc.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ additionalProperties: false
149149
examples:
150150
- |
151151
#include <dt-bindings/gpio/gpio.h>
152+
#include <dt-bindings/interrupt-controller/irq.h>
152153
i2c {
153154
#address-cells = <1>;
154155
#size-cells = <0>;
@@ -157,7 +158,7 @@ examples:
157158
compatible = "gw,gsc";
158159
reg = <0x20>;
159160
interrupt-parent = <&gpio1>;
160-
interrupts = <4 GPIO_ACTIVE_LOW>;
161+
interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
161162
interrupt-controller;
162163
#interrupt-cells = <1>;
163164
#address-cells = <1>;

0 commit comments

Comments
 (0)