From patchwork Mon Jul 24 06:33:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 124652 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1617042vqg; Mon, 24 Jul 2023 00:00:59 -0700 (PDT) X-Google-Smtp-Source: APBJJlFW/2oC6Y4i304NdeVZTmvug/QT5fBS4reYNpUQoTd5dMXUBs+cmVsn2wn2IMVqCp5GoHQY X-Received: by 2002:aa7:ce10:0:b0:522:1fd2:ca7a with SMTP id d16-20020aa7ce10000000b005221fd2ca7amr3903685edv.29.1690182059500; Mon, 24 Jul 2023 00:00:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690182059; cv=none; d=google.com; s=arc-20160816; b=mRuJy4RUx58eS7+XiSzRpe+bm2atR0saDsAdJRaVPsnvFuDhnOuc7RQBHoziJ3Xe7r C23WgUJdLOoOFxdv2hhbtldcUbGQYkz5c2h3UJE0hkKNad9m5jZ2GH8spXsG+eLJOyfl XZNVMwqKjaD4iGQ0BNLqJY53zlfoqrK6JQ0HjUAsCYhwP4JuOrxDYnuAYVwvN/z6cXLI o74OKh5B3WkheqzQMyB0dBG6uBTKeknhi2KCotjcl1ZSoAzMOAmaLlSrRZeqiBIGr9ys T3J2m3grzKHdb34aegoipKUR5RTz/MTz3++ieWJZt+L40Frg1utRzZYzFPsTaR5Jh04M KXFQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=xi02gFW93Id0bT7Sh+4wBXdpqlJzFPayUdH3m+EHzPM=; fh=9bve6RI0XNndX5v+//R63Y5yUo82f8meSCc1RH8a1xI=; b=L/zzrFMrQoFZZIZlqzYPFRyWg7j8IG2CSUlA6KMu7ZTHFt1xdRNOKt3RHW9cmfM4ps zgUXjww6rPTS5KNiKN8EbhKTsHKmAYMydauQGXdxjoTRiY2WEBl04s2OiGa5gx7bYMAy CUmDnGkFDz5z2ltA0/VEooDdahRY/LpG7HkwiI8GfXsR9KNGdJVhqIBoU8Vpx2+FdvIQ tRfWK+ExAXw0rqfjVF4HNeD6SGin7JTNR+/m3lUiiTrFSq/Q2oz5OlAhjvNXRm5Ue64v QRCC55hzbJ5fF5Jr7WjmzBc4Prs+fwaJwORucq86wNwba/4FiIMmGaUB9QBPHK6gXWuu mF9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=BSdcx4Wo; 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 b22-20020aa7df96000000b0052237dfa831si475522edy.541.2023.07.24.00.00.31; Mon, 24 Jul 2023 00:00:59 -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; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=BSdcx4Wo; 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 S229921AbjGXGdw (ORCPT + 99 others); Mon, 24 Jul 2023 02:33:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229537AbjGXGdu (ORCPT ); Mon, 24 Jul 2023 02:33:50 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D439ED2; Sun, 23 Jul 2023 23:33:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:In-Reply-To:References; bh=xi02gFW93Id0bT7Sh+4wBXdpqlJzFPayUdH3m+EHzPM=; b=BSdcx4WoALDgeHupsuSnOLc1rn gERe7ONSyqR4QdO2pdzHlgtJabW3mHKBgo9gz+fGGpRUX+vnDhZJ5AOedAXhwikUVAL0+SmhjwbxN /N0VWSoe1u1O8qFlW0Q/15iF3i1+4nL3KQEXy6vAxvUZONFG/WTS+I9t67a82XbLG7OfvoNZTxlTI kjMZrhFr7XVvcCGYfNtO/vTmnvsfUi39W5AF55O0z+mC8Pv0FcqpRQ7u2UZsTkfqp6YEEL95yW2ps /w1IpB+gf6iGr6PMeyaMEROi7+ys87t30fRl2tQhbDcxqjeRIsrAXvlidl94WCiUtoYWe74OlVV2m HuQe1YPw==; Received: from [2601:1c2:980:9ec0::2764] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1qNp8c-002ySv-17; Mon, 24 Jul 2023 06:33:46 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , Timur Tabi , Kumar Gala , linuxppc-dev@lists.ozlabs.org, Greg Kroah-Hartman , Jiri Slaby , linux-serial@vger.kernel.org, Jonathan Corbet , linux-doc@vger.kernel.org Subject: [PATCH] Documentation: devices.txt: reconcile serial/ucc_uart minor numers Date: Sun, 23 Jul 2023 23:33:41 -0700 Message-ID: <20230724063341.28198-1-rdunlap@infradead.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,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: 1772284342768120882 X-GMAIL-MSGID: 1772284342768120882 Reconcile devices.txt with serial/ucc_uart.c regarding device number assignments. ucc_uart.c supports 4 ports and uses minor devnums 46-49, so update devices.txt with that info. Then update ucc_uart.c's reference to the location of the devices.txt list in the kernel source tree. Fixes: d7584ed2b994 ("[POWERPC] qe-uart: add support for Freescale QUICCEngine UART") Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Randy Dunlap Cc: Timur Tabi Cc: Kumar Gala Cc: linuxppc-dev@lists.ozlabs.org Cc: Greg Kroah-Hartman Cc: Jiri Slaby Cc: linux-serial@vger.kernel.org Cc: Jonathan Corbet Cc: linux-doc@vger.kernel.org Acked-by: Timur Tabi --- Documentation/admin-guide/devices.txt | 2 +- drivers/tty/serial/ucc_uart.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -- a/drivers/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c --- a/drivers/tty/serial/ucc_uart.c +++ b/drivers/tty/serial/ucc_uart.c @@ -59,7 +59,7 @@ static int firmware_loaded; /* #define LOOPBACK */ /* The major and minor device numbers are defined in - * http://www.lanana.org/docs/device-list/devices-2.6+.txt. For the QE + * Documentation/admin-guide/devices.txt. For the QE * UART, we have major number 204 and minor numbers 46 - 49, which are the * same as for the CPM2. This decision was made because no Freescale part * has both a CPM and a QE. diff -- a/Documentation/admin-guide/devices.txt b/Documentation/admin-guide/devices.txt --- a/Documentation/admin-guide/devices.txt +++ b/Documentation/admin-guide/devices.txt @@ -2691,7 +2691,7 @@ 45 = /dev/ttyMM1 Marvell MPSC - port 1 (obsolete unused) 46 = /dev/ttyCPM0 PPC CPM (SCC or SMC) - port 0 ... - 47 = /dev/ttyCPM5 PPC CPM (SCC or SMC) - port 5 + 49 = /dev/ttyCPM5 PPC CPM (SCC or SMC) - port 3 50 = /dev/ttyIOC0 Altix serial card ... 81 = /dev/ttyIOC31 Altix serial card