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

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

Merge tag 'gnss-5.1-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss

 into char-misc-next

Johan writes:

GNSS updates for 5.1-rc1

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

 - a new driver for Mediatek-based receivers
 - support for SiRF receivers without a wakeup signal
 - support for a separate LNA supply for SiRF receivers

Included are also various clean ups and minor fixes.

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

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>

* tag 'gnss-5.1-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss:
  gnss: add driver for mediatek receivers
  gnss: add mtk receiver type support
  dt-bindings: gnss: add mediatek binding
  dt-bindings: Add vendor prefix for "GlobalTop Technology, Inc."
  dt-bindings: gnss: add lna-supply property
  gnss: sirf: add a separate supply for a lna
  dt-bindings: gnss: add w2sg0004 compatible string
  gnss: sirf: add support for configurations without wakeup signal
  gnss: sirf: write data to gnss only when the gnss device is open
  gnss: sirf: drop redundant double negation
  gnss: sirf: force hibernate mode on probe
  gnss: sirf: fix premature wakeup interrupt enable
parents 7f2b8af2 d4584bbf

Documentation/devicetree/bindings/gnss/gnss.txt

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ Required properties: 
		  represents



Optional properties:

- lna-supply	: Separate supply for an LNA

- enable-gpios	: GPIO used to enable the device

- timepulse-gpios	: Time pulse GPIO

Documentation/devicetree/bindings/gnss/mediatek.txt

0 → 100644
+35 −0
Original line number Diff line number Diff line 
Mediatek-based GNSS Receiver DT binding



Mediatek chipsets are used in GNSS-receiver modules produced by several

vendors and can use a UART interface.



Please see Documentation/devicetree/bindings/gnss/gnss.txt for generic

properties.



Required properties:



- compatible	: Must be



			"globaltop,pa6h"



- vcc-supply	: Main voltage regulator (pin name: VCC)



Optional properties:



- current-speed		: Default UART baud rate

- gnss-fix-gpios	: GPIO used to determine device position fix state

			  (pin name: FIX, 3D_FIX)

- reset-gpios		: GPIO used to reset the device (pin name: RESET, NRESET)

- timepulse-gpios	: Time pulse GPIO (pin name: PPS1, 1PPS)

- vbackup-supply	: Backup voltage regulator (pin name: VBAT, VBACKUP)



Example:



serial@1234 {

	compatible = "ns16550a";



	gnss {

		compatible = "globaltop,pa6h";

		vcc-supply = <&vcc_3v3>;

	};

};

Documentation/devicetree/bindings/gnss/sirfstar.txt

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ Required properties: 


			"fastrax,uc430"

			"linx,r4"

			"wi2wi,w2sg0004"

			"wi2wi,w2sg0008i"

			"wi2wi,w2sg0084i"

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ geniatech Geniatech, Inc. 
giantec	Giantec Semiconductor, Inc.

giantplus	Giantplus Technology Co., Ltd.

globalscale	Globalscale Technologies, Inc.

globaltop	GlobalTop Technology, Inc.

gmt	Global Mixed-mode Technology, Inc.

goodix	Shenzhen Huiding Technology Co., Ltd.

google	Google, Inc.

drivers/gnss/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -15,6 +15,19 @@ if GNSS 
config GNSS_SERIAL

	tristate



config GNSS_MTK_SERIAL

	tristate "Mediatek GNSS receiver support"

	depends on SERIAL_DEV_BUS

	select GNSS_SERIAL

	help

	  Say Y here if you have a Mediatek-based GNSS receiver which uses a

	  serial interface.



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

	  be called gnss-mtk.



	  If unsure, say N.



config GNSS_SIRF_SERIAL

	tristate "SiRFstar GNSS receiver support"

	depends on SERIAL_DEV_BUS

CRA Git | Maintained and supported by SUSTech CRA and CCSE