Commit 9a552e27 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Merge tag 'gnss-5.2-rc1' of...

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: default avatarJohan 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
parents 16102736 7cc10c5c
...@@ -9,6 +9,7 @@ Required properties: ...@@ -9,6 +9,7 @@ Required properties:
- compatible : Must be one of - compatible : Must be one of
"u-blox,neo-6m"
"u-blox,neo-8" "u-blox,neo-8"
"u-blox,neo-m8" "u-blox,neo-m8"
......
...@@ -130,6 +130,7 @@ static void ubx_remove(struct serdev_device *serdev) ...@@ -130,6 +130,7 @@ static void ubx_remove(struct serdev_device *serdev)
#ifdef CONFIG_OF #ifdef CONFIG_OF
static const struct of_device_id ubx_of_match[] = { static const struct of_device_id ubx_of_match[] = {
{ .compatible = "u-blox,neo-6m" },
{ .compatible = "u-blox,neo-8" }, { .compatible = "u-blox,neo-8" },
{ .compatible = "u-blox,neo-m8" }, { .compatible = "u-blox,neo-m8" },
{}, {},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment