Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp488410yba; Mon, 1 Apr 2019 10:17:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqxiGefWKs1Low8p6ms9LrQwbhXUO9HnnA61VS1gl6GcQo2THBqgrDL2H8lebMI3doAga1er X-Received: by 2002:a63:6e0e:: with SMTP id j14mr44547851pgc.203.1554139077951; Mon, 01 Apr 2019 10:17:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554139077; cv=none; d=google.com; s=arc-20160816; b=ZLXFtwADWOTqolZFpMWMqg+fQ+2u9rILnMlXISa3T+tEIhYmpggrMUF/iuCuvP4iOL irxA6nZVAIqLueNbMe1FS16AHaIJVLE1B7ll1Qh0Ie86xRAmx+aB1sTG7W3hvTl/qvjo x9q7nFEYk+E/+D1P6h1hQXt66v1yTTSpZhCKqmrS51HDBSlTkC4TJ2q0euIchAdAdqqd yzpMhF6LE+E1GdSaFTodgCCNTx6eNUcDntN3Ok9UA8mwIeuTE9tRdMXwQ0lNDg93QLMX aYnsJ3X/c9Gf0dswH4aRMw9aHuBZIErtsFL6P8JswZYjtDQeTUoU9KxdNxmp4xfzKk0d XybQ== 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=wVCyJoivCkL/q4Lpvs5G0+inOQmQlFi2jwgYcGDiZmw=; b=iyepRIReThPDhkG+wUH4oGfZr5fcW1NGmqolosjzkcf42z/MO31SK7T7uAX58ffNze TBs+yCK+nlH1mMiiis9msa97cqXa/vJwkmiTQOxTV+rIM8GPnO/EynhXM85O+cSiaC/G vP8fM1DG6a87NbKLtjMNYDrJ9VmSeK7oCqrOi4tVXGzjYMQX/UCTaDzai26d50zY0sqn p2GFQgNrubF2cJzLaAFObfbkN/bYNmb+YxhwhWAZXhXYMPdEivf/3jnBTVh2Z9YfcqVc U9dJrQvjk2h8FJxmQdhpAUqGsVrQtKC27eXjHhGNjQT2a1APfy1K9HMJo/pT46gBim29 wwYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Od+AQcxU; 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 h20si4175067pgn.69.2019.04.01.10.17.42; Mon, 01 Apr 2019 10:17:57 -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=Od+AQcxU; 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 S1731122AbfDARRH (ORCPT + 99 others); Mon, 1 Apr 2019 13:17:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:42804 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730425AbfDARRE (ORCPT ); Mon, 1 Apr 2019 13:17:04 -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 363A52171F; Mon, 1 Apr 2019 17:17:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554139023; bh=UjUVxJAELuKsUPuSjw6nmxCQMm5MfDghrh/yKb8e4ZI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Od+AQcxU2RkeiDBIl9Tflwno1VciCmSk5rzHc4mNbV1YvY3mg8sUa8cQGYoJbEH9E 0zbCPkXMpIzUGwH5s14MWXYbX+yGuQb/UKSAG9IwI//SGzHAyLsuIuBsi62q9q1LRf RKUC+DWgfb8/HtyXh3j9d/ndY0BV4QaX9oMHPY/o= 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.19 090/134] USB: serial: ftdi_sio: add additional NovaTech products Date: Mon, 1 Apr 2019 19:02:06 +0200 Message-Id: <20190401170052.671808600@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190401170044.243719205@linuxfoundation.org> References: <20190401170044.243719205@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.19-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 @@ -599,6 +599,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 @@ -567,7 +567,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)