Commit 6d84c258 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 09817941 917c362b

Documentation/devicetree/bindings/leds/mediatek,mt6370-indicator.yaml

+2 −3
Original line number Diff line number Diff line
@@ -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:

Documentation/devicetree/bindings/mfd/mediatek,mt6370.yaml

+2 −2
Original line number Diff line number Diff line
@@ -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 {

MAINTAINERS

+3 −11
Original line number Diff line number Diff line
@@ -15359,17 +15359,6 @@ L: linux-rdma@vger.kernel.org 
S:	Supported

F:	drivers/infiniband/ulp/opa_vnic









OPEN FIRMWARE AND DEVICE TREE OVERLAYS









M:	Pantelis Antoniou <pantelis.antoniou@konsulko.com>









M:	Frank Rowand <frowand.list@gmail.com>









L:	devicetree@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/dynamic-resolution-notes.rst









F:	Documentation/devicetree/overlay-notes.rst









F:	drivers/of/overlay.c









F:	drivers/of/resolver.c









K:	of_overlay_notifier_

















OPEN FIRMWARE AND FLATTENED DEVICE TREE









M:	Rob Herring <robh+dt@kernel.org>









M:	Frank Rowand <frowand.list@gmail.com>








@@ -15382,6 +15371,9 @@ F:	Documentation/ABI/testing/sysfs-firmware-ofw







F:	drivers/of/









F:	include/linux/of*.h









F:	scripts/dtc/









K:	of_overlay_notifier_









K:	of_overlay_fdt_apply









K:	of_overlay_remove

















OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS









M:	Rob Herring <robh+dt@kernel.org>