forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'mfd-next-5.10' of git://git.kernel.org/pub/scm/linux/kerne…
…l/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() ...
- Loading branch information
Showing
55 changed files
with
2,493 additions
and
186 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
What: /sys/bus/spi/devices/.../bmc_version | ||
Date: June 2020 | ||
KernelVersion: 5.10 | ||
Contact: Xu Yilun <[email protected]> | ||
Description: Read only. Returns the hardware build version of Intel | ||
MAX10 BMC chip. | ||
Format: "0x%x". | ||
|
||
What: /sys/bus/spi/devices/.../bmcfw_version | ||
Date: June 2020 | ||
KernelVersion: 5.10 | ||
Contact: Xu Yilun <[email protected]> | ||
Description: Read only. Returns the firmware version of Intel MAX10 | ||
BMC chip. | ||
Format: "0x%x". |
This file was deleted.
Oops, something went wrong.
54 changes: 54 additions & 0 deletions
54
Documentation/devicetree/bindings/gpio/kontron,sl28cpld-gpio.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/gpio/kontron,sl28cpld-gpio.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: GPIO driver for the sl28cpld board management controller | ||
|
||
maintainers: | ||
- Michael Walle <[email protected]> | ||
|
||
description: | | ||
This module is part of the sl28cpld multi-function device. For more | ||
details see ../mfd/kontron,sl28cpld.yaml. | ||
There are three flavors of the GPIO controller, one full featured | ||
input/output with interrupt support (kontron,sl28cpld-gpio), one | ||
output-only (kontron,sl28-gpo) and one input-only (kontron,sl28-gpi). | ||
Each controller supports 8 GPIO lines. | ||
properties: | ||
compatible: | ||
enum: | ||
- kontron,sl28cpld-gpio | ||
- kontron,sl28cpld-gpi | ||
- kontron,sl28cpld-gpo | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
interrupts: | ||
maxItems: 1 | ||
|
||
"#interrupt-cells": | ||
const: 2 | ||
|
||
interrupt-controller: true | ||
|
||
"#gpio-cells": | ||
const: 2 | ||
|
||
gpio-controller: true | ||
|
||
gpio-line-names: | ||
minItems: 1 | ||
maxItems: 8 | ||
|
||
required: | ||
- compatible | ||
- "#gpio-cells" | ||
- gpio-controller | ||
|
||
additionalProperties: false |
27 changes: 27 additions & 0 deletions
27
Documentation/devicetree/bindings/hwmon/kontron,sl28cpld-hwmon.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/hwmon/kontron,sl28cpld-hwmon.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Hardware monitoring driver for the sl28cpld board management controller | ||
|
||
maintainers: | ||
- Michael Walle <[email protected]> | ||
|
||
description: | | ||
This module is part of the sl28cpld multi-function device. For more | ||
details see ../mfd/kontron,sl28cpld.yaml. | ||
properties: | ||
compatible: | ||
enum: | ||
- kontron,sl28cpld-fan | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
required: | ||
- compatible | ||
|
||
additionalProperties: false |
54 changes: 54 additions & 0 deletions
54
Documentation/devicetree/bindings/interrupt-controller/kontron,sl28cpld-intc.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/interrupt-controller/kontron,sl28cpld-intc.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Interrupt controller driver for the sl28cpld board management controller | ||
|
||
maintainers: | ||
- Michael Walle <[email protected]> | ||
|
||
description: | | ||
This module is part of the sl28cpld multi-function device. For more | ||
details see ../mfd/kontron,sl28cpld.yaml. | ||
The following interrupts are available. All types and levels are fixed | ||
and handled by the board management controller. | ||
==== ============= ================================== | ||
IRQ line/device description | ||
==== ============= ================================== | ||
0 RTC_INT# Interrupt line from on-board RTC | ||
1 SMB_ALERT# Event on SMB_ALERT# line (P1) | ||
2 ESPI_ALERT0# Event on ESPI_ALERT0# line (S43) | ||
3 ESPI_ALERT1# Event on ESPI_ALERT1# line (S44) | ||
4 PWR_BTN# Event on PWR_BTN# line (P128) | ||
5 SLEEP# Event on SLEEP# line (S149) | ||
6 watchdog Interrupt of the internal watchdog | ||
7 n/a not used | ||
==== ============= ================================== | ||
properties: | ||
compatible: | ||
enum: | ||
- kontron,sl28cpld-intc | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
interrupts: | ||
maxItems: 1 | ||
|
||
"#interrupt-cells": | ||
const: 2 | ||
|
||
interrupt-controller: true | ||
|
||
required: | ||
- compatible | ||
- interrupts | ||
- "#interrupt-cells" | ||
- interrupt-controller | ||
|
||
additionalProperties: false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/mfd/ene-kb3930.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: ENE KB3930 Embedded Controller bindings | ||
|
||
description: | | ||
This binding describes the ENE KB3930 Embedded Controller attached to an | ||
I2C bus. | ||
maintainers: | ||
- Lubomir Rintel <[email protected]> | ||
|
||
properties: | ||
compatible: | ||
items: | ||
- enum: | ||
- dell,wyse-ariel-ec # Dell Wyse Ariel board (3020) | ||
- const: ene,kb3930 | ||
reg: | ||
maxItems: 1 | ||
|
||
off-gpios: | ||
description: GPIO used with the shutdown protocol on Ariel | ||
maxItems: 2 | ||
|
||
system-power-controller: true | ||
|
||
required: | ||
- compatible | ||
- reg | ||
|
||
additionalProperties: false | ||
|
||
examples: | ||
- | | ||
#include <dt-bindings/gpio/gpio.h> | ||
i2c { | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
embedded-controller@58 { | ||
compatible = "dell,wyse-ariel-ec", "ene,kb3930"; | ||
reg = <0x58>; | ||
system-power-controller; | ||
off-gpios = <&gpio 126 GPIO_ACTIVE_HIGH>, | ||
<&gpio 127 GPIO_ACTIVE_HIGH>; | ||
}; | ||
}; | ||
... |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.