From patchwork Thu Dec 1 10:36:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 13061177 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 93956C4321E for ; Thu, 1 Dec 2022 10:38:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=HWy4bKXAfp/HS36BtcGf2ID3p/qrRDmm2fDBHodjbFc=; b=UdE1KP8YOwIOAi PfsQ7MzavSvnV2Rrvy43j63gQcR0d2wkkpL5uVYbjLlbf+ZaWkssn+/DAcJdtaiA4JHOrV2h/gfDy D7dr9P2QAoPoaSrkH/qKNFRxEka3AfgcaSA928RiRGnCPiWoIwYI0hw2yMmVMFdyqtQn49Z37QCzM FtGkkSFvdoZlYDS4guzDWZZAi6tVxrsEpV8gMyiuy/HnC3VoHkE8k/d5cc9RFomwTxp6yuQ0T/xgh ZF2jKEGgS89WaPgzr54XThY7jTsRcDQA11A9oXvFscT8Th6rfLkd3tNgJT4p8enEzGr6gyijcwGrF sA0+LjK4etKS/sr7yE6w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1p0gwL-006lxh-HZ; Thu, 01 Dec 2022 10:37:13 +0000 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1p0gwG-006luG-07 for linux-arm-kernel@lists.infradead.org; Thu, 01 Dec 2022 10:37:10 +0000 Received: by mail-pf1-x42e.google.com with SMTP id w129so1478844pfb.5 for ; Thu, 01 Dec 2022 02:37:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=+WRkgKEIfnbIC3sboGx7at523Tajis/IinNKBu0g+f0=; b=4aJjSaljnbWvmCdxfv2Tw8eNcPRlLQgtjkc95h7EWk4LbVtnRfG9yZ9085y/tbN/U+ uLYVvkAC3maD/srRId4iYVVZxanKsYrHI7De9MyJxn3JUkxTuRBnhuVBjtmYip+79p9F Ea7P9w6ygdO6c1U5+imSJM2ONyKGZLfOeVeg0eiIpx65LYcNTarhKGvpr5hYydm2U4hi dTjhtEh9F6txeCwAldKilSPo2brXCeRJufeELa0/WjcGjYMWwez6mejy8eIyOrhxWG7o lRIfo84Taw3mifwHYsuzrM/Jg+gQrA2Y+jcUgGH6H/LHx2O6BLCbT8BR/Az3+R+9nUqa QKaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=+WRkgKEIfnbIC3sboGx7at523Tajis/IinNKBu0g+f0=; b=k/kpBfEokypJUdE9+Ex0ETj4mfakCNCgOlfXu7FJ4OSwhT3P41Tsyj/sD3CG01CZm/ U6URZFpvI1yuGGA5dBlBuQEX2Dbj7SDUvEKYj4DRXUI69g+4uE7PwPJroFGKiCq09cGX Hk84YuNEPbieWPWIVZM+Qg5LGhaOVx6BocvjlFG9qrBGbuxgs/6Y1gBO8lDm8UgLlT8C RInYvaVUszhkfKpLA+nKS4qkGl+FjS1TMOzKCRcO5euJrti0/JTkMWN5U9IQECgGZelz mWBatW7AjjycwVkkLBjp6Ht3+a0C6Pt0GZKfMWZ1kXBldZCikcqeNtY2CMGAnx5Od1pf oAzQ== X-Gm-Message-State: ANoB5plu9kSnzSIyBN9fbx1Jn0nJC+fb5l7ONRF5RfOiqQSHZekJB7EH dUtC8BD97lzxJ5lpUGMLTy08aA== X-Google-Smtp-Source: AA0mqf43IR8AhUgxd1fohVg0/7ky938ImQTjBbMoTgnM3ajiZwSIxVkoEgYa1CSaTh7TSSmpgJi1iA== X-Received: by 2002:a05:6a00:216e:b0:56e:7b62:bba with SMTP id r14-20020a056a00216e00b0056e7b620bbamr46739385pff.55.1669891024654; Thu, 01 Dec 2022 02:37:04 -0800 (PST) Received: from fedora.flets-east.jp ([2400:4050:c360:8200:8ae8:3c4:c0da:7419]) by smtp.gmail.com with ESMTPSA id jx24-20020a17090b46d800b00213202d77d9sm2709877pjb.43.2022.12.01.02.37.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Dec 2022 02:37:04 -0800 (PST) From: Akihiko Odaki To: Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, asahi@lists.linux.dev, Krzysztof Kozlowski , Rob Herring , Alyssa Rosenzweig , Sven Peter , Hector Martin , Akihiko Odaki Subject: [PATCH] arch: arm64: dts: apple: Remove stdout-path Date: Thu, 1 Dec 2022 19:36:51 +0900 Message-Id: <20221201103651.27807-1-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221201_023708_079184_D5CD731B X-CRM114-Status: GOOD ( 15.85 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org u-boot overrides stdout-path so that it points to /chosen/framebuffer with some condition. > arm: apple: Point stdout-path to framebuffer when keyboard present > > Unless you have a spare Apple Silicon machine, getting access to > the serial port on Apple Silicon machines requires special > hardware. Given that most machines come with a built-in screen > the framebuffer is likely to be the most convenient output device > for most users. While U-Boot will output to both serial and > framebuffer, OSes might not. Therefore set stdout-path to point > at /chosen/framebuffer when a keyboard is connected to the machine. https://github.com/AsahiLinux/u-boot/commit/a609353e82fd757b7635d18ed6a0828fff657d59 Perhaps it made sense to specify serial0 as stdout-path when the framebuffer and keyboard support was inmature, but today it is preferrable to use /chosen/framebuffer instead of serial0 for the console in the most cases as the u-boot change states. Remove stdout-path to allow the kernel to choose the appropriate console. For Linux, it will be VT, which will be eventually backed by the framebuffer, if it is enabled. Otherwise, it will fall back to the serial. Signed-off-by: Akihiko Odaki --- arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi | 2 -- arch/arm64/boot/dts/apple/t600x-j375.dtsi | 2 -- arch/arm64/boot/dts/apple/t8103-jxxx.dtsi | 2 -- arch/arm64/boot/dts/apple/t8112-jxxx.dtsi | 2 -- 4 files changed, 8 deletions(-) diff --git a/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi b/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi index 5547f5e7ac5a..14b6bf234f82 100644 --- a/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi +++ b/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi @@ -30,8 +30,6 @@ chosen { #size-cells = <2>; ranges; - stdout-path = "serial0"; - framebuffer0: framebuffer@0 { compatible = "apple,simple-framebuffer", "simple-framebuffer"; reg = <0 0 0 0>; /* To be filled by loader */ diff --git a/arch/arm64/boot/dts/apple/t600x-j375.dtsi b/arch/arm64/boot/dts/apple/t600x-j375.dtsi index 7c207b1df949..22e96b436bf2 100644 --- a/arch/arm64/boot/dts/apple/t600x-j375.dtsi +++ b/arch/arm64/boot/dts/apple/t600x-j375.dtsi @@ -28,8 +28,6 @@ chosen { #size-cells = <2>; ranges; - stdout-path = "serial0"; - framebuffer0: framebuffer@0 { compatible = "apple,simple-framebuffer", "simple-framebuffer"; reg = <0 0 0 0>; /* To be filled by loader */ diff --git a/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi b/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi index 3c5da0e5a41d..d2483f618d44 100644 --- a/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi +++ b/arch/arm64/boot/dts/apple/t8103-jxxx.dtsi @@ -27,8 +27,6 @@ chosen { #size-cells = <2>; ranges; - stdout-path = "serial0"; - framebuffer0: framebuffer@0 { compatible = "apple,simple-framebuffer", "simple-framebuffer"; reg = <0 0 0 0>; /* To be filled by loader */ diff --git a/arch/arm64/boot/dts/apple/t8112-jxxx.dtsi b/arch/arm64/boot/dts/apple/t8112-jxxx.dtsi index b6b815d93c3e..af4153dcb55d 100644 --- a/arch/arm64/boot/dts/apple/t8112-jxxx.dtsi +++ b/arch/arm64/boot/dts/apple/t8112-jxxx.dtsi @@ -22,8 +22,6 @@ chosen { #size-cells = <2>; ranges; - stdout-path = "serial0"; - framebuffer0: framebuffer@0 { compatible = "apple,simple-framebuffer", "simple-framebuffer"; reg = <0 0 0 0>; /* To be filled by loader */