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

Commit 21fc509f authored by Alexander Shiyan's avatar Alexander Shiyan Committed by Greg Kroah-Hartman
Browse files

serial: max310x: Add MAX3109 support 



This patch adds support for MAX3109 (advanced dual universal asynchronous
receiver-transmitter) into max310x driver.

Signed-off-by: default avatarAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 10d8b34a

drivers/tty/serial/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ config SERIAL_MAX310X 
	default n

	help

	  This selects support for an advanced UART from Maxim (Dallas).

	  Supported ICs are MAX3107, MAX3108.

	  Supported ICs are MAX3107, MAX3108, MAX3109.

	  Each IC contains 128 words each of receive and transmit FIFO

	  that can be controlled through I2C or high-speed SPI.

drivers/tty/serial/max310x.c

+31 −4
Original line number Diff line number Diff line 
/*

 *  Maxim (Dallas) MAX3107/8 serial driver

 *  Maxim (Dallas) MAX3107/8/9 serial driver

 *

 *  Copyright (C) 2012-2013 Alexander Shiyan <shc_work@mail.ru>

 *
@@ -13,9 +13,6 @@ 
 *  (at your option) any later version.

 */



/* TODO: MAX3109 support (Dual) */

/* TODO: MAX14830 support (Quad) */



#include <linux/module.h>

#include <linux/delay.h>

#include <linux/device.h>
@@ -269,6 +266,9 @@ 
/* MAX3107 specific */

#define MAX3107_REV_ID			(0xa0)



/* MAX3109 specific */

#define MAX3109_REV_ID			(0xc0)



struct max310x_devtype {

	char	name[9];

	int	nr;
@@ -359,6 +359,25 @@ static int max3108_detect(struct device *dev) 
	return 0;

}



static int max3109_detect(struct device *dev)

{

	struct max310x_port *s = dev_get_drvdata(dev);

	unsigned int val = 0;

	int ret;



	ret = regmap_read(s->regmap, MAX310X_REVID_REG, &val);

	if (ret)

		return ret;



	if (((val & MAX310x_REV_MASK) != MAX3109_REV_ID)) {

		dev_err(dev,

			"%s ID 0x%02x does not match\n", s->devtype->name, val);

		return -ENODEV;

	}



	return 0;

}



static void max310x_power(struct uart_port *port, int on)

{

	max310x_port_update(port, MAX310X_MODE1_REG,
@@ -382,6 +401,13 @@ static const struct max310x_devtype max3108_devtype = { 
	.power	= max310x_power,

};



static const struct max310x_devtype max3109_devtype = {

	.name	= "MAX3109",

	.nr	= 2,

	.detect	= max3109_detect,

	.power	= max310x_power,

};



static bool max310x_reg_writeable(struct device *dev, unsigned int reg)

{

	switch (reg & 0x1f) {
@@ -1226,6 +1252,7 @@ static SIMPLE_DEV_PM_OPS(max310x_pm_ops, max310x_suspend, max310x_resume); 
static const struct spi_device_id max310x_id_table[] = {

	{ "max3107",	(kernel_ulong_t)&max3107_devtype, },

	{ "max3108",	(kernel_ulong_t)&max3108_devtype, },

	{ "max3109",	(kernel_ulong_t)&max3109_devtype, },

	{ }

};

MODULE_DEVICE_TABLE(spi, max310x_id_table);

include/linux/platform_data/max310x.h

+2 −2
Original line number Diff line number Diff line 
/*

 *  Maxim (Dallas) MAX3107/8 serial driver

 *  Maxim (Dallas) MAX3107/8/9 serial driver

 *

 *  Copyright (C) 2012 Alexander Shiyan <shc_work@mail.ru>

 *
@@ -37,7 +37,7 @@ 
 * };

 */



#define MAX310X_MAX_UARTS	1

#define MAX310X_MAX_UARTS	2



/* MAX310X platform data structure */

struct max310x_pdata {