summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-05-03 18:09:38 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-05-03 18:09:38 +0200
commit9a552e271e0ddf0911773cf34b28d11ebb96b1da (patch)
tree849e1f6e74ba6a11e0cb2cea9d2d5c8aa72f28de /Documentation
parent161027367ed640e54da51f5620864e252a02c65e (diff)
parent7cc10c5cb14397d61d203d0a319ef796d4f6d943 (diff)
Merge tag 'gnss-5.2-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss into char-misc-next
Johan writes: GNSS updates for 5.2-rc1 Here are the GNSS updates for 5.2-rc1; only a new u-blox compatible. All have been in linux-next with no reported issues. Signed-off-by: Johan Hovold <johan@kernel.org> * tag 'gnss-5.2-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss: gnss: ubx: add u-blox,neo-6m compatible dt-bindings: gnss: add u-blox,neo-6m compatible
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/gnss/u-blox.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/gnss/u-blox.txt b/Documentation/devicetree/bindings/gnss/u-blox.txt
index e475659cb85f..7cdefd058fe0 100644
--- a/Documentation/devicetree/bindings/gnss/u-blox.txt
+++ b/Documentation/devicetree/bindings/gnss/u-blox.txt
@@ -9,6 +9,7 @@ Required properties:
- compatible : Must be one of
+ "u-blox,neo-6m"
"u-blox,neo-8"
"u-blox,neo-m8"