From patchwork Mon Jan 16 22:54:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring \(Arm\)" X-Patchwork-Id: 91583 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp232949qgi; Mon, 16 Jan 2017 14:55:13 -0800 (PST) X-Received: by 10.84.233.193 with SMTP id m1mr53863231pln.126.1484607313067; Mon, 16 Jan 2017 14:55:13 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 61si7820515plz.304.2017.01.16.14.55.12; Mon, 16 Jan 2017 14:55:13 -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 S1751799AbdAPWzC (ORCPT + 25 others); Mon, 16 Jan 2017 17:55:02 -0500 Received: from mail-ot0-f193.google.com ([74.125.82.193]:36728 "EHLO mail-ot0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751632AbdAPWyv (ORCPT ); Mon, 16 Jan 2017 17:54:51 -0500 Received: by mail-ot0-f193.google.com with SMTP id 36so7677357otx.3; Mon, 16 Jan 2017 14:54:51 -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=OqZulPUYAji3YtVEAd8dQZW73u4+iZl3Qjp6XNO2Bi0=; b=Ldq95xHPfvhEeiYdnXfjOfUehbbzJlxyLkew598NdkQp+5ETq37MNXAVGA7qzGoHZA fce08yfWOIqk6k2nIbBvfsDzAEFpQUz0ZrrkfwpD+Y6opEcSns4uY0Vzxk1rV4pqbSy5 18+uRDPTjvgqmcd/htRqCR2+3XR3lvpz6KD/OEFkJkR3Ey2wa077zv6HU7BGwlPW+xle SGV15TfMiodkkMKxH1T+2wsU1YtaJrrWXqGYl+Br4vHGW+GuR6faPOThtOZ0K+ukr9ou O75REqUf9raBkepC2rcK6IE0rOwSXvSl2AuOv+Dau9/4sy3lZTB0iAI0OoIHQ8Ab9QTt wB0A== X-Gm-Message-State: AIkVDXKre77GmH+OpR4aJcytsJ7mL6Kpwwrp/GAGDpJIJUs/zBrB2xsFlgE5uMzW44o/+g== X-Received: by 10.157.56.138 with SMTP id p10mr19012612otc.195.1484607290936; Mon, 16 Jan 2017 14:54:50 -0800 (PST) Received: from rob-hp-laptop.herring.priv (72-48-98-129.dyn.grandenetworks.net. [72.48.98.129]) by smtp.googlemail.com with ESMTPSA id s125sm11601254oia.0.2017.01.16.14.54.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Jan 2017 14:54:50 -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 v2 9/9] tty_port: register tty ports with serdev bus Date: Mon, 16 Jan 2017 16:54:36 -0600 Message-Id: <20170116225436.17505-10-robh@kernel.org> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20170116225436.17505-1-robh@kernel.org> References: <20170116225436.17505-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 --- 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 232a8cbf47bc..d7e0dced967b 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, @@ -125,7 +126,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); } @@ -177,6 +186,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);