From patchwork Thu Jul 20 05:10:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 122980 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2896304vqt; Wed, 19 Jul 2023 22:24:13 -0700 (PDT) X-Google-Smtp-Source: APBJJlHbSkn/N65zkOCAKG1YtikdeW91eNzW4hKtsYCC6WmYL6mpNBt3l5Wvo+dsr3T6cqCQ3rSW X-Received: by 2002:a05:6a00:1397:b0:67b:f249:35e2 with SMTP id t23-20020a056a00139700b0067bf24935e2mr27879352pfg.21.1689830653533; Wed, 19 Jul 2023 22:24:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689830653; cv=none; d=google.com; s=arc-20160816; b=nTVsqp7+3kl43wkX+fQLvAi6nq0E7SSQclvD1ObwdvHWTm6kyuJeVutowNmcgTm0ga 5ijtr1E6uayj8nY+YFOnz3QbbxUPJwgPk8UtuDtSyU82FRXUx2HnKOTHmHJnEQt+2xNA JJQHPe2MiPLSXccaP4XFszVCZH6Nw1CjSELsbiMOS6F+2cEKB7e8sohBTtrvu382d9/W 9CKVvycOlXRbkr//SAAFu6eZ6c1VpzLJsaDG8vl6Bt2bQWTnl3wJL0pICaSXIDYvMDkV Fn6XjW/1yY8OmlbES1ArmT57HJNEzlVvw43vTlYUPjpRRrCVqBGVjRVV9ncJfLrDKY9z saMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=U5MPUqahsXxfgk8D/RwCH+bPEiv7vDQqkgNPxs046Dw=; fh=QfFvZMFd2hoVlbuCbqctSEs0o52a1IzzvCYA93Dnc3Q=; b=ZmydeYNXspRnicyBdUocmfvpJdyDPhBJzH6FQCcevloJ5tOLMxNhXuRAlp78dZOvOt rWx7DqaeroOzbmHPf5sA8r2ggLvAtJDpYjumvb/2ZoubXjdcbnspcWysxiDZK54XfXGW 1HYfSpFq0l7JwKv2gXtIu+zXM1t+QqzXUfjdF87F14qhPoWb4wuMjX9uBnGjcpqU9IHe 61ADHN8RvlPJw0zJkmunJNHfyf+adZqUL2wWtVvgxRTDKMxcXNy1qTiXPmxawfOWy5qu YQk7ul77aEssM3rcvhQW5XvNu9CAx8XmUvien7cHnpM0nzFoEgvv+7boKZwgcG+aFIRH P0Mg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t16-20020a056a00139000b00665dfbf3b1esi200985pfg.270.2023.07.19.22.23.58; Wed, 19 Jul 2023 22:24:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229758AbjGTFKl (ORCPT + 99 others); Thu, 20 Jul 2023 01:10:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229737AbjGTFKj (ORCPT ); Thu, 20 Jul 2023 01:10:39 -0400 Received: from muru.com (muru.com [72.249.23.125]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 063DD113; Wed, 19 Jul 2023 22:10:37 -0700 (PDT) Received: from hillo.muru.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTP id 9E95D80F7; Thu, 20 Jul 2023 05:10:34 +0000 (UTC) From: Tony Lindgren To: Greg Kroah-Hartman , Jiri Slaby , Andy Shevchenko Cc: Andy Shevchenko , Dhruva Gole , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , John Ogness , Johan Hovold , Sebastian Andrzej Siewior , Vignesh Raghavendra , linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] serial: core: Controller id cannot be negative Date: Thu, 20 Jul 2023 08:10:14 +0300 Message-ID: <20230720051021.14961-2-tony@atomide.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230720051021.14961-1-tony@atomide.com> References: <20230720051021.14961-1-tony@atomide.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771915867539422178 X-GMAIL-MSGID: 1771915867539422178 The controller id cannot be negative. Fixes: 84a9582fd203 ("serial: core: Start managing serial controllers to enable runtime PM") Reported-by: Andy Shevchenko Closes: https://lore.kernel.org/linux-serial/ZLd154hdaSG2lnue@smile.fi.intel.com/#t Signed-off-by: Tony Lindgren --- include/linux/serial_core.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -459,7 +459,7 @@ struct uart_port { struct serial_rs485 *rs485); int (*iso7816_config)(struct uart_port *, struct serial_iso7816 *iso7816); - int ctrl_id; /* optional serial core controller id */ + unsigned int ctrl_id; /* optional serial core controller id */ unsigned int irq; /* irq number */ unsigned long irqflags; /* irq flags */ unsigned int uartclk; /* base uart clock */ From patchwork Thu Jul 20 05:10:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 122979 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2895971vqt; Wed, 19 Jul 2023 22:23:09 -0700 (PDT) X-Google-Smtp-Source: APBJJlHPgRq8lhUWCszwyx/t2c8ct05GJaMIdpZhpCRvQVzviEzEmRuj2vsBfsBFygZNlO5oFYyb X-Received: by 2002:a05:6a21:3806:b0:123:2c2a:ee62 with SMTP id yi6-20020a056a21380600b001232c2aee62mr18088572pzb.14.1689830589001; Wed, 19 Jul 2023 22:23:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689830588; cv=none; d=google.com; s=arc-20160816; b=QPp3E/yVKsAKAsjb8vAfr1A41eEo9sTgxfFB2eE53uVw8IhyFDth/8Lbr5s0CY0Sle QTb6+2FiBBm8tBjXJRKZRviYtam4z+dl1/FUB2PVCms6asxDHjl0q0t6RtmnizLyzdLI tDGOkyDser0zNUVGSoKCxRmYzbXeff9d3oJp206uW7/orn94TPgEFWbMTxG7YJAZW5gq s6cNGSPjzOFbzu/WjeL/gygqyKbLwe3wSJqImyhFA1ju5UCC55eKPMlAABxYzj8qPf9h gymGS1Jja51uMzGqQc+X8x1WKt2PW1Ix6aWOG7zB5WDbN1lCVJ/5wst9nnyy59SGNLwi 3VKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=hMBdZ2x06ff5cNWhIvW5d7okSD4QNjoqzFoC7cOYL1s=; fh=4/QVXuYbDz5eDJk1WOri1GE1zBIPkwazzm/ZNdiW5zo=; b=liRJzo9vXtBMctHZRmgUTB1eYorYz1Gb6x5RvVgzbDUEkBTnCF7hNdVMQP5ZfZGpHW mcVM8U73WzYWhW8LMlDfgS0xd68Wyik4DmLmdpAKyXitY3rLaO2wsMMx35OXquDCLxGs izposLwq40aF7zguhD+TtCpj4YujWswmDURejzbof+d9YMfdB1ezKr2XYIVVZqFBtQuy Ucw5J20QbNN4baU4aKrlNd7T8ylLOk2xdupqMMKWSPReEFkQ0m4ARri7jD2FH0AKZJ9p aRBD/PGw/YihMpY276rlc+LJ7qmZ62lXuEYouuaoCOc0b/h3aBjujzLbmBkNuiVcIXNC 7mCA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id by9-20020a056a00400900b00666892d1ec3si177338pfb.360.2023.07.19.22.22.56; Wed, 19 Jul 2023 22:23:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229812AbjGTFKu (ORCPT + 99 others); Thu, 20 Jul 2023 01:10:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229779AbjGTFKo (ORCPT ); Thu, 20 Jul 2023 01:10:44 -0400 Received: from muru.com (muru.com [72.249.23.125]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id B3137113; Wed, 19 Jul 2023 22:10:43 -0700 (PDT) Received: from hillo.muru.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTP id 3D01780F7; Thu, 20 Jul 2023 05:10:41 +0000 (UTC) From: Tony Lindgren To: Greg Kroah-Hartman , Jiri Slaby , Andy Shevchenko Cc: Andy Shevchenko , Dhruva Gole , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , John Ogness , Johan Hovold , Sebastian Andrzej Siewior , Vignesh Raghavendra , linux-omap@vger.kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/3] serial: core: Fix serial core port id to not use port->line Date: Thu, 20 Jul 2023 08:10:15 +0300 Message-ID: <20230720051021.14961-3-tony@atomide.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230720051021.14961-1-tony@atomide.com> References: <20230720051021.14961-1-tony@atomide.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771915799811200635 X-GMAIL-MSGID: 1771915799811200635 The serial core port id should be serial core controller specific port instance, which is not always the port->line index. For example, 8250 driver maps a number of legacy ports, and when a hardware specific device driver takes over, we typically have one driver instance for each port. Let's instead add port->port_id to keep track serial ports mapped to each serial core controller instance. Currently this is only a cosmetic issue for the serial core port device names. The issue can be noticed looking at /sys/bus/serial-base/devices for example though. Let's fix the issue to avoid port addressing issues later on. Fixes: 84a9582fd203 ("serial: core: Start managing serial controllers to enable runtime PM") Signed-off-by: Tony Lindgren --- drivers/tty/serial/8250/8250_core.c | 2 ++ drivers/tty/serial/serial_base_bus.c | 2 +- include/linux/serial_core.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c --- a/drivers/tty/serial/8250/8250_core.c +++ b/drivers/tty/serial/8250/8250_core.c @@ -497,6 +497,7 @@ static struct uart_8250_port *serial8250_setup_port(int index) up = &serial8250_ports[index]; up->port.line = index; + up->port.port_id = index; serial8250_init_port(up); if (!base_ops) @@ -1040,6 +1041,7 @@ int serial8250_register_8250_port(const struct uart_8250_port *up) uart_remove_one_port(&serial8250_reg, &uart->port); uart->port.ctrl_id = up->port.ctrl_id; + uart->port.port_id = up->port.port_id; uart->port.iobase = up->port.iobase; uart->port.membase = up->port.membase; uart->port.irq = up->port.irq; diff --git a/drivers/tty/serial/serial_base_bus.c b/drivers/tty/serial/serial_base_bus.c --- a/drivers/tty/serial/serial_base_bus.c +++ b/drivers/tty/serial/serial_base_bus.c @@ -136,7 +136,7 @@ struct serial_port_device *serial_base_port_add(struct uart_port *port, err = serial_base_device_init(port, &port_dev->dev, &ctrl_dev->dev, &serial_port_type, serial_base_port_release, - port->line); + port->port_id); if (err) goto err_put_device; diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -460,6 +460,7 @@ struct uart_port { int (*iso7816_config)(struct uart_port *, struct serial_iso7816 *iso7816); unsigned int ctrl_id; /* optional serial core controller id */ + unsigned int port_id; /* optional serial core port id */ unsigned int irq; /* irq number */ unsigned long irqflags; /* irq flags */ unsigned int uartclk; /* base uart clock */ From patchwork Thu Jul 20 05:10:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 122978 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2895966vqt; Wed, 19 Jul 2023 22:23:07 -0700 (PDT) X-Google-Smtp-Source: APBJJlFjul+Z/OFk81J1uL2my6FrJaq8LWQ/c8f2KHw4PznbEk30zzC79p4O6wWZScw7yIt83KYQ X-Received: by 2002:a05:6a21:339b:b0:133:215e:746d with SMTP id yy27-20020a056a21339b00b00133215e746dmr6374555pzb.41.1689830587627; Wed, 19 Jul 2023 22:23:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689830587; cv=none; d=google.com; s=arc-20160816; b=w8FU3b6kEVi/7V8IohyLMdskTDMpIAwW85hPyjHDux8MN/aT6LsQbEp13gSij4D7kJ cRwdFw1o9NIHU+pC1LeFvOQQN9vr6Vuz+/onq5IMSatA2DCLYf7/9Y65hFUFaBMJDaoO UF30oO7KsPLxTAnzwOyW1Otm6O9SoPE5fTEqbCg/ZdMeThH+XOa4EBD2n6H+r7Lco9Vn xEn7gX0L1IJqTIFzJCP1Pre8Gu7LlbKX0WxFEZuhGUP+mgzegP9ONYzOVZ69IfWRn6Dp HfzE27PhD+TU4VaioSFcryvtXhfCwtEMprhPq/xfMhezBD232GSNUeKzlCMK44IQ//ib MZcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=m1bcS5djnwE+EPU1AXVyo8gr1XZfusFQaFJvk+KUSCY=; fh=4/QVXuYbDz5eDJk1WOri1GE1zBIPkwazzm/ZNdiW5zo=; b=OOHxuWm+nGYhYcuRa5/y0xeyCZnyHSKn5RxB6qeFnuevZjNh5VDHQZBk004NAW9m1q IOsUNDK3RYj+XF80kBArGzzOfiQDJ5n/3S5FspcFngKV29uNkLINUQpENTrgUQdQigyQ 4GapDWAILIjjPDLlXlnfk88PtCtozbx5IrQrFK/KCooipSgP+HqosWvUesX66BFGD23V Xk+QQMaZ4SdafNI5u1//qOqgxbvXxpYlNspt4bMMRL0ti/zM7oCV999emqCtJCdshAba UwXmMqJz2e0hMOF3vuPYGBe6/Z6GOV3/ZRIpf2DlQ2kX2IUHVtfUkE+rYUC3yCskl95/ GO6A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m17-20020a056a00081100b0068255c2b8a8si226911pfk.151.2023.07.19.22.22.54; Wed, 19 Jul 2023 22:23:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229828AbjGTFLA (ORCPT + 99 others); Thu, 20 Jul 2023 01:11:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229832AbjGTFK4 (ORCPT ); Thu, 20 Jul 2023 01:10:56 -0400 Received: from muru.com (muru.com [72.249.23.125]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 83EFB269E; Wed, 19 Jul 2023 22:10:50 -0700 (PDT) Received: from hillo.muru.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTP id 3CF7D80F7; Thu, 20 Jul 2023 05:10:47 +0000 (UTC) From: Tony Lindgren To: Greg Kroah-Hartman , Jiri Slaby , Andy Shevchenko Cc: Andy Shevchenko , Dhruva Gole , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , John Ogness , Johan Hovold , Sebastian Andrzej Siewior , Vignesh Raghavendra , linux-omap@vger.kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] serial: core: Fix serial core controller port name to show controller id Date: Thu, 20 Jul 2023 08:10:16 +0300 Message-ID: <20230720051021.14961-4-tony@atomide.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230720051021.14961-1-tony@atomide.com> References: <20230720051021.14961-1-tony@atomide.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771915798465900827 X-GMAIL-MSGID: 1771915798465900827 We are missing the serial core controller id for the serial core port name. Let's fix the issue for sane /sys/bus/serial-core/devices, and to avoid issues addressing serial ports later on. Fixes: 84a9582fd203 ("serial: core: Start managing serial controllers to enable runtime PM") Reported-by: Andy Shevchenko Closes: https://lore.kernel.org/linux-serial/20230719051613.46569-1-tony@atomide.com/T/#m0f358e91262f7f56198ba9d0a7100809e9e35cc5 Signed-off-by: Tony Lindgren --- drivers/tty/serial/serial_base_bus.c | 33 ++++++++++++++++++---------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/drivers/tty/serial/serial_base_bus.c b/drivers/tty/serial/serial_base_bus.c --- a/drivers/tty/serial/serial_base_bus.c +++ b/drivers/tty/serial/serial_base_bus.c @@ -19,6 +19,14 @@ static bool serial_base_initialized; +static const struct device_type serial_ctrl_type = { + .name = "ctrl", +}; + +static const struct device_type serial_port_type = { + .name = "port", +}; + static int serial_base_match(struct device *dev, struct device_driver *drv) { int len = strlen(drv->name); @@ -48,7 +56,8 @@ static int serial_base_device_init(struct uart_port *port, struct device *parent_dev, const struct device_type *type, void (*release)(struct device *dev), - int id) + unsigned int ctrl_id, + unsigned int port_id) { device_initialize(dev); dev->type = type; @@ -61,13 +70,17 @@ static int serial_base_device_init(struct uart_port *port, return -EPROBE_DEFER; } - return dev_set_name(dev, "%s.%s.%d", type->name, dev_name(port->dev), id); + if (type == &serial_ctrl_type) + return dev_set_name(dev, "%s.%s.%d", type->name, + dev_name(port->dev), ctrl_id); + else if (type == &serial_port_type) + return dev_set_name(dev, "%s.%s.%d.%d", type->name, + dev_name(port->dev), ctrl_id, + port_id); + else + return -EINVAL; } -static const struct device_type serial_ctrl_type = { - .name = "ctrl", -}; - static void serial_base_ctrl_release(struct device *dev) { struct serial_ctrl_device *ctrl_dev = to_serial_base_ctrl_device(dev); @@ -96,7 +109,7 @@ struct serial_ctrl_device *serial_base_ctrl_add(struct uart_port *port, err = serial_base_device_init(port, &ctrl_dev->dev, parent, &serial_ctrl_type, serial_base_ctrl_release, - port->ctrl_id); + port->ctrl_id, 0); if (err) goto err_put_device; @@ -112,10 +125,6 @@ struct serial_ctrl_device *serial_base_ctrl_add(struct uart_port *port, return ERR_PTR(err); } -static const struct device_type serial_port_type = { - .name = "port", -}; - static void serial_base_port_release(struct device *dev) { struct serial_port_device *port_dev = to_serial_base_port_device(dev); @@ -136,7 +145,7 @@ struct serial_port_device *serial_base_port_add(struct uart_port *port, err = serial_base_device_init(port, &port_dev->dev, &ctrl_dev->dev, &serial_port_type, serial_base_port_release, - port->port_id); + port->ctrl_id, port->port_id); if (err) goto err_put_device;