Skip to content

Commit 6d84c25

Browse files
committed
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
2 parents 0981794 + 917c362 commit 6d84c25

File tree

3 files changed

+7
-16
lines changed

3 files changed

+7
-16
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ description: |
1313
This module is part of the MT6370 MFD device.
1414
Add MT6370 LED driver include 4-channel RGB LED support Register/PWM/Breath Mode
1515
16-
allOf:
17-
- $ref: leds-class-multicolor.yaml#
18-
1916
properties:
2017
compatible:
2118
const: mediatek,mt6370-indicator
@@ -29,6 +26,8 @@ properties:
2926
patternProperties:
3027
"^multi-led@[0-3]$":
3128
type: object
29+
$ref: leds-class-multicolor.yaml#
30+
unevaluatedProperties: false
3231

3332
properties:
3433
reg:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ examples:
139139
140140
charger {
141141
compatible = "mediatek,mt6370-charger";
142-
interrupts = <48>, <68>, <6>;
143-
interrupt-names = "attach_i", "uvp_d_evt", "mivr";
142+
interrupts = <68>, <48>, <6>;
143+
interrupt-names = "uvp_d_evt", "attach_i", "mivr";
144144
io-channels = <&mt6370_adc MT6370_CHAN_IBUS>;
145145
146146
mt6370_otg_vbus: usb-otg-vbus-regulator {

MAINTAINERS

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15359,17 +15359,6 @@ L: [email protected]
1535915359
S: Supported
1536015360
F: drivers/infiniband/ulp/opa_vnic
1536115361

15362-
OPEN FIRMWARE AND DEVICE TREE OVERLAYS
15363-
M: Pantelis Antoniou <[email protected]>
15364-
M: Frank Rowand <[email protected]>
15365-
15366-
S: Maintained
15367-
F: Documentation/devicetree/dynamic-resolution-notes.rst
15368-
F: Documentation/devicetree/overlay-notes.rst
15369-
F: drivers/of/overlay.c
15370-
F: drivers/of/resolver.c
15371-
K: of_overlay_notifier_
15372-
1537315362
OPEN FIRMWARE AND FLATTENED DEVICE TREE
1537415363
M: Rob Herring <[email protected]>
1537515364
M: Frank Rowand <[email protected]>
@@ -15382,6 +15371,9 @@ F: Documentation/ABI/testing/sysfs-firmware-ofw
1538215371
F: drivers/of/
1538315372
F: include/linux/of*.h
1538415373
F: scripts/dtc/
15374+
K: of_overlay_notifier_
15375+
K: of_overlay_fdt_apply
15376+
K: of_overlay_remove
1538515377

1538615378
OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
1538715379
M: Rob Herring <[email protected]>

0 commit comments

Comments
 (0)