Skip to content

Commit

Permalink
Merge tag 'mfd-next-6.14' of git://git.kernel.org/pub/scm/linux/kerne…
Browse files Browse the repository at this point in the history
…l/git/lee/mfd

Pull mfd updates from Lee Jones:

 - Fix race in device_node_get_regmap() using more extensive locking

 - Remove unused platform driver support for syscon

 - Allow syscon nodes to be registered without a "syscon" compatible
   string

 - Make `platform_data` pointer const in struct mfd_cell

 - Revert support for multiple AXP PMICs to avoid regressions

 - Increase SoundWire attach timeout and use gpiod_set_raw() for GPIO
   operation

 - Store the result from fault_log() for use by other sub-components

 - Fix an invalid regmap-config max_register value

 - Add another Gemini Lake ISA bridge PCI device ID

 - Use devm_register_power_off_handler() to simplify code

 - Add support for QNAP microcontroller units, including LEDs, input,
   and hwmon

 - Use MFD_CELL macros and remove unused code

 - Add support for AAEON UP board FPGA

 - Remove unused includes

 - Fix various typos and compatibility issues in multiple bindings

 - Add new bindings for rk3562 QoS, LED1202, and qcom,tcsr-ipq5424

 - Convert several bindings to YAML schema

 - Update sprd,sc2731 bindings to reference sprd,sc2731-efuse bindings
   directly

 - Fix rohm,bd71815 bindings by correcting resistor values and typos

 - Documentation improvements:
    - Add documentation for LED1202 and qnap-mcu-hwmon
    - Adjust the file entry for the qnap-mcu header in MAINTAINERS

* tag 'mfd-next-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (35 commits)
  MAINTAINERS: Adjust the file entry for the qnap-mcu header
  dt-bindings: mfd: syscon: Fix ti,j784s4-acspcie-proxy-ctrl compatible
  dt-bindings: mfd: syscon: Fix al,alpine-sysfabric-service compatible
  Revert "mfd: axp20x: Allow multiple regulators"
  dt-bindings: mfd: syscon: Add rk3562 QoS register compatible
  mfd: syscon: Allow syscon nodes without a "syscon" compatible
  mfd: syscon: Remove the platform driver support
  mfd: syscon: Fix race in device_node_get_regmap()
  dt-bindings: mfd: atmel: Convert to YAML schema
  dt-bindings: mfd: atmel,at91sam9260: Convert to YAML schema
  dt-bindings: mfd: sprd,sc2731: Reference sprd,sc2731-efuse bindings
  mfd: tps65219: Remove unused macros & add regmap.h
  mfd: tps65219: Use MFD_CELL macros
  leds: Add LED1202 I2C driver
  dt-bindings: leds: Add LED1202 LED Controller
  Documentation:leds: Add leds-st1202.rst
  mfd: Add support for AAEON UP board FPGA
  mfd: da9052: Store result from fault_log
  mfd: intel_soc_pmic_chtdc_ti: Fix invalid regmap-config max_register value
  mfd: cs42l43: Use devres for remove as well
  ...
  • Loading branch information
Linus Torvalds committed Jan 22, 2025
2 parents 38f5265 + 2816b0c commit 909fd2b
Show file tree
Hide file tree
Showing 49 changed files with 2,407 additions and 254 deletions.
132 changes: 132 additions & 0 deletions Documentation/devicetree/bindings/leds/st,led1202.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
%YAML 1.2
---
$id: http://devicetree.org/schemas/leds/st,led1202.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: ST LED1202 LED controllers

maintainers:
- Vicentiu Galanopulo <vicentiu.galanopulo@remote-tech.co.uk>

description: |
The LED1202 is a 12-channel low quiescent current LED controller
programmable via I2C; The output current can be adjusted separately
for each channel by 8-bit analog and 12-bit digital dimming control.
Datasheet available at
https://www.st.com/en/power-management/led1202.html
properties:
compatible:
const: st,led1202

reg:
maxItems: 1

"#address-cells":
const: 1

"#size-cells":
const: 0

patternProperties:
"^led@[0-9a-f]$":
type: object
$ref: common.yaml#
unevaluatedProperties: false

properties:
reg:
minimum: 0
maximum: 11

required:
- reg

required:
- compatible
- reg
- "#address-cells"
- "#size-cells"

additionalProperties: false

examples:
- |
#include <dt-bindings/leds/common.h>
i2c {
#address-cells = <1>;
#size-cells = <0>;
led-controller@58 {
compatible = "st,led1202";
reg = <0x58>;
#address-cells = <1>;
#size-cells = <0>;
led@0 {
reg = <0x0>;
function = LED_FUNCTION_STATUS;
color = <LED_COLOR_ID_RED>;
function-enumerator = <1>;
};
led@1 {
reg = <0x1>;
function = LED_FUNCTION_STATUS;
color = <LED_COLOR_ID_GREEN>;
function-enumerator = <2>;
};
led@2 {
reg = <0x2>;
function = LED_FUNCTION_STATUS;
color = <LED_COLOR_ID_BLUE>;
function-enumerator = <3>;
};
led@3 {
reg = <0x3>;
function = LED_FUNCTION_STATUS;
color = <LED_COLOR_ID_RED>;
function-enumerator = <4>;
};
led@4 {
reg = <0x4>;
function = LED_FUNCTION_STATUS;
color = <LED_COLOR_ID_GREEN>;
function-enumerator = <5>;
};
led@5 {
reg = <0x5>;
function = LED_FUNCTION_STATUS;
color = <LED_COLOR_ID_BLUE>;
function-enumerator = <6>;
};
led@6 {
reg = <0x6>;
function = LED_FUNCTION_STATUS;
color = <LED_COLOR_ID_RED>;
function-enumerator = <7>;
};
led@7 {
reg = <0x7>;
function = LED_FUNCTION_STATUS;
color = <LED_COLOR_ID_GREEN>;
function-enumerator = <8>;
};
led@8 {
reg = <0x8>;
function = LED_FUNCTION_STATUS;
color = <LED_COLOR_ID_BLUE>;
function-enumerator = <9>;
};
};
};
...
44 changes: 44 additions & 0 deletions Documentation/devicetree/bindings/mfd/atmel,at91sam9260-gpbr.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/mfd/atmel,at91sam9260-gpbr.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Microchip AT91 General Purpose Backup Registers

maintainers:
- Nicolas Ferre <nicolas.ferre@microchip.com>

description:
The system controller embeds 256 bits of General Purpose Backup
registers organized as 8 32-bit registers.

properties:
compatible:
oneOf:
- items:
- enum:
- atmel,at91sam9260-gpbr
- const: syscon
- items:
- enum:
- microchip,sam9x60-gpbr
- microchip,sam9x7-gpbr
- const: atmel,at91sam9260-gpbr
- const: syscon

reg:
maxItems: 1

required:
- compatible
- reg

additionalProperties: false

examples:
- |
syscon@fffffd50 {
compatible = "atmel,at91sam9260-gpbr", "syscon";
reg = <0xfffffd50 0x10>;
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/mfd/atmel,at91sam9260-matrix.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Microchip AT91 Bus Matrix

maintainers:
- Nicolas Ferre <nicolas.ferre@microchip.com>

description:
The Bus Matrix (MATRIX) implements a multi-layer AHB, based on the
AHB-Lite protocol, that enables parallel access paths between multiple
masters and slaves in a system, thus increasing the overall bandwidth.

properties:
compatible:
oneOf:
- items:
- enum:
- atmel,at91sam9260-matrix
- atmel,at91sam9261-matrix
- atmel,at91sam9263-matrix
- atmel,at91sam9rl-matrix
- atmel,at91sam9g45-matrix
- atmel,at91sam9n12-matrix
- atmel,at91sam9x5-matrix
- atmel,sama5d3-matrix
- const: syscon
- items:
- enum:
- microchip,sam9x60-matrix
- microchip,sam9x7-matrix
- const: atmel,at91sam9x5-matrix
- const: syscon

reg:
maxItems: 1

required:
- compatible
- reg

additionalProperties: false

examples:
- |
syscon@ffffec00 {
compatible = "atmel,sama5d3-matrix", "syscon";
reg = <0xffffec00 0x200>;
};
18 changes: 0 additions & 18 deletions Documentation/devicetree/bindings/mfd/atmel-gpbr.txt

This file was deleted.

26 changes: 0 additions & 26 deletions Documentation/devicetree/bindings/mfd/atmel-matrix.txt

This file was deleted.

1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ properties:
- qcom,tcsr-apq8064
- qcom,tcsr-apq8084
- qcom,tcsr-ipq5332
- qcom,tcsr-ipq5424
- qcom,tcsr-ipq6018
- qcom,tcsr-ipq8064
- qcom,tcsr-ipq8074
Expand Down
42 changes: 42 additions & 0 deletions Documentation/devicetree/bindings/mfd/qnap,ts433-mcu.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/mfd/qnap,ts433-mcu.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: QNAP NAS on-board Microcontroller

maintainers:
- Heiko Stuebner <heiko@sntech.de>

description:
QNAP embeds a microcontroller on their NAS devices adding system feature
as PWM Fan control, additional LEDs, power button status and more.

properties:
compatible:
enum:
- qnap,ts433-mcu

patternProperties:
"^fan-[0-9]+$":
$ref: /schemas/hwmon/fan-common.yaml#
unevaluatedProperties: false

required:
- compatible

additionalProperties: false

examples:
- |
uart {
mcu {
compatible = "qnap,ts433-mcu";
fan-0 {
#cooling-cells = <2>;
cooling-levels = <0 64 89 128 166 204 221 238>;
};
};
};
20 changes: 10 additions & 10 deletions Documentation/devicetree/bindings/mfd/rohm,bd71815-pmic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ properties:
minimum: 0
maximum: 1

rohm,charger-sense-resistor-ohms:
minimum: 10000000
maximum: 50000000
rohm,charger-sense-resistor-micro-ohms:
minimum: 10000
maximum: 50000
description: |
BD71827 and BD71828 have SAR ADC for measuring charging currents.
External sense resistor (RSENSE in data sheet) should be used. If
something other but 30MOhm resistor is used the resistance value
should be given here in Ohms.
default: 30000000
BD71815 has SAR ADC for measuring charging currents. External sense
resistor (RSENSE in data sheet) should be used. If something other
but a 30 mOhm resistor is used the resistance value should be given
here in micro Ohms.
default: 30000

regulators:
$ref: /schemas/regulator/rohm,bd71815-regulator.yaml
Expand All @@ -67,7 +67,7 @@ properties:

gpio-reserved-ranges:
description: |
Usage of BD71828 GPIO pins can be changed via OTP. This property can be
Usage of BD71815 GPIO pins can be changed via OTP. This property can be
used to mark the pins which should not be configured for GPIO. Please see
the ../gpio/gpio.txt for more information.
Expand Down Expand Up @@ -113,7 +113,7 @@ examples:
gpio-controller;
#gpio-cells = <2>;
rohm,charger-sense-resistor-ohms = <10000000>;
rohm,charger-sense-resistor-micro-ohms = <10000>;
regulators {
buck1: buck1 {
Expand Down
12 changes: 2 additions & 10 deletions Documentation/devicetree/bindings/mfd/sprd,sc2731.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,7 @@ patternProperties:

"^efuse@[0-9a-f]+$":
type: object
additionalProperties: true
properties:
compatible:
enum:
- sprd,sc2720-efuse
- sprd,sc2721-efuse
- sprd,sc2723-efuse
- sprd,sc2730-efuse
- sprd,sc2731-efuse
$ref: /schemas/nvmem/sprd,sc2731-efuse.yaml#

"^fuel-gauge@[0-9a-f]+$":
type: object
Expand Down Expand Up @@ -199,7 +191,7 @@ examples:
};
};
adc@480 {
pmic_adc: adc@480 {
compatible = "sprd,sc2731-adc";
reg = <0x480>;
interrupt-parent = <&sc2731_pmic>;
Expand Down
Loading

0 comments on commit 909fd2b

Please sign in to comment.