Merge tag 'usb-serial-4.16-rc1' of... (2da050e4) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/usb/serial/ark3116.c

+28 −21

Original line number	Original line	Diff line number	Diff line
	@@ -83,7 +83,10 @@ static int ark3116_write_reg(struct usb_serial *serial,
	usb_sndctrlpipe(serial->dev, 0),		usb_sndctrlpipe(serial->dev, 0),
	0xfe, 0x40, val, reg,		0xfe, 0x40, val, reg,
	NULL, 0, ARK_TIMEOUT);		NULL, 0, ARK_TIMEOUT);
			if (result)
	return result;		return result;

			return 0;
	}		}

	static int ark3116_read_reg(struct usb_serial *serial,		static int ark3116_read_reg(struct usb_serial *serial,
	@@ -105,7 +108,7 @@ static int ark3116_read_reg(struct usb_serial *serial,
	return result;		return result;
	}		}

	return buf[0];		return 0;
	}		}

	static inline int calc_divisor(int bps)		static inline int calc_divisor(int bps)
	@@ -355,13 +358,13 @@ static int ark3116_open(struct tty_struct tty, struct usb_serial_port port)

	/* read modem status */		/* read modem status */
	result = ark3116_read_reg(serial, UART_MSR, buf);		result = ark3116_read_reg(serial, UART_MSR, buf);
	if (result < 0)		if (result)
	goto err_close;		goto err_close;
	priv->msr = *buf;		priv->msr = *buf;

	/* read line status */		/* read line status */
	result = ark3116_read_reg(serial, UART_LSR, buf);		result = ark3116_read_reg(serial, UART_LSR, buf);
	if (result < 0)		if (result)
	goto err_close;		goto err_close;
	priv->lsr = *buf;		priv->lsr = *buf;

	@@ -394,31 +397,35 @@ static int ark3116_open(struct tty_struct tty, struct usb_serial_port port)
	return result;		return result;
	}		}

			static int ark3116_get_serial_info(struct usb_serial_port *port,
			struct serial_struct __user *retinfo)
			{
			struct serial_struct tmp;

			memset(&tmp, 0, sizeof(tmp));

			tmp.type = PORT_16654;
			tmp.line = port->minor;
			tmp.port = port->port_number;
			tmp.baud_base = 460800;

			if (copy_to_user(retinfo, &tmp, sizeof(tmp)))
			return -EFAULT;

			return 0;
			}

	static int ark3116_ioctl(struct tty_struct *tty,		static int ark3116_ioctl(struct tty_struct *tty,
	unsigned int cmd, unsigned long arg)		unsigned int cmd, unsigned long arg)
	{		{
	struct usb_serial_port *port = tty->driver_data;		struct usb_serial_port *port = tty->driver_data;
	struct serial_struct serstruct;
	void __user user_arg = (void __user )arg;		void __user user_arg = (void __user )arg;

	switch (cmd) {		switch (cmd) {
	case TIOCGSERIAL:		case TIOCGSERIAL:
	/* XXX: Some of these values are probably wrong. */		return ark3116_get_serial_info(port, user_arg);
	memset(&serstruct, 0, sizeof(serstruct));		default:
	serstruct.type = PORT_16654;		break;
	serstruct.line = port->minor;
	serstruct.port = port->port_number;
	serstruct.custom_divisor = 0;
	serstruct.baud_base = 460800;

	if (copy_to_user(user_arg, &serstruct, sizeof(serstruct)))
	return -EFAULT;

	return 0;
	case TIOCSSERIAL:
	if (copy_from_user(&serstruct, user_arg, sizeof(serstruct)))
	return -EFAULT;
	return 0;
	}		}

	return -ENOIOCTLCMD;		return -ENOIOCTLCMD;

drivers/usb/serial/f81534.c

+290 −102

Original line number	Original line	Diff line number	Diff line
	@@ -41,6 +41,7 @@
	#define F81534_MODEM_CONTROL_REG (0x04 + F81534_UART_BASE_ADDRESS)		#define F81534_MODEM_CONTROL_REG (0x04 + F81534_UART_BASE_ADDRESS)
	#define F81534_LINE_STATUS_REG (0x05 + F81534_UART_BASE_ADDRESS)		#define F81534_LINE_STATUS_REG (0x05 + F81534_UART_BASE_ADDRESS)
	#define F81534_MODEM_STATUS_REG (0x06 + F81534_UART_BASE_ADDRESS)		#define F81534_MODEM_STATUS_REG (0x06 + F81534_UART_BASE_ADDRESS)
			#define F81534_CLOCK_REG (0x08 + F81534_UART_BASE_ADDRESS)
	#define F81534_CONFIG1_REG (0x09 + F81534_UART_BASE_ADDRESS)		#define F81534_CONFIG1_REG (0x09 + F81534_UART_BASE_ADDRESS)

	#define F81534_DEF_CONF_ADDRESS_START 0x3000		#define F81534_DEF_CONF_ADDRESS_START 0x3000
	@@ -51,13 +52,14 @@
	#define F81534_CUSTOM_NO_CUSTOM_DATA 0xff		#define F81534_CUSTOM_NO_CUSTOM_DATA 0xff
	#define F81534_CUSTOM_VALID_TOKEN 0xf0		#define F81534_CUSTOM_VALID_TOKEN 0xf0
	#define F81534_CONF_OFFSET 1		#define F81534_CONF_OFFSET 1
			#define F81534_CONF_GPIO_OFFSET 4

	#define F81534_MAX_DATA_BLOCK 64		#define F81534_MAX_DATA_BLOCK 64
	#define F81534_MAX_BUS_RETRY 20		#define F81534_MAX_BUS_RETRY 20

	/* Default URB timeout for USB operations */		/* Default URB timeout for USB operations */
	#define F81534_USB_MAX_RETRY 10		#define F81534_USB_MAX_RETRY 10
	#define F81534_USB_TIMEOUT 1000		#define F81534_USB_TIMEOUT 2000
	#define F81534_SET_GET_REGISTER 0xA0		#define F81534_SET_GET_REGISTER 0xA0

	#define F81534_NUM_PORT 4		#define F81534_NUM_PORT 4
	@@ -96,16 +98,43 @@
	#define F81534_CMD_READ 0x03		#define F81534_CMD_READ 0x03

	#define F81534_DEFAULT_BAUD_RATE 9600		#define F81534_DEFAULT_BAUD_RATE 9600
	#define F81534_MAX_BAUDRATE 115200

			#define F81534_PORT_CONF_RS232 0
			#define F81534_PORT_CONF_RS485 BIT(0)
			#define F81534_PORT_CONF_RS485_INVERT (BIT(0) \| BIT(1))
			#define F81534_PORT_CONF_MODE_MASK GENMASK(1, 0)
	#define F81534_PORT_CONF_DISABLE_PORT BIT(3)		#define F81534_PORT_CONF_DISABLE_PORT BIT(3)
	#define F81534_PORT_CONF_NOT_EXIST_PORT BIT(7)		#define F81534_PORT_CONF_NOT_EXIST_PORT BIT(7)
	#define F81534_PORT_UNAVAILABLE \		#define F81534_PORT_UNAVAILABLE \
	(F81534_PORT_CONF_DISABLE_PORT \| F81534_PORT_CONF_NOT_EXIST_PORT)		(F81534_PORT_CONF_DISABLE_PORT \| F81534_PORT_CONF_NOT_EXIST_PORT)


	#define F81534_1X_RXTRIGGER 0xc3		#define F81534_1X_RXTRIGGER 0xc3
	#define F81534_8X_RXTRIGGER 0xcf		#define F81534_8X_RXTRIGGER 0xcf

			/*
			* F81532/534 Clock registers (offset +08h)
			*
			* Bit0: UART Enable (always on)
			* Bit2-1: Clock source selector
			* 00: 1.846MHz.
			* 01: 18.46MHz.
			* 10: 24MHz.
			* 11: 14.77MHz.
			* Bit4: Auto direction(RTS) control (RTS pin Low when TX)
			* Bit5: Invert direction(RTS) when Bit4 enabled (RTS pin high when TX)
			*/

			#define F81534_UART_EN BIT(0)
			#define F81534_CLK_1_846_MHZ 0
			#define F81534_CLK_18_46_MHZ BIT(1)
			#define F81534_CLK_24_MHZ BIT(2)
			#define F81534_CLK_14_77_MHZ (BIT(1) \| BIT(2))
			#define F81534_CLK_MASK GENMASK(2, 1)
			#define F81534_CLK_TX_DELAY_1BIT BIT(3)
			#define F81534_CLK_RS485_MODE BIT(4)
			#define F81534_CLK_RS485_INVERT BIT(5)

	static const struct usb_device_id f81534_id_table[] = {		static const struct usb_device_id f81534_id_table[] = {
	{ USB_DEVICE(FINTEK_VENDOR_ID_1, FINTEK_DEVICE_ID) },		{ USB_DEVICE(FINTEK_VENDOR_ID_1, FINTEK_DEVICE_ID) },
	{ USB_DEVICE(FINTEK_VENDOR_ID_2, FINTEK_DEVICE_ID) },		{ USB_DEVICE(FINTEK_VENDOR_ID_2, FINTEK_DEVICE_ID) },
	@@ -129,12 +158,35 @@ struct f81534_port_private {
	struct usb_serial_port *port;		struct usb_serial_port *port;
	unsigned long tx_empty;		unsigned long tx_empty;
	spinlock_t msr_lock;		spinlock_t msr_lock;
			u32 baud_base;
	u8 shadow_mcr;		u8 shadow_mcr;
	u8 shadow_lcr;		u8 shadow_lcr;
	u8 shadow_msr;		u8 shadow_msr;
			u8 shadow_clk;
	u8 phy_num;		u8 phy_num;
	};		};

			struct f81534_pin_data {
			const u16 reg_addr;
			const u8 reg_mask;
			};

			struct f81534_port_out_pin {
			struct f81534_pin_data pin[3];
			};

			/* Pin output value for M2/M1/M0(SD) */
			static const struct f81534_port_out_pin f81534_port_out_pins[] = {
			{ { { 0x2ae8, BIT(7) }, { 0x2a90, BIT(5) }, { 0x2a90, BIT(4) } } },
			{ { { 0x2ae8, BIT(6) }, { 0x2ae8, BIT(0) }, { 0x2ae8, BIT(3) } } },
			{ { { 0x2a90, BIT(0) }, { 0x2ae8, BIT(2) }, { 0x2a80, BIT(6) } } },
			{ { { 0x2a90, BIT(3) }, { 0x2a90, BIT(2) }, { 0x2a90, BIT(1) } } },
			};

			static u32 const baudrate_table[] = { 115200, 921600, 1152000, 1500000 };
			static u8 const clock_table[] = { F81534_CLK_1_846_MHZ, F81534_CLK_14_77_MHZ,
			F81534_CLK_18_46_MHZ, F81534_CLK_24_MHZ };

	static int f81534_logic_to_phy_port(struct usb_serial *serial,		static int f81534_logic_to_phy_port(struct usb_serial *serial,
	struct usb_serial_port *port)		struct usb_serial_port *port)
	{		{
	@@ -240,6 +292,36 @@ static int f81534_get_register(struct usb_serial serial, u16 reg, u8 data)
	return status;		return status;
	}		}

			static int f81534_set_mask_register(struct usb_serial *serial, u16 reg,
			u8 mask, u8 data)
			{
			int status;
			u8 tmp;

			status = f81534_get_register(serial, reg, &tmp);
			if (status)
			return status;

			tmp &= ~mask;
			tmp \|= (mask & data);

			return f81534_set_register(serial, reg, tmp);
			}

			static int f81534_set_phy_port_register(struct usb_serial *serial, int phy,
			u16 reg, u8 data)
			{
			return f81534_set_register(serial, reg + F81534_UART_OFFSET * phy,
			data);
			}

			static int f81534_get_phy_port_register(struct usb_serial *serial, int phy,
			u16 reg, u8 *data)
			{
			return f81534_get_register(serial, reg + F81534_UART_OFFSET * phy,
			data);
			}

	static int f81534_set_port_register(struct usb_serial_port *port, u16 reg,		static int f81534_set_port_register(struct usb_serial_port *port, u16 reg,
	u8 data)		u8 data)
	{		{
	@@ -460,13 +542,52 @@ static u32 f81534_calc_baud_divisor(u32 baudrate, u32 clockrate)
	return DIV_ROUND_CLOSEST(clockrate, baudrate);		return DIV_ROUND_CLOSEST(clockrate, baudrate);
	}		}

	static int f81534_set_port_config(struct usb_serial_port *port, u32 baudrate,		static int f81534_find_clk(u32 baudrate)
	u8 lcr)		{
			int idx;

			for (idx = 0; idx < ARRAY_SIZE(baudrate_table); ++idx) {
			if (baudrate <= baudrate_table[idx] &&
			baudrate_table[idx] % baudrate == 0)
			return idx;
			}

			return -EINVAL;
			}

			static int f81534_set_port_config(struct usb_serial_port *port,
			struct tty_struct *tty, u32 baudrate, u32 old_baudrate, u8 lcr)
	{		{
	struct f81534_port_private *port_priv = usb_get_serial_port_data(port);		struct f81534_port_private *port_priv = usb_get_serial_port_data(port);
	u32 divisor;		u32 divisor;
	int status;		int status;
			int i;
			int idx;
	u8 value;		u8 value;
			u32 baud_list[] = {baudrate, old_baudrate, F81534_DEFAULT_BAUD_RATE};

			for (i = 0; i < ARRAY_SIZE(baud_list); ++i) {
			idx = f81534_find_clk(baud_list[i]);
			if (idx >= 0) {
			baudrate = baud_list[i];
			tty_encode_baud_rate(tty, baudrate, baudrate);
			break;
			}
			}

			if (idx < 0)
			return -EINVAL;

			port_priv->baud_base = baudrate_table[idx];
			port_priv->shadow_clk &= ~F81534_CLK_MASK;
			port_priv->shadow_clk \|= clock_table[idx];

			status = f81534_set_port_register(port, F81534_CLOCK_REG,
			port_priv->shadow_clk);
			if (status) {
			dev_err(&port->dev, "CLOCK_REG setting failed\n");
			return status;
			}

	if (baudrate <= 1200)		if (baudrate <= 1200)
	value = F81534_1X_RXTRIGGER; /* 128 FIFO & TL: 1x */		value = F81534_1X_RXTRIGGER; /* 128 FIFO & TL: 1x */
	@@ -482,7 +603,7 @@ static int f81534_set_port_config(struct usb_serial_port *port, u32 baudrate,
	if (baudrate <= 1200)		if (baudrate <= 1200)
	value = UART_FCR_TRIGGER_1 \| UART_FCR_ENABLE_FIFO; /* TL: 1 */		value = UART_FCR_TRIGGER_1 \| UART_FCR_ENABLE_FIFO; /* TL: 1 */
	else		else
	value = UART_FCR_R_TRIG_11 \| UART_FCR_ENABLE_FIFO; /* TL: 14 */		value = UART_FCR_TRIGGER_8 \| UART_FCR_ENABLE_FIFO; /* TL: 8 */

	status = f81534_set_port_register(port, F81534_FIFO_CONTROL_REG,		status = f81534_set_port_register(port, F81534_FIFO_CONTROL_REG,
	value);		value);
	@@ -491,7 +612,7 @@ static int f81534_set_port_config(struct usb_serial_port *port, u32 baudrate,
	return status;		return status;
	}		}

	divisor = f81534_calc_baud_divisor(baudrate, F81534_MAX_BAUDRATE);		divisor = f81534_calc_baud_divisor(baudrate, port_priv->baud_base);

	mutex_lock(&port_priv->lcr_mutex);		mutex_lock(&port_priv->lcr_mutex);

	@@ -626,6 +747,70 @@ static int f81534_find_config_idx(struct usb_serial serial, u8 index)
	return 0;		return 0;
	}		}

			/*
			* The F81532/534 will not report serial port to USB serial subsystem when
			* H/W DCD/DSR/CTS/RI/RX pin connected to ground.
			*
			* To detect RX pin status, we'll enable MCR interal loopback, disable it and
			* delayed for 60ms. It connected to ground If LSR register report UART_LSR_BI.
			*/
			static bool f81534_check_port_hw_disabled(struct usb_serial *serial, int phy)
			{
			int status;
			u8 old_mcr;
			u8 msr;
			u8 lsr;
			u8 msr_mask;

			msr_mask = UART_MSR_DCD \| UART_MSR_RI \| UART_MSR_DSR \| UART_MSR_CTS;

			status = f81534_get_phy_port_register(serial, phy,
			F81534_MODEM_STATUS_REG, &msr);
			if (status)
			return false;

			if ((msr & msr_mask) != msr_mask)
			return false;

			status = f81534_set_phy_port_register(serial, phy,
			F81534_FIFO_CONTROL_REG, UART_FCR_ENABLE_FIFO \|
			UART_FCR_CLEAR_RCVR \| UART_FCR_CLEAR_XMIT);
			if (status)
			return false;

			status = f81534_get_phy_port_register(serial, phy,
			F81534_MODEM_CONTROL_REG, &old_mcr);
			if (status)
			return false;

			status = f81534_set_phy_port_register(serial, phy,
			F81534_MODEM_CONTROL_REG, UART_MCR_LOOP);
			if (status)
			return false;

			status = f81534_set_phy_port_register(serial, phy,
			F81534_MODEM_CONTROL_REG, 0x0);
			if (status)
			return false;

			msleep(60);

			status = f81534_get_phy_port_register(serial, phy,
			F81534_LINE_STATUS_REG, &lsr);
			if (status)
			return false;

			status = f81534_set_phy_port_register(serial, phy,
			F81534_MODEM_CONTROL_REG, old_mcr);
			if (status)
			return false;

			if ((lsr & UART_LSR_BI) == UART_LSR_BI)
			return true;

			return false;
			}

	/*		/*
	* We had 2 generation of F81532/534 IC. All has an internal storage.		* We had 2 generation of F81532/534 IC. All has an internal storage.
	*		*
	@@ -647,14 +832,14 @@ static int f81534_find_config_idx(struct usb_serial serial, u8 index)
	static int f81534_calc_num_ports(struct usb_serial *serial,		static int f81534_calc_num_ports(struct usb_serial *serial,
	struct usb_serial_endpoints *epds)		struct usb_serial_endpoints *epds)
	{		{
			struct f81534_serial_private *serial_priv;
	struct device *dev = &serial->interface->dev;		struct device *dev = &serial->interface->dev;
	int size_bulk_in = usb_endpoint_maxp(epds->bulk_in[0]);		int size_bulk_in = usb_endpoint_maxp(epds->bulk_in[0]);
	int size_bulk_out = usb_endpoint_maxp(epds->bulk_out[0]);		int size_bulk_out = usb_endpoint_maxp(epds->bulk_out[0]);
	u8 setting[F81534_CUSTOM_DATA_SIZE];
	u8 setting_idx;
	u8 num_port = 0;		u8 num_port = 0;
			int index = 0;
	int status;		int status;
	size_t i;		int i;

	if (size_bulk_out != F81534_WRITE_BUFFER_SIZE \|\|		if (size_bulk_out != F81534_WRITE_BUFFER_SIZE \|\|
	size_bulk_in != F81534_MAX_RECEIVE_BLOCK_SIZE) {		size_bulk_in != F81534_MAX_RECEIVE_BLOCK_SIZE) {
	@@ -662,8 +847,16 @@ static int f81534_calc_num_ports(struct usb_serial *serial,
	return -ENODEV;		return -ENODEV;
	}		}

			serial_priv = devm_kzalloc(&serial->interface->dev,
			sizeof(*serial_priv), GFP_KERNEL);
			if (!serial_priv)
			return -ENOMEM;

			usb_set_serial_data(serial, serial_priv);
			mutex_init(&serial_priv->urb_mutex);

	/* Check had custom setting */		/* Check had custom setting */
	status = f81534_find_config_idx(serial, &setting_idx);		status = f81534_find_config_idx(serial, &serial_priv->setting_idx);
	if (status) {		if (status) {
	dev_err(&serial->interface->dev, "%s: find idx failed: %d\n",		dev_err(&serial->interface->dev, "%s: find idx failed: %d\n",
	__func__, status);		__func__, status);
	@@ -674,11 +867,12 @@ static int f81534_calc_num_ports(struct usb_serial *serial,
	* We'll read custom data only when data available, otherwise we'll		* We'll read custom data only when data available, otherwise we'll
	* read default value instead.		* read default value instead.
	*/		*/
	if (setting_idx != F81534_CUSTOM_NO_CUSTOM_DATA) {		if (serial_priv->setting_idx != F81534_CUSTOM_NO_CUSTOM_DATA) {
	status = f81534_read_flash(serial,		status = f81534_read_flash(serial,
	F81534_CUSTOM_ADDRESS_START +		F81534_CUSTOM_ADDRESS_START +
	F81534_CONF_OFFSET,		F81534_CONF_OFFSET,
	sizeof(setting), setting);		sizeof(serial_priv->conf_data),
			serial_priv->conf_data);
	if (status) {		if (status) {
	dev_err(&serial->interface->dev,		dev_err(&serial->interface->dev,
	"%s: get custom data failed: %d\n",		"%s: get custom data failed: %d\n",
	@@ -688,13 +882,13 @@ static int f81534_calc_num_ports(struct usb_serial *serial,

	dev_dbg(&serial->interface->dev,		dev_dbg(&serial->interface->dev,
	"%s: read config from block: %d\n", __func__,		"%s: read config from block: %d\n", __func__,
	setting_idx);		serial_priv->setting_idx);
	} else {		} else {
	/* Read default board setting */		/* Read default board setting */
	status = f81534_read_flash(serial,		status = f81534_read_flash(serial,
	F81534_DEF_CONF_ADDRESS_START, F81534_NUM_PORT,		F81534_DEF_CONF_ADDRESS_START,
	setting);		sizeof(serial_priv->conf_data),
			serial_priv->conf_data);
	if (status) {		if (status) {
	dev_err(&serial->interface->dev,		dev_err(&serial->interface->dev,
	"%s: read failed: %d\n", __func__,		"%s: read failed: %d\n", __func__,
	@@ -708,7 +902,10 @@ static int f81534_calc_num_ports(struct usb_serial *serial,

	/* New style, find all possible ports */		/* New style, find all possible ports */
	for (i = 0; i < F81534_NUM_PORT; ++i) {		for (i = 0; i < F81534_NUM_PORT; ++i) {
	if (setting[i] & F81534_PORT_UNAVAILABLE)		if (f81534_check_port_hw_disabled(serial, i))
			serial_priv->conf_data[i] \|= F81534_PORT_UNAVAILABLE;

			if (serial_priv->conf_data[i] & F81534_PORT_UNAVAILABLE)
	continue;		continue;

	++num_port;		++num_port;
	@@ -720,6 +917,17 @@ static int f81534_calc_num_ports(struct usb_serial *serial,
	num_port = 4; /* Nothing found, oldest version IC */		num_port = 4; /* Nothing found, oldest version IC */
	}		}

			/* Assign phy-to-logic mapping */
			for (i = 0; i < F81534_NUM_PORT; ++i) {
			if (serial_priv->conf_data[i] & F81534_PORT_UNAVAILABLE)
			continue;

			serial_priv->tty_idx[i] = index++;
			dev_dbg(&serial->interface->dev,
			"%s: phy_num: %d, tty_idx: %d\n", __func__, i,
			serial_priv->tty_idx[i]);
			}

	/*		/*
	* Setup bulk-out endpoint multiplexing. All ports share the same		* Setup bulk-out endpoint multiplexing. All ports share the same
	* bulk-out endpoint.		* bulk-out endpoint.
	@@ -741,6 +949,7 @@ static void f81534_set_termios(struct tty_struct *tty,
	u8 new_lcr = 0;		u8 new_lcr = 0;
	int status;		int status;
	u32 baud;		u32 baud;
			u32 old_baud;

	if (C_BAUD(tty) == B0)		if (C_BAUD(tty) == B0)
	f81534_update_mctrl(port, 0, TIOCM_DTR \| TIOCM_RTS);		f81534_update_mctrl(port, 0, TIOCM_DTR \| TIOCM_RTS);
	@@ -780,18 +989,14 @@ static void f81534_set_termios(struct tty_struct *tty,
	if (!baud)		if (!baud)
	return;		return;

	if (baud > F81534_MAX_BAUDRATE) {
	if (old_termios)		if (old_termios)
	baud = tty_termios_baud_rate(old_termios);		old_baud = tty_termios_baud_rate(old_termios);
	else		else
	baud = F81534_DEFAULT_BAUD_RATE;		old_baud = F81534_DEFAULT_BAUD_RATE;

	tty_encode_baud_rate(tty, baud, baud);
	}

	dev_dbg(&port->dev, "%s: baud: %d\n", __func__, baud);		dev_dbg(&port->dev, "%s: baud: %d\n", __func__, baud);

	status = f81534_set_port_config(port, baud, new_lcr);		status = f81534_set_port_config(port, tty, baud, old_baud, new_lcr);
	if (status < 0) {		if (status < 0) {
	dev_err(&port->dev, "%s: set port config failed: %d\n",		dev_err(&port->dev, "%s: set port config failed: %d\n",
	__func__, status);		__func__, status);
	@@ -947,7 +1152,7 @@ static int f81534_get_serial_info(struct usb_serial_port *port,
	tmp.type = PORT_16550A;		tmp.type = PORT_16550A;
	tmp.port = port->port_number;		tmp.port = port->port_number;
	tmp.line = port->minor;		tmp.line = port->minor;
	tmp.baud_base = F81534_MAX_BAUDRATE;		tmp.baud_base = port_priv->baud_base;

	if (copy_to_user(retinfo, &tmp, sizeof(*retinfo)))		if (copy_to_user(retinfo, &tmp, sizeof(*retinfo)))
	return -EFAULT;		return -EFAULT;
	@@ -1124,79 +1329,6 @@ static void f81534_write_usb_callback(struct urb *urb)
	}		}
	}		}

	static int f81534_attach(struct usb_serial *serial)
	{
	struct f81534_serial_private *serial_priv;
	int index = 0;
	int status;
	int i;

	serial_priv = devm_kzalloc(&serial->interface->dev,
	sizeof(*serial_priv), GFP_KERNEL);
	if (!serial_priv)
	return -ENOMEM;

	usb_set_serial_data(serial, serial_priv);

	mutex_init(&serial_priv->urb_mutex);

	/* Check had custom setting */
	status = f81534_find_config_idx(serial, &serial_priv->setting_idx);
	if (status) {
	dev_err(&serial->interface->dev, "%s: find idx failed: %d\n",
	__func__, status);
	return status;
	}

	/*
	* We'll read custom data only when data available, otherwise we'll
	* read default value instead.
	*/
	if (serial_priv->setting_idx == F81534_CUSTOM_NO_CUSTOM_DATA) {
	/*
	* The default configuration layout:
	* byte 0/1/2/3: uart setting
	*/
	status = f81534_read_flash(serial,
	F81534_DEF_CONF_ADDRESS_START,
	F81534_DEF_CONF_SIZE,
	serial_priv->conf_data);
	if (status) {
	dev_err(&serial->interface->dev,
	"%s: read reserve data failed: %d\n",
	__func__, status);
	return status;
	}
	} else {
	/* Only read 8 bytes for mode & GPIO */
	status = f81534_read_flash(serial,
	F81534_CUSTOM_ADDRESS_START +
	F81534_CONF_OFFSET,
	sizeof(serial_priv->conf_data),
	serial_priv->conf_data);
	if (status) {
	dev_err(&serial->interface->dev,
	"%s: idx: %d get data failed: %d\n",
	__func__, serial_priv->setting_idx,
	status);
	return status;
	}
	}

	/* Assign phy-to-logic mapping */
	for (i = 0; i < F81534_NUM_PORT; ++i) {
	if (serial_priv->conf_data[i] & F81534_PORT_UNAVAILABLE)
	continue;

	serial_priv->tty_idx[i] = index++;
	dev_dbg(&serial->interface->dev,
	"%s: phy_num: %d, tty_idx: %d\n", __func__, i,
	serial_priv->tty_idx[i]);
	}

	return 0;
	}

	static void f81534_lsr_worker(struct work_struct *work)		static void f81534_lsr_worker(struct work_struct *work)
	{		{
	struct f81534_port_private *port_priv;		struct f81534_port_private *port_priv;
	@@ -1212,15 +1344,54 @@ static void f81534_lsr_worker(struct work_struct *work)
	dev_warn(&port->dev, "read LSR failed: %d\n", status);		dev_warn(&port->dev, "read LSR failed: %d\n", status);
	}		}

			static int f81534_set_port_output_pin(struct usb_serial_port *port)
			{
			struct f81534_serial_private *serial_priv;
			struct f81534_port_private *port_priv;
			struct usb_serial *serial;
			const struct f81534_port_out_pin *pins;
			int status;
			int i;
			u8 value;
			u8 idx;

			serial = port->serial;
			serial_priv = usb_get_serial_data(serial);
			port_priv = usb_get_serial_port_data(port);

			idx = F81534_CONF_GPIO_OFFSET + port_priv->phy_num;
			value = serial_priv->conf_data[idx];
			pins = &f81534_port_out_pins[port_priv->phy_num];

			for (i = 0; i < ARRAY_SIZE(pins->pin); ++i) {
			status = f81534_set_mask_register(serial,
			pins->pin[i].reg_addr, pins->pin[i].reg_mask,
			value & BIT(i) ? pins->pin[i].reg_mask : 0);
			if (status)
			return status;
			}

			dev_dbg(&port->dev, "Output pin (M0/M1/M2): %d\n", value);
			return 0;
			}

	static int f81534_port_probe(struct usb_serial_port *port)		static int f81534_port_probe(struct usb_serial_port *port)
	{		{
			struct f81534_serial_private *serial_priv;
	struct f81534_port_private *port_priv;		struct f81534_port_private *port_priv;
	int ret;		int ret;
			u8 value;

			serial_priv = usb_get_serial_data(port->serial);
	port_priv = devm_kzalloc(&port->dev, sizeof(*port_priv), GFP_KERNEL);		port_priv = devm_kzalloc(&port->dev, sizeof(*port_priv), GFP_KERNEL);
	if (!port_priv)		if (!port_priv)
	return -ENOMEM;		return -ENOMEM;

			/*
			* We'll make tx frame error when baud rate from 384~500kps. So we'll
			* delay all tx data frame with 1bit.
			*/
			port_priv->shadow_clk = F81534_UART_EN \| F81534_CLK_TX_DELAY_1BIT;
	spin_lock_init(&port_priv->msr_lock);		spin_lock_init(&port_priv->msr_lock);
	mutex_init(&port_priv->mcr_mutex);		mutex_init(&port_priv->mcr_mutex);
	mutex_init(&port_priv->lcr_mutex);		mutex_init(&port_priv->lcr_mutex);
	@@ -1248,7 +1419,25 @@ static int f81534_port_probe(struct usb_serial_port *port)
	if (ret)		if (ret)
	return ret;		return ret;

	return 0;		value = serial_priv->conf_data[port_priv->phy_num];
			switch (value & F81534_PORT_CONF_MODE_MASK) {
			case F81534_PORT_CONF_RS485_INVERT:
			port_priv->shadow_clk \|= F81534_CLK_RS485_MODE \|
			F81534_CLK_RS485_INVERT;
			dev_dbg(&port->dev, "RS485 invert mode\n");
			break;
			case F81534_PORT_CONF_RS485:
			port_priv->shadow_clk \|= F81534_CLK_RS485_MODE;
			dev_dbg(&port->dev, "RS485 mode\n");
			break;

			default:
			case F81534_PORT_CONF_RS232:
			dev_dbg(&port->dev, "RS232 mode\n");
			break;
			}

			return f81534_set_port_output_pin(port);
	}		}

	static int f81534_port_remove(struct usb_serial_port *port)		static int f81534_port_remove(struct usb_serial_port *port)
	@@ -1387,7 +1576,6 @@ static struct usb_serial_driver f81534_device = {
	.write = f81534_write,		.write = f81534_write,
	.tx_empty = f81534_tx_empty,		.tx_empty = f81534_tx_empty,
	.calc_num_ports = f81534_calc_num_ports,		.calc_num_ports = f81534_calc_num_ports,
	.attach = f81534_attach,
	.port_probe = f81534_port_probe,		.port_probe = f81534_port_probe,
	.port_remove = f81534_port_remove,		.port_remove = f81534_port_remove,
	.break_ctl = f81534_break_ctl,		.break_ctl = f81534_break_ctl,

drivers/usb/serial/io_edgeport.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2282,7 +2282,6 @@ static int write_cmd_usb(struct edgeport_port *edge_port,
	/* something went wrong */		/* something went wrong */
	dev_err(dev, "%s - usb_submit_urb(write command) failed, status = %d\n",		dev_err(dev, "%s - usb_submit_urb(write command) failed, status = %d\n",
	__func__, status);		__func__, status);
	usb_kill_urb(urb);
	usb_free_urb(urb);		usb_free_urb(urb);
	atomic_dec(&CmdUrbs);		atomic_dec(&CmdUrbs);
	return status;		return status;

drivers/usb/serial/iuu_phoenix.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -472,7 +472,6 @@ static int iuu_clk(struct usb_serial_port *port, int dwFrq)
	}		}
	}		}
	P2 = ((P - PO) / 2) - 4;		P2 = ((P - PO) / 2) - 4;
	DIV = DIV;
	PUMP = 0x04;		PUMP = 0x04;
	PBmsb = (P2 >> 8 & 0x03);		PBmsb = (P2 >> 8 & 0x03);
	PBlsb = P2 & 0xFF;		PBlsb = P2 & 0xFF;