Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 392b46f3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hsi-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi 

Pull HSI changes from Sebastian Reichel:

 - nokia-modem: support speech data
 - misc fixes

* tag 'hsi-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
  HSI: cmt_speech: fix error return code
  HSI: nokia-modem: Add cmt-speech support
  HSI: cmt_speech: Add cmt-speech driver
  HSI: nokia-modem: fix error return code
parents a21c1ea6 265ef3ee

drivers/hsi/clients/Kconfig

+11 −1
Original line number Diff line number Diff line
@@ -6,13 +6,23 @@ comment "HSI clients" 


config NOKIA_MODEM

	tristate "Nokia Modem"

	depends on HSI && SSI_PROTOCOL

	depends on HSI && SSI_PROTOCOL && CMT_SPEECH

	help

	Say Y here if you want to add support for the modem on Nokia

	N900 (Nokia RX-51) hardware.



	If unsure, say N.



config CMT_SPEECH

	tristate "CMT speech"

	depends on HSI && SSI_PROTOCOL

	help

	If you say Y here, you will enable the CMT speech protocol used

	by Nokia modems. If you say M the protocol will be available as

	module named cmt_speech.



	If unsure, say N.



config SSI_PROTOCOL

	tristate "SSI protocol"

	depends on HSI && PHONET && OMAP_SSI

drivers/hsi/clients/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,4 +4,5 @@ 


obj-$(CONFIG_NOKIA_MODEM)	+= nokia-modem.o

obj-$(CONFIG_SSI_PROTOCOL)	+= ssi_protocol.o

obj-$(CONFIG_CMT_SPEECH)	+= cmt_speech.o

obj-$(CONFIG_HSI_CHAR)		+= hsi_char.o