From patchwork Tue Nov 30 18:48:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oskar Senft X-Patchwork-Id: 12694209 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 9F6DAC433EF for ; Tue, 30 Nov 2021 18:50:26 +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:Cc:To:From:Subject:Mime-Version: Message-Id:Date: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=mFsa/Tqvsrwd+1EwdzIXHuOFR+/+k7PgDokihFO7s9Q=; b=O2Y SGPNAmRSF8x0qXslnfPZrlkpPYZObBxXZHs7LDvSiy10CzrDhbuFHulR4rgh8g+gUH/c8HqSACINj SM+XUfvTamXbzXWHSyGi79fywIIFhRQh1oxGzN1OhQGGjLoba7livVwQrSXzj2PWaY+e1xSKCUDwB p2Lb+l7pbfwHV95e9eIFPaxRiUorSFol9Zm7u0hK732pNruunlT3mjS6n6vW7nZlCnYgkZVPM+ZGx QrHoXlT5Ls5KlCpNVFz1kPJeDo+XUwKb9P17dWNexuTjktypIxP/dLbUUD4cvmLS933FzIlRu6Puq e/iCr86n4Rk5DPNnkk3Ju80Xke5KLQA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ms8Bl-006WZv-7E; Tue, 30 Nov 2021 18:49:13 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ms8Bi-006WYe-1F for linux-arm-kernel@lists.infradead.org; Tue, 30 Nov 2021 18:49:11 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id q198-20020a25d9cf000000b005f7a6a84f9fso30606247ybg.6 for ; Tue, 30 Nov 2021 10:49:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=KC1KslsAWcLKbueuly8tNpIr1XMybfLtjcHTyhp9kPA=; b=eoiEVlkLUz8iLCc3q+yUTxvA+3ZF7VsDhtl4WNZsBLzc6K46xzxSsjbsJD2C/tUHQu hn1szDmsYDQEtq4mVVsib7hSyrVVtFUHOJSMktoUe0M9QwqANtBjEzFHCYFOlQohZlb2 5V1qSXN0RYsQe+2wNIcWm1OBS+pLNVRZUErpC1A+gDCf/ym+cIRx7gmDsg8Gt9X00Cmw S9tsr0LIM5s5DUGziknCita87jgmV0kvP4+Zuoe0ZB0PfsGX4cinsHwwz+9yuxPi8wB5 Dm/KpffAoPLZyqeBhsP02HHxIQDeavUkd0f3aiCzPLLVcb4ifSEkagflgH4726bZx6v8 9SdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=KC1KslsAWcLKbueuly8tNpIr1XMybfLtjcHTyhp9kPA=; b=Hrcw1i7fLrhpn7KxwcJBv1H01eabqQAschcypttVGNeGTzL2HVDBxU1+0mtZZ2k3Aq 0gBZ5gTBCZr8QxxSgMHGxV++XF6kGj2OIwVLHziCJO0A84pl4H0yHp/dd0MFIrHIj8hL lL7X9bWMIM8SjpeVpS/rvWJq1N70qXl6hpY/8ixSNFfXOSSnDAcur0gLUybjuTxOgN/I oAKd8R52D7/+GB669hyKutibC3kMhtLCyfweE2cjRAfqY24ZCz53uazp6nncGe5ymfO7 0mSMW9s89yJManMfLWAnxcZWRNNYAJ0N91xnG6XA1Oyc4ZyNQc/J6iUBLome+7yawnCN 2rqw== X-Gm-Message-State: AOAM531ZhzbOmZwHmcnPpTkIAiDVkAaQMkqQyGj/EiOWpT1Ahx5ns09P +AYSfbeSPET8o8Ro0CzeOuowcyg= X-Google-Smtp-Source: ABdhPJywuox5pRKXk/NzXZXHKmmoDVKC5pZnFGHOmy8w2yLDI/QOrQVy8Knol8P4jpbS+i0jDk7kXL4= X-Received: from osk.cam.corp.google.com ([2620:15c:93:a:bd6e:e7b3:bbdb:f3df]) (user=osk job=sendgmr) by 2002:a25:9781:: with SMTP id i1mr1064086ybo.638.1638298148193; Tue, 30 Nov 2021 10:49:08 -0800 (PST) Date: Tue, 30 Nov 2021 13:48:55 -0500 Message-Id: <20211130184855.1779353-1-osk@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.34.0.rc2.393.gf8c9666880-goog Subject: [PATCH] ARM: dts: aspeed: tyan-s7106: Add uart_routing and fix vuart config From: Oskar Senft To: Rob Herring , Joel Stanley , Andrew Jeffery , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org Cc: aaelhaj@google.com, Oskar Senft X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211130_104910_097915_B0B0EAF1 X-CRM114-Status: GOOD ( 16.51 ) 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 Configure the vuart in such a way that it does not inhibit the SuperIO's UART from functioning correctly. This allows the same DTS to be used for both configurations with SuperIO and VUART (depending on the BIOS build). The decision on whether to actually enable VUART can then be made at runtime. This change also enables the new uart_routing driver for the SuperIO case. Signed-off-by: Oskar Senft --- arch/arm/boot/dts/aspeed-bmc-tyan-s7106.dts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/arm/boot/dts/aspeed-bmc-tyan-s7106.dts b/arch/arm/boot/dts/aspeed-bmc-tyan-s7106.dts index 60ac6d3f03b5..aff27c1d4b06 100644 --- a/arch/arm/boot/dts/aspeed-bmc-tyan-s7106.dts +++ b/arch/arm/boot/dts/aspeed-bmc-tyan-s7106.dts @@ -3,6 +3,7 @@ #include "aspeed-g5.dtsi" #include +#include / { model = "Tyan S7106 BMC"; @@ -127,8 +128,23 @@ &uart5 { status = "okay"; }; +&uart_routing { + status = "okay"; +}; + &vuart { status = "okay"; + + /* We enable the VUART here, but leave it in a state that does + * not interfere with the SuperIO. The goal is to have both the + * VUART and the SuperIO available and decide at runtime whether + * the VUART should actually be used. For that reason, configure + * an "invalid" IO address and an IRQ that is not used by the + * BMC. + */ + + aspeed,lpc-io-reg = <0xffff>; + aspeed,lpc-interrupts = <15 IRQ_TYPE_LEVEL_HIGH>; }; &lpc_ctrl {