Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp498012yba; Mon, 1 Apr 2019 10:30:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqy7naMx3Gub4/WcMNnerqIhWVXm1On3zjyG3ZPAVJ5cAZ0HX9XQZOLmx5Jz7H3a9huwJOlw X-Received: by 2002:a63:fe0a:: with SMTP id p10mr56774350pgh.86.1554139808458; Mon, 01 Apr 2019 10:30:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554139808; cv=none; d=google.com; s=arc-20160816; b=grcSmgJ+RQVUqrbEY4cdTLzh8jxMd4Nn0gyYZwN9XmKRs8DGXSB1kPPr5Ed0LVKR4i HLiH8Mgchu0F37EQTyg/H8r6YojB8NyZ6oc4uUrOZgBoJWB3Bs4iiHjtN3LbNgCG1jGX 7bP91qCg8Tq9xo1Uvr25d5nfeYu6R8QMaM7czf3wu8uUazRel3FOk0MUQj1tzb8kRbWe sy/HLAJs2RZhPU2VOL9GrITR3qbznGD2ZyAjvHohQtPogWqmEOfftnQiIem9lxt9B7hs baKzBJKW2mlEgb9KXyYi6J3QlApLT6slVNsg0vCir5UQ0BoQ8uIj6SdJri1dUmN9DZPk GYfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ntT0nxlnrlzyzwV98yKHJ7jBlOojrx4qboiND7hvofc=; b=btGlLr46mfRGBW45UMrhxZrfPVcI7Kee4MeEcgsjBnAikwY4xvuJLy1PPXFtjG10dx IRLp0MuoBaMbU3UVenVxuDqrOL6MWGxt4mzWy5UCbNAGgh9np78YlgqkovFCjqonekYg 7lZQijaHv8sC4Tix4fBGlbdHsplwkWaZTNx/5XKgnnEr7VbAwwEbbiZLrvBA+b4dZvVf uVaYsYuqnb1PzwiNOO8FKwBSe+0Svnx5XPeXBwWVAxwqAkEXZcvEcETr3Q4ZBjGBEyFf vmYpeFpumLE5aKWKjT4gT3OCq4A+3GF/M9HSilasZRzsvlngClivo1RXViuCNBsx0gg7 XVTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JdB6pb02; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t16si9023732plr.63.2019.04.01.10.29.53; Mon, 01 Apr 2019 10:30:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JdB6pb02; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732717AbfDAR3T (ORCPT + 99 others); Mon, 1 Apr 2019 13:29:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:35566 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732914AbfDAR3Q (ORCPT ); Mon, 1 Apr 2019 13:29:16 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7BCD420856; Mon, 1 Apr 2019 17:29:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554139756; bh=iDrNuEwWxS6QuL5QMeftfZRA769BtjjEdTLTTguSTys=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JdB6pb02TUoneIA7JeEUhHdMyt9uwLgIbHvOvrTluA+7Wgh6b+eoAOU839Oq1IQIN 3npxJ8Bin1Yjtiw67lR+0HdqvEGi56Qlb/6sIYjhFKUttbuuxLSewq17rTc6S5sKCB sTWtrxlJwKItdtRIq3WoX1LiMIrCTZl0OQvDxRxs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, George McCollister , Johan Hovold Subject: [PATCH 4.9 39/56] USB: serial: ftdi_sio: add additional NovaTech products Date: Mon, 1 Apr 2019 19:02:55 +0200 Message-Id: <20190401170106.064681728@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190401170103.398401360@linuxfoundation.org> References: <20190401170103.398401360@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: George McCollister commit 422c2537ba9d42320f8ab6573940269f87095320 upstream. Add PIDs for the NovaTech OrionLX+ and Orion I/O so they can be automatically detected. Signed-off-by: George McCollister Cc: stable Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman --- drivers/usb/serial/ftdi_sio.c | 2 ++ drivers/usb/serial/ftdi_sio_ids.h | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -604,6 +604,8 @@ static const struct usb_device_id id_tab .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, { USB_DEVICE(FTDI_VID, FTDI_NT_ORIONLXM_PID), .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, + { USB_DEVICE(FTDI_VID, FTDI_NT_ORIONLX_PLUS_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_NT_ORION_IO_PID) }, { USB_DEVICE(FTDI_VID, FTDI_SYNAPSE_SS200_PID) }, { USB_DEVICE(FTDI_VID, FTDI_CUSTOMWARE_MINIPLEX_PID) }, { USB_DEVICE(FTDI_VID, FTDI_CUSTOMWARE_MINIPLEX2_PID) }, --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h @@ -566,7 +566,9 @@ /* * NovaTech product ids (FTDI_VID) */ -#define FTDI_NT_ORIONLXM_PID 0x7c90 /* OrionLXm Substation Automation Platform */ +#define FTDI_NT_ORIONLXM_PID 0x7c90 /* OrionLXm Substation Automation Platform */ +#define FTDI_NT_ORIONLX_PLUS_PID 0x7c91 /* OrionLX+ Substation Automation Platform */ +#define FTDI_NT_ORION_IO_PID 0x7c92 /* Orion I/O */ /* * Synapse Wireless product ids (FTDI_VID)