From patchwork Tue Apr 16 16:21:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Leis X-Patchwork-Id: 10903429 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2E090161F for ; Tue, 16 Apr 2019 16:23:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0D6632892C for ; Tue, 16 Apr 2019 16:23:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 00ED52897A; Tue, 16 Apr 2019 16:23:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9BB462896A for ; Tue, 16 Apr 2019 16:23:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version :Message-Id:In-Reply-To:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=l9ZiAxZPO1eo3zOa5JvF6Ct7WiMo4KHxe5dTxZSd2NE=; b=hC/2g7m5SjhRWJ nXQoVAz/NkQECopRHw43n/u/ZmFvWZD8t6IBi4TqChqixB/BDwn6F6t0DdSuyrTx3ozqkb+c3c7jq 65wXpFc46OIZy0nM6tCCP8FASAGlUAlSbme7Q97dgNxGNJSLZrpJ7vhe902M2T6i1deif3YPQTiRH qb4H5Jzs0DuzlK2tfw2si5Uxf/5Tqzj1AebA0eXAetmwKS8Ejwq4Y/UtMUZZSzfddUbiyRzpg087A Zzb1Pp0pAPwfFMAyiByVO64ERxeUcEovGzAOf1rcn6UNr4Mh96b2dGWBr6bUZSg77oL1NK0GfU5VW D3U494q5N8Hoxpd5MCGQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hGQrR-0006O5-Vl; Tue, 16 Apr 2019 16:23:05 +0000 Received: from mail-qk1-x74a.google.com ([2607:f8b0:4864:20::74a]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hGQqu-0005pm-Q3 for linux-arm-kernel@lists.infradead.org; Tue, 16 Apr 2019 16:22:34 +0000 Received: by mail-qk1-x74a.google.com with SMTP id a188so18368541qkf.0 for ; Tue, 16 Apr 2019 09:22:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=NPvt7sSc1zkwaIBM5xgspuUUhdwpA/3SPScemFlYhns=; b=jtONVZGF4KZMsUVDVYcda4XXt6HI9EaWwWmnwfamxSnbgCRlY3WucXsN6EMdatspZE J4t1Sxd8Ptj70SNoEHyH0Fdlrqz8WaEq9BiYiWKNBAeWjKA8TlvLu5zM/W8Iu/rT33aI KmBSunX9M15SdKdBLiE3yvK+rb6qwbErHwYzW2P3ItZ+2+m63acWoeg0yAuWBkoiuif1 k/wmW10+1zdQCArjIh6ED0W1HthShY/wE0ksFsthJnOtVCQIL6KP0FMgKRVNCOXIvCde ebK96VjpH+6YhaTa0aXdXjvMWW8c7tkFaReVcQK98b5Zq2/iuCAMTrJGd3Ae0pLFs61A RuvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=NPvt7sSc1zkwaIBM5xgspuUUhdwpA/3SPScemFlYhns=; b=j/kzvRM2LKiWfruTe6DSSTzocclymqoC8+o7avXCQwCccT+vVqzInfY1UIEMew9tfj qV41KnMoRMqwvptG2GwXZ8DFgc0fyLVh2PoeGq/3ripaGIShh0k8GBr96tPGnnIS/ZKp 3LgjZWziZ1QciWbYshFOL9u+Iv0mCgivCOePFqxA7HrbWeJMIYPeLpzVBve7BGxu2Igh 9HnCdeC5ejWaubJ4QJK4rw1UQ3H1gLc+Z8Wwppyt4quF1mRG4wKhPY0hKh3o4Q0Zsay6 s/s0BV2mS812se4FreH52EamxZ4zLYUqhjctXbCfjgzO/FphA9ATkVN6cc6qyj8eUoID Imew== X-Gm-Message-State: APjAAAUimvlpyjzyFSnhuDPTPVWVdFJuu+uikgpVJLBw1Imb76auIGKy j9jjwV+xz3HUW1wKfJRlFswrSLyVFZ4H X-Google-Smtp-Source: APXvYqz+p5jCEMyb5mCcnWCNrEdWPEIyNNVj/k1CwiFs3mip0KTJ/sOAQw4McYUj84e4RcEeyqtqXORwSDJz X-Received: by 2002:ac8:8d4:: with SMTP id y20mr66951267qth.13.1555431750915; Tue, 16 Apr 2019 09:22:30 -0700 (PDT) Date: Tue, 16 Apr 2019 09:21:51 -0700 In-Reply-To: <20190416162150.150154-1-venture@google.com> Message-Id: <20190416162150.150154-4-venture@google.com> Mime-Version: 1.0 References: <20190416162150.150154-1-venture@google.com> X-Mailer: git-send-email 2.21.0.392.gf8f6787159e-goog Subject: [PATCH 3/3] ARM: dts: aspeed: zaius: fixed I2C bus numbers for pcie slots From: Patrick Venture To: venture@google.com, robh+dt@kernel.org, mark.rutland@arm.com, joel@jms.id.au, andrew@aj.id.au X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190416_092232_848169_311C7461 X-CRM114-Status: UNSURE ( 8.93 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Robert Lippert , linux-kernel@vger.kernel.org, linux-aspeed@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Robert Lippert The change to include ibm-power9-cfam.dtsi resulted in a renumbering of all of the I2C bus numbers behind the on-board muxes. This breaks some tools which have hardcoded the bus numbers. Add device tree aliases for the I2C buses routed through the PCIe slots so that they return to their former numbers before the cfam change. Signed-off-by: Robert Lippert Signed-off-by: Patrick Venture --- arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts index 51265af622574..c12f89e042efc 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts @@ -7,6 +7,14 @@ model = "Zaius BMC"; compatible = "ingrasys,zaius-bmc", "aspeed,ast2500"; + aliases { + i2c15 = &i2cpcie0; + i2c16 = &i2cpcie1; + i2c17 = &i2cpcie2; + i2c19 = &i2cpcie3; + i2c20 = &i2cpcie4; + }; + chosen { stdout-path = &uart5; bootargs = "console=ttyS4,115200 earlyprintk"; @@ -223,6 +231,27 @@ reg = <0x71>; #address-cells = <1>; #size-cells = <0>; + + i2cpcie0: i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + }; + i2cpcie1: i2c@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + }; + i2cpcie2: i2c@2 { + #address-cells = <1>; + #size-cells = <0>; + reg = <2>; + }; + i2ctpm: i2c@3 { + #address-cells = <1>; + #size-cells = <0>; + reg = <3>; + }; }; /* MUX1 PCA9546A @71h @@ -253,6 +282,17 @@ reg = <0x71>; #address-cells = <1>; #size-cells = <0>; + + i2cpcie3: i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + }; + i2cpcie4: i2c@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + }; }; /* MUX1 PCA9546A @71h