diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-31 11:46:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-31 11:46:02 -0700 |
| commit | cfc6d74523efdd36f5757927ac1c75629a6d8491 (patch) | |
| tree | a865aa604bb290602fb01508432d96e35f1bf503 | |
| parent | 02523d2d93b9c825dadc0f93cf77c1622cd64a86 (diff) | |
| parent | e326371f3002dbf54befd8ada9570fa489a46991 (diff) | |
Merge tag 'gnss-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss
Pull GNSS update from Johan Hovold:
"Here is a GNSS update adding a compatible string for a new u-blox
receiver"
* tag 'gnss-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss:
dt-bindings: gnss: u-blox: add u-blox,neo-9m compatible
| -rw-r--r-- | Documentation/devicetree/bindings/gnss/u-blox,neo-6m.yaml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/gnss/u-blox,neo-6m.yaml b/Documentation/devicetree/bindings/gnss/u-blox,neo-6m.yaml index 7d4b6d49e5ee..c0c2bfaa606f 100644 --- a/Documentation/devicetree/bindings/gnss/u-blox,neo-6m.yaml +++ b/Documentation/devicetree/bindings/gnss/u-blox,neo-6m.yaml @@ -18,10 +18,14 @@ description: > properties: compatible: - enum: - - u-blox,neo-6m - - u-blox,neo-8 - - u-blox,neo-m8 + oneOf: + - enum: + - u-blox,neo-6m + - u-blox,neo-8 + - u-blox,neo-m8 + - items: + - const: u-blox,neo-m9 + - const: u-blox,neo-m8 reg: description: > |