kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

HSI changes for the v3.16 series:

Browse source 
- Add some documentation for the HSI subsystem
 
  - Add Device Tree support for the HSI subsystem
 
  - Add OMAP3 SSI driver (SSI is a legacy variant of HSI)
 
  - Add Nokia N900 Modem driver (without speech support for now)
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCgAGBQJTjFVyAAoJENju1/PIO/qa9hYP/05KC3tOWJoyDZYnHhws2nnS
 4ZG33syQhTTCJXU7TtT8enSWmSgo9nAts0gdmYIO5IgPJpuPEgybFM61rdMNDOI/
 2wKz1GrCyTNNCg+AW/tm7zIMWN873ikOb82LMu68w/BeFClUpCPuTLpwHNgneR56
 O2cS8twAlykuXV/T+poC4Hgr86iIes2xo6ZkjBl9xzdgIZ93gQ1z4dKyJbkh31OT
 UrWS2oAnekpo+RE+EsMQCCoLwC28/iEMjoLy0SvbRWX/GH90gsQDSKYEVWL4fhxs
 cNmVir3ySE+BPVcf78Qr8RocRYdFvWp15Z4qdman+RGsrCYVr/EvugViLxpO1D4O
 4jCrEvTI8nAEh2CQaCYEwWY+CyB/brS4/hoXRmvskiR+TswmyAAFXap6VtYEzDBz
 u1dmJYk2IDSpGdE3qRn9uaV5BW7vn040viZERS5UakqTn4ZDpG4S/x1yJf7wSbHf
 oLgpnBMdwv1/S6GhaqhALKSjz4nibB9lkhF2NqqzhMk0j60JvRpksYNqg4xQjQJS
 q7IXFZNBhW3LJFbOpRqycrsE0wQJX8xOdtHQzCjKqmDzSMwTIXjDXTLbTiaSB1f2
 lOf382SvEEBvDkr4Q+5UbacjQ/4XkDuIBcMTA+migc7I1ADg7x2KS/z8EBtxEOHg
 VmCbI0PSxf6kFfFDQdg6
 =zesq
 -----END PGP SIGNATURE-----

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

Pull HSI (High Speed Syncronous Interface) changes from Sebastian Reichel:
 "Please pull the following changes for the HSI subsystem, which I have
  taken over from Carlos Chinea <carlos.chinea@nokia.com>.

  The below patches have been worked on in the linux-omap mailinglist
  for 10 months and are well tested in linux-next (have been in there
  for more than two weeks) without any problems arising.  Apart from
  that potential regressions are very limited, because the subsystem is
  not yet used by any platform in the mainline kernel.

   - Add some documentation for the HSI subsystem

   - Add Device Tree support for the HSI subsystem

   - Add OMAP3 SSI driver (SSI is a legacy variant of HSI)

   - Add Nokia N900 Modem driver (without speech support for now)"

* tag 'hsi-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
  HSI: Introduce Nokia N900 modem driver
  HSI: Introduce driver for SSI Protocol
  Documentation: DT: omap-ssi binding documentation
  HSI: Introduce OMAP SSI driver
  HSI: Add common DT binding for HSI client devices
  HSI: export method to (un)register clients
  HSI: Add channel resource support to HSI clients
  HSI: method to unregister clients from an hsi port
  HSI: hsi-char: fix driver for multiport scenarios
  MAINTAINERS: update HSI entry
  Documentation: HSI: Add some general description for the HSI subsystem
This commit is contained in:
Linus Torvalds 2014-06-02 09:13:58 -07:00
commit c9733c79f4
21 changed files with 4513 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

39
include/linux/hsi/hsi.h
View file

@ -67,18 +67,32 @@ enum {
HSI_EVENT_STOP_RX,
};
/**
* struct hsi_channel - channel resource used by the hsi clients
* @id: Channel number
* @name: Channel name
*/
struct hsi_channel {
unsigned int id;
const char *name;
};
/**
* struct hsi_config - Configuration for RX/TX HSI modules
* @mode: Bit transmission mode (STREAM or FRAME)
* @channels: Number of channels to use [1..16]
* @channels: Channel resources used by the client
* @num_channels: Number of channel resources
* @num_hw_channels: Number of channels the transceiver is configured for [1..16]
* @speed: Max bit transmission speed (Kbit/s)
* @flow: RX flow type (SYNCHRONIZED or PIPELINE)
* @arb_mode: Arbitration mode for TX frame (Round robin, priority)
*/
struct hsi_config {
unsigned int mode;
unsigned int channels;
unsigned int speed;
unsigned int mode;
struct hsi_channel *channels;
unsigned int num_channels;
unsigned int num_hw_channels;
unsigned int speed;
union {
unsigned int flow; /* RX only */
unsigned int arb_mode; /* TX only */
@ -282,6 +296,21 @@ struct hsi_controller *hsi_alloc_controller(unsigned int n_ports, gfp_t flags);
void hsi_put_controller(struct hsi_controller *hsi);
int hsi_register_controller(struct hsi_controller *hsi);
void hsi_unregister_controller(struct hsi_controller *hsi);
struct hsi_client *hsi_new_client(struct hsi_port *port,
struct hsi_board_info *info);
int hsi_remove_client(struct device *dev, void *data);
void hsi_port_unregister_clients(struct hsi_port *port);
#ifdef CONFIG_OF
void hsi_add_clients_from_dt(struct hsi_port *port,
struct device_node *clients);
#else
static inline void hsi_add_clients_from_dt(struct hsi_port *port,
struct device_node *clients)
{
return;
}
#endif
static inline void hsi_controller_set_drvdata(struct hsi_controller *hsi,
void *data)
@ -305,6 +334,8 @@ static inline struct hsi_port *hsi_find_port_num(struct hsi_controller *hsi,
*/
int hsi_async(struct hsi_client *cl, struct hsi_msg *msg);
int hsi_get_channel_id_by_name(struct hsi_client *cl, char *name);
/**
* hsi_id - Get HSI controller ID associated to a client
* @cl: Pointer to a HSI client

42
include/linux/hsi/ssi_protocol.h Normal file
View file

@ -0,0 +1,42 @@
/*
* ssip_slave.h
*
* SSIP slave support header file
*
* Copyright (C) 2010 Nokia Corporation. All rights reserved.
*
* Contact: Carlos Chinea <carlos.chinea@nokia.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* version 2 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA
*/
#ifndef __LINUX_SSIP_SLAVE_H__
#define __LINUX_SSIP_SLAVE_H__
#include <linux/hsi/hsi.h>
static inline void ssip_slave_put_master(struct hsi_client *master)
{
}
struct hsi_client *ssip_slave_get_master(struct hsi_client *slave);
int ssip_slave_start_tx(struct hsi_client *master);
int ssip_slave_stop_tx(struct hsi_client *master);
void ssip_reset_event(struct hsi_client *master);
int ssip_slave_running(struct hsi_client *master);
#endif /* __LINUX_SSIP_SLAVE_H__ */