Commit 9a552e27 authored May 03, 2019 by 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: 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

parents 16102736 7cc10c5c

Documentation/devicetree/bindings/gnss/u-blox.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@ Required properties:

		- compatible : Must be one of

		"u-blox,neo-6m"
		"u-blox,neo-8"
		"u-blox,neo-m8"

drivers/gnss/ubx.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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" },
		{},

Admin message