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

Commit b1a808ff authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi 

Pull HSI (High Speed Synchronous Serial Interface) framework from Carlos Chinea:
 "The High Speed Synchronous Serial Interface (HSI) is a serial
  interface mainly used for connecting application engines (APE) with
  cellular modem engines (CMT) in cellular handsets.

  The framework is currently being used for some people and we would
  like to see it integrated into the kernel for 3.3.  There is no HW
  controller drivers in this pull, but some people have already some of
  them pending which they would like to push as soon as this integrated.
  I am also working on the acceptance for an TI OMAP one, based on a
  compatible legacy version of the interface called SSI."

Ok, so it didn't get into 3.3, but here it is pulled into 3.4.

Several people piped up to say "yeah, we want this".

* 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi:
  HSI: hsi_char: Update ioctl-number.txt
  HSI: Add HSI API documentation
  HSI: hsi_char: Add HSI char device kernel configuration
  HSI: hsi_char: Add HSI char device driver
  HSI: hsi: Introducing HSI framework
parents 97754175 43139a61

Documentation/DocBook/device-drivers.tmpl

+17 −0
Original line number Diff line number Diff line
@@ -446,4 +446,21 @@ X!Idrivers/video/console/fonts.c 
!Edrivers/i2c/i2c-core.c

  </chapter>



  <chapter id="hsi">

     <title>High Speed Synchronous Serial Interface (HSI)</title>



     <para>

	High Speed Synchronous Serial Interface (HSI) is a

	serial interface mainly used for connecting application

	engines (APE) with cellular modem engines (CMT) in cellular

	handsets.



	HSI provides multiplexing for up to 16 logical channels,

	low-latency and full duplex communication.

     </para>



!Iinclude/linux/hsi/hsi.h

!Edrivers/hsi/hsi.c

  </chapter>



</book>

Documentation/ioctl/ioctl-number.txt

+1 −0
Original line number Diff line number Diff line
@@ -225,6 +225,7 @@ Code Seq#(hex) Include File Comments 
'j'	00-3F	linux/joystick.h

'k'	00-0F	linux/spi/spidev.h	conflict!

'k'	00-05	video/kyro.h		conflict!

'k'	10-17	linux/hsi/hsi_char.h	HSI character device

'l'	00-3F	linux/tcfs_fs.h		transparent cryptographic file system

					<http://web.archive.org/web/*/http://mikonos.dia.unisa.it/tcfs>

'l'	40-7F	linux/udf_fs_i.h	in development:

drivers/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ source "drivers/i2c/Kconfig" 


source "drivers/spi/Kconfig"



source "drivers/hsi/Kconfig"



source "drivers/pps/Kconfig"



source "drivers/ptp/Kconfig"

drivers/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ obj-$(CONFIG_ATA) += ata/ 
obj-$(CONFIG_TARGET_CORE)	+= target/

obj-$(CONFIG_MTD)		+= mtd/

obj-$(CONFIG_SPI)		+= spi/

obj-y				+= hsi/

obj-y				+= net/

obj-$(CONFIG_ATM)		+= atm/

obj-$(CONFIG_FUSION)		+= message/

drivers/hsi/Kconfig

0 → 100644
+19 −0
Original line number Diff line number Diff line 
#

# HSI driver configuration

#

menuconfig HSI

	tristate "HSI support"

	---help---

	  The "High speed synchronous Serial Interface" is

	  synchronous serial interface used mainly to connect

	  application engines and cellular modems.



if HSI



config HSI_BOARDINFO

	bool

	default y



source "drivers/hsi/clients/Kconfig"



endif # HSI