From patchwork Fri Apr 16 07:51:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zev Weiss X-Patchwork-Id: 12206893 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93B5DC433ED for ; Fri, 16 Apr 2021 08:20:30 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 462E06115B for ; Fri, 16 Apr 2021 08:20:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 462E06115B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bewilderbeest.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; 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=GNqsvf1hPj0xk4auL9UBVoFQkhmf2/KrmRj/vny2XK4=; b=mo+iZimCH3BBHJIV5kWxvy6A3v r5XvDpxSNNSFhEr29QLbOeWxgH6wiWnbWSrGlukE2DpDRPCrMo3OJcMuEsrz/qsAgcu5ltTGmP26C XRAE44yxEcufL0/sl0dq6FOst6s8pSaqOOLUxxZLBpQZjHayn5T9Mm7gu3nHT53wzot8RVYrClMrC aHD0oSmqEqq2Jm9uYOkgpl+3nTMAwjAdAAvxKSL2eo8qFVF9phSj9m1tBssTyCvlFMs2SM9qg1FWH 870nZeorFpxTYWJMz/wHEclNwr9ftdVhBbAehwK0zwGY4U5Ecm1jV+VR3/ek7UtmxDOrRpiJ+0crn s5kR58fA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lXJgR-001JKZ-1N; Fri, 16 Apr 2021 08:18:36 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lXJGk-001FQV-0V for linux-arm-kernel@desiato.infradead.org; Fri, 16 Apr 2021 07:52:02 +0000 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=gtBYFQvU70xkjkpifpEydwzy9XaAEMFkL6adfGXPg28=; b=LV/9vg2eY1YQhBQ/wUXXVV0b6b 9HxDa2JUmUSQffCZH3TEntPJyHEojid8xDhFrKWV7T9GI2tmG5NAWhL4w/35aTJKT3C7xnRxaB/cq ZZKusct4I7wRV0KaREVBJJ3pNw0DzZlr2dlNk7dwVQPDl+KZlLdWinZ/ljYtrDizzbqRBLuDKTVFK 03ehlZgKKVB1tHfXOCX8Rdyo1eJ1+OrkPDxVi8L/TXCTZhOMFiMnCwGfeHvJ6hl9Jj+6pALJdJ+uW CZnM4tk//TLompm+edwYAlUxau3pvuslePK3kbWmtDUX42mXOt6M6BhHPqZ15i4kuYpVlW+ILpAUX I45mh6MA==; Received: from thorn.bewilderbeest.net ([71.19.156.171]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lXJGh-009AL2-3r for linux-arm-kernel@lists.infradead.org; Fri, 16 Apr 2021 07:52:00 +0000 Received: from hatter.bewilderbeest.net (unknown [IPv6:2600:6c44:7f:ba20::7c6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: zev) by thorn.bewilderbeest.net (Postfix) with ESMTPSA id E4A4B72; Fri, 16 Apr 2021 00:51:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bewilderbeest.net; s=thorn; t=1618559516; bh=gtBYFQvU70xkjkpifpEydwzy9XaAEMFkL6adfGXPg28=; h=From:To:Cc:Subject:Date:From; b=l/rCgOR1d/8e5SiSClNjcrGxw1b3ZRW+8RbbwM7O975shSysOwFWVzXVMmbpFGAfG iU6Rjo4DQEtbe57u9qos1zR8RB+2y9SJOfNkKHtBaj5oL/e6irVPC+YNwZXUvY/e7B cHz6QgTb49XLVjxWlItYTOppxl/FsnEqZ7g1QHks= From: Zev Weiss To: Joel Stanley Cc: openbmc@lists.ozlabs.org, Zev Weiss , Rob Herring , Andrew Jeffery , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: dts: aspeed: update e3c246d4i vuart properties Date: Fri, 16 Apr 2021 02:51:13 -0500 Message-Id: <20210416075113.18047-1-zev@bewilderbeest.net> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210416_005159_175218_0CFEC12D X-CRM114-Status: GOOD ( 11.90 ) 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 This device-tree was merged with a provisional vuart IRQ-polarity property that was still under review and ended up taking a somewhat different form. This patch updates it to match the final form of the new vuart properties, which additionally allow specifying the SIRQ number and LPC address. Signed-off-by: Zev Weiss Reviewed-by: Andrew Jeffery Reviewed-by: Joel Stanley --- The relevant aspeed-vuart patches [0] have been merged into Greg KH's tty-next tree, so I figure it's probably okay to proceed with the corresponding dts adjustments now. [0] https://lore.kernel.org/openbmc/20210412034712.16778-1-zev@bewilderbeest.net/ arch/arm/boot/dts/aspeed-bmc-asrock-e3c246d4i.dts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/aspeed-bmc-asrock-e3c246d4i.dts b/arch/arm/boot/dts/aspeed-bmc-asrock-e3c246d4i.dts index dcab6e78dfa4..8be40c8283af 100644 --- a/arch/arm/boot/dts/aspeed-bmc-asrock-e3c246d4i.dts +++ b/arch/arm/boot/dts/aspeed-bmc-asrock-e3c246d4i.dts @@ -4,6 +4,7 @@ #include "aspeed-g5.dtsi" #include #include +#include /{ model = "ASRock E3C246D4I BMC"; @@ -73,7 +74,8 @@ &uart5 { &vuart { status = "okay"; - aspeed,sirq-active-high; + aspeed,lpc-io-reg = <0x2f8>; + aspeed,lpc-interrupts = <3 IRQ_TYPE_LEVEL_HIGH>; }; &mac0 {