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

Commit 2f1522ec authored by Russ Gorby's avatar Russ Gorby Committed by Greg Kroah-Hartman
Browse files

serial: ifx6x60: expanded info available from platform data 



Some platform attributes (e.g. max_hz, use_dma) were being intuited
from the modem type. These things should be specified by the platform
data.

Added max_hz, use_dma to ifx_modem_platform_data definition,
replaced is_6160 w/ modem_type, and changed clients accordingly

Signed-off-by: default avatarRuss Gorby <russ.gorby@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a5f4dbf0

drivers/tty/serial/ifx6x60.c

+17 −16
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 *		      Jan Dumon <j.dumon@option.com>

 *

 * Copyright (C) 2009, 2010 Intel Corp

 * Russ Gorby <richardx.r.gorby@intel.com>

 * Russ Gorby <russ.gorby@intel.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
@@ -732,7 +732,7 @@ static void ifx_spi_io(unsigned long data) 
		/*

		 * setup dma pointers

		 */

		if (ifx_dev->is_6160) {

		if (ifx_dev->use_dma) {

			ifx_dev->spi_msg.is_dma_mapped = 1;

			ifx_dev->tx_dma = ifx_dev->tx_bus;

			ifx_dev->rx_dma = ifx_dev->rx_bus;
@@ -960,7 +960,7 @@ static int ifx_spi_spi_probe(struct spi_device *spi) 
{

	int ret;

	int srdy;

	struct ifx_modem_platform_data *pl_data = NULL;

	struct ifx_modem_platform_data *pl_data;

	struct ifx_spi_device *ifx_dev;



	if (saved_ifx_dev) {
@@ -968,6 +968,12 @@ static int ifx_spi_spi_probe(struct spi_device *spi) 
		return -ENODEV;

	}



	pl_data = (struct ifx_modem_platform_data *)spi->dev.platform_data;

	if (!pl_data) {

		dev_err(&spi->dev, "missing platform data!");

		return -ENODEV;

	}



	/* initialize structure to hold our device variables */

	ifx_dev = kzalloc(sizeof(struct ifx_spi_device), GFP_KERNEL);

	if (!ifx_dev) {
@@ -983,7 +989,9 @@ static int ifx_spi_spi_probe(struct spi_device *spi) 
	init_timer(&ifx_dev->spi_timer);

	ifx_dev->spi_timer.function = ifx_spi_timeout;

	ifx_dev->spi_timer.data = (unsigned long)ifx_dev;

	ifx_dev->is_6160 = pl_data->is_6160;

	ifx_dev->modem = pl_data->modem_type;

	ifx_dev->use_dma = pl_data->use_dma;

	ifx_dev->max_hz = pl_data->max_hz;



	/* ensure SPI protocol flags are initialized to enable transfer */

	ifx_dev->spi_more = 0;
@@ -1025,18 +1033,11 @@ static int ifx_spi_spi_probe(struct spi_device *spi) 
		goto error_ret;

	}



	pl_data = (struct ifx_modem_platform_data *)spi->dev.platform_data;

	if (pl_data) {

	ifx_dev->gpio.reset = pl_data->rst_pmu;

	ifx_dev->gpio.po = pl_data->pwr_on;

	ifx_dev->gpio.mrdy = pl_data->mrdy;

	ifx_dev->gpio.srdy = pl_data->srdy;

	ifx_dev->gpio.reset_out = pl_data->rst_out;

	} else {

		dev_err(&spi->dev, "missing platform data!");

		ret = -ENODEV;

		goto error_ret;

	}



	dev_info(&spi->dev, "gpios %d, %d, %d, %d, %d",

		 ifx_dev->gpio.reset, ifx_dev->gpio.po, ifx_dev->gpio.mrdy,

drivers/tty/serial/ifx6x60.h

+3 −1
Original line number Diff line number Diff line
@@ -88,7 +88,9 @@ struct ifx_spi_device { 
	dma_addr_t rx_dma;

	dma_addr_t tx_dma;



	int is_6160;				/* Modem type */

	int modem;		/* Modem type */

	int use_dma;		/* provide dma-able addrs in SPI msg */

	long max_hz;		/* max SPI frequency */



	spinlock_t write_lock;

	int write_pending;

include/linux/spi/ifx_modem.h

+12 −7
Original line number Diff line number Diff line
@@ -8,7 +8,12 @@ struct ifx_modem_platform_data { 
	unsigned short tx_pwr;		/* modem power threshold */

	unsigned short srdy;		/* SRDY */

	unsigned short mrdy;		/* MRDY */

	unsigned short is_6160;	/* Modem type */

	unsigned char modem_type;	/* Modem type */

	unsigned long max_hz;		/* max SPI frequency */

	unsigned short use_dma:1;	/* spi protocol driver supplies

					   dma-able addrs */

};

#define IFX_MODEM_6160	1

#define IFX_MODEM_6260	2



#endif