diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-13 12:22:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-13 12:22:42 -0700 |
| commit | 6d84c258e804db1983e70803af8be64bc8cb9a65 (patch) | |
| tree | 5d1a6f6ef83c1ae532d3ffbee41c0af970f8e799 /Documentation | |
| parent | 098179413d07392ad8c52c7c7605d3d3886ef569 (diff) | |
| parent | 917c362b5f8a6e31ff35719b1bacfc1b76a1fd2f (diff) | |
| download | linux-stable-6d84c258e804db1983e70803af8be64bc8cb9a65.tar.gz linux-stable-6d84c258e804db1983e70803af8be64bc8cb9a65.tar.bz2 linux-stable-6d84c258e804db1983e70803af8be64bc8cb9a65.zip | |
Merge tag 'devicetree-fixes-for-6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree fixes from Rob Herring:
- Fixes for Mediatek MT6370 binding
- Merge the DT overlay maintainer entry to the main entry as Pantelis
is not active and Frank is taking a step back
* tag 'devicetree-fixes-for-6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
MAINTAINERS: of: collapse overlay entry into main device tree entry
dt-bindings: mfd: mt6370: fix the interrupt order of the charger in the example
dt-bindings: leds: mt6370: Fix MT6370 LED indicator DT warning
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/leds/mediatek,mt6370-indicator.yaml | 5 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/mediatek,mt6370.yaml | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/Documentation/devicetree/bindings/leds/mediatek,mt6370-indicator.yaml b/Documentation/devicetree/bindings/leds/mediatek,mt6370-indicator.yaml index 204b103ffc2c..16b3abc2af3a 100644 --- a/Documentation/devicetree/bindings/leds/mediatek,mt6370-indicator.yaml +++ b/Documentation/devicetree/bindings/leds/mediatek,mt6370-indicator.yaml @@ -13,9 +13,6 @@ description: | This module is part of the MT6370 MFD device. Add MT6370 LED driver include 4-channel RGB LED support Register/PWM/Breath Mode -allOf: - - $ref: leds-class-multicolor.yaml# - properties: compatible: const: mediatek,mt6370-indicator @@ -29,6 +26,8 @@ properties: patternProperties: "^multi-led@[0-3]$": type: object + $ref: leds-class-multicolor.yaml# + unevaluatedProperties: false properties: reg: diff --git a/Documentation/devicetree/bindings/mfd/mediatek,mt6370.yaml b/Documentation/devicetree/bindings/mfd/mediatek,mt6370.yaml index 250484d59ecd..5644882db2e8 100644 --- a/Documentation/devicetree/bindings/mfd/mediatek,mt6370.yaml +++ b/Documentation/devicetree/bindings/mfd/mediatek,mt6370.yaml @@ -139,8 +139,8 @@ examples: charger { compatible = "mediatek,mt6370-charger"; - interrupts = <48>, <68>, <6>; - interrupt-names = "attach_i", "uvp_d_evt", "mivr"; + interrupts = <68>, <48>, <6>; + interrupt-names = "uvp_d_evt", "attach_i", "mivr"; io-channels = <&mt6370_adc MT6370_CHAN_IBUS>; mt6370_otg_vbus: usb-otg-vbus-regulator { |