Commit d47c7407 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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

Merge tag 'gnss-5.17-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss into char-misc-next

Johan writes:

GNSS updates for 5.17-rc1

Here are the GNSS updates for 5.17-rc1, including:

 - support for GNSS receivers with USB interface
 - support for Sierra Wireless XM1210

All have been in linux-next with no reported issues.

* tag 'gnss-5.17-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss:
  gnss: usb: add support for Sierra Wireless XM1210
  gnss: add USB support
  gnss: drop stray semicolons
parents 663d8fb0 547d2167

drivers/gnss/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -54,4 +54,15 @@ config GNSS_UBX_SERIAL 


	  If unsure, say N.



config GNSS_USB

	tristate "USB GNSS receiver support"

	depends on USB

	help

	  Say Y here if you have a GNSS receiver which uses a USB interface.



	  To compile this driver as a module, choose M here: the module will

	  be called gnss-usb.



	  If unsure, say N.



endif # GNSS

drivers/gnss/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -17,3 +17,6 @@ gnss-sirf-y := sirf.o 


obj-$(CONFIG_GNSS_UBX_SERIAL)		+= gnss-ubx.o

gnss-ubx-y := ubx.o



obj-$(CONFIG_GNSS_USB)			+= gnss-usb.o

gnss-usb-y := usb.o

drivers/gnss/mtk.c

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static void mtk_remove(struct serdev_device *serdev) 
	if (data->vbackup)

		regulator_disable(data->vbackup);

	gnss_serial_free(gserial);

};

}



#ifdef CONFIG_OF

static const struct of_device_id mtk_of_match[] = {

drivers/gnss/serial.c

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ void gnss_serial_free(struct gnss_serial *gserial) 
{

	gnss_put_device(gserial->gdev);

	kfree(gserial);

};

}

EXPORT_SYMBOL_GPL(gnss_serial_free);



int gnss_serial_register(struct gnss_serial *gserial)

drivers/gnss/sirf.c

+1 −1
Original line number Diff line number Diff line
@@ -551,7 +551,7 @@ static void sirf_remove(struct serdev_device *serdev) 
		regulator_disable(data->vcc);



	gnss_put_device(data->gdev);

};

}



#ifdef CONFIG_OF

static const struct of_device_id sirf_of_match[] = {