diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-03 18:09:38 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-03 18:09:38 +0200 |
| commit | 9a552e271e0ddf0911773cf34b28d11ebb96b1da (patch) | |
| tree | 849e1f6e74ba6a11e0cb2cea9d2d5c8aa72f28de | |
| parent | Merge tag 'misc-habanalabs-next-2019-05-03' of git://people.freedesktop.org/~gabbayo/linux into char-misc-next (diff) | |
| parent | gnss: ubx: add u-blox,neo-6m compatible (diff) | |
| download | wireguard-linux-9a552e271e0ddf0911773cf34b28d11ebb96b1da.tar.xz wireguard-linux-9a552e271e0ddf0911773cf34b28d11ebb96b1da.zip | |
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
| -rw-r--r-- | Documentation/devicetree/bindings/gnss/u-blox.txt | 1 | ||||
| -rw-r--r-- | drivers/gnss/ubx.c | 1 |
2 files changed, 2 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" diff --git a/drivers/gnss/ubx.c b/drivers/gnss/ubx.c index 12568aebb7f6..7b05bc40532e 100644 --- a/drivers/gnss/ubx.c +++ b/drivers/gnss/ubx.c @@ -130,6 +130,7 @@ static void ubx_remove(struct serdev_device *serdev) #ifdef CONFIG_OF static const struct of_device_id ubx_of_match[] = { + { .compatible = "u-blox,neo-6m" }, { .compatible = "u-blox,neo-8" }, { .compatible = "u-blox,neo-m8" }, {}, |