From patchwork Thu Feb 2 19:48:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 93126 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp266706qgi; Thu, 2 Feb 2017 11:48:41 -0800 (PST) X-Received: by 10.99.126.76 with SMTP id o12mr12667489pgn.84.1486064921092; Thu, 02 Feb 2017 11:48:41 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 31si23224271plf.32.2017.02.02.11.48.40; Thu, 02 Feb 2017 11:48:41 -0800 (PST) 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; 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 S1751999AbdBBTsh (ORCPT + 25 others); Thu, 2 Feb 2017 14:48:37 -0500 Received: from mail-ot0-f196.google.com ([74.125.82.196]:34267 "EHLO mail-ot0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751446AbdBBTse (ORCPT ); Thu, 2 Feb 2017 14:48:34 -0500 Received: by mail-ot0-f196.google.com with SMTP id 73so3006963otj.1; Thu, 02 Feb 2017 11:48:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xsFiK7wJVCnKmSvO2FQXX1h3pJ0Xm8ck/DAT7EWh//Y=; b=mhmCol8iLT7sB3u096/5bKR7OZPrhx7M+aEC7M2v1FQIKKDP5Ri8KkOY162RAdNcPr N5uB7PEndXF/kLT6DQAdKEbxZNNqjSoWVBc4gNN4gQWH5e3wgYzprZFXp9ClaYNos563 SJxa4fLtSDER3FbW6X1tuxaQiUCgrh2dzW+0fAYno/xmCKcQBovM0wcvIXdnlMAVj3vY jcBrXLSWafZmPm/CbEUZxnH0lsDTbEZJ78dFwF56OZm8Sa8qJgcrkqmxOfRZF4WD9wwd TmNahoqHJ3MPyG6Tvmp1b8m2j4V1F7379QFERaIBs2+9Fmg+RFWXMrVQdrxt39bJJ72l mhRA== X-Gm-Message-State: AIkVDXINaLiWf4EldUAoLCx3fA0SOLnNitj6BQVCSmhcZ8gty2ZH3Y+5+fPfIR8srmCswg== X-Received: by 10.157.61.72 with SMTP id a66mr5608754otc.25.1486064898202; Thu, 02 Feb 2017 11:48:18 -0800 (PST) Received: from rob-hp-laptop.herring.priv (66-90-148-125.dyn.grandenetworks.net. [66.90.148.125]) by smtp.googlemail.com with ESMTPSA id y11sm13183471oia.2.2017.02.02.11.48.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Feb 2017 11:48:17 -0800 (PST) From: Rob Herring To: Greg Kroah-Hartman , Marcel Holtmann , Jiri Slaby , Sebastian Reichel , Arnd Bergmann , "Dr . H . Nikolaus Schaller" , Peter Hurley , Andy Shevchenko , Alan Cox Cc: Loic Poulain , Pavel Machek , NeilBrown , Linus Walleij , linux-bluetooth@vger.kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 5/5] tty_port: register tty ports with serdev bus Date: Thu, 2 Feb 2017 13:48:09 -0600 Message-Id: <20170202194809.18274-6-robh@kernel.org> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20170202194809.18274-1-robh@kernel.org> References: <20170202194809.18274-1-robh@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Register a serdev controller with the serdev bus when a tty_port is registered. This creates the serdev controller and create's serdev devices for any DT child nodes of the tty_port's parent (i.e. the UART device). Signed-off-by: Rob Herring Reviewed-By: Sebastian Reichel Tested-By: Sebastian Reichel --- v4: - no change v3: - no change v2: - Skip creating the tty device file node when serdev_tty_port_register finds slave devices. drivers/tty/tty_port.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) -- 2.10.1 diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c index 8d9886b06037..5cd3cd932293 100644 --- a/drivers/tty/tty_port.c +++ b/drivers/tty/tty_port.c @@ -16,6 +16,7 @@ #include #include #include +#include static int tty_port_default_receive_buf(struct tty_port *port, const unsigned char *p, @@ -128,7 +129,15 @@ struct device *tty_port_register_device_attr(struct tty_port *port, struct device *device, void *drvdata, const struct attribute_group **attr_grp) { + struct device *dev; + tty_port_link_device(port, driver, index); + + dev = serdev_tty_port_register(port, device, driver, index); + if (PTR_ERR(dev) != -ENODEV) + /* Skip creating cdev if we registered a serdev device */ + return dev; + return tty_register_device_attr(driver, index, device, drvdata, attr_grp); } @@ -180,6 +189,9 @@ static void tty_port_destructor(struct kref *kref) /* check if last port ref was dropped before tty release */ if (WARN_ON(port->itty)) return; + + serdev_tty_port_unregister(port); + if (port->xmit_buf) free_page((unsigned long)port->xmit_buf); tty_port_destroy(port);