From patchwork Tue Apr 16 16:21:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Venture X-Patchwork-Id: 10903423 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 3CF2B14DB for ; Tue, 16 Apr 2019 16:22:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C6632892B for ; Tue, 16 Apr 2019 16:22:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1081828970; Tue, 16 Apr 2019 16:22:40 +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 9643A2892B for ; Tue, 16 Apr 2019 16:22:39 +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=VpICukLC9uBUIhfFg2GaZxQ+OaJcMTOGch1oHGWH/SY=; b=Nb0tXn4IP8bRvB oLZeWqgS0mAGOuIYXVmsALggz7P4HosIezAgcumQwqgH1WpArx7x55PtIDjxrI9ToK4MHWCktmBH/ /2QpflfmoYoWM9EZqRliTQ/2vnVtgvlMYz4xiOcWtfB6gTpAlbzTHwoWH6UuRZS6e9xPntglK3HfK CYV8GMB/eVSJE4piSGP5FhHa2G19CmxHttEDMaYMCsvs7jqLGzif/93+Ewo7A5BfMz13VzWXQyq2M ILek18GFigzW1J8KzZj0jOvIxXtS+OLpmm/ZDRYWw9Wba7tDI9Mpdg+n4sdawzaEz+rtD64FEqVzg R/Fgo980u8fvyzpz8lHQ==; 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 1hGQqw-0005rj-Qh; Tue, 16 Apr 2019 16:22:34 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hGQqm-0005gI-Ho for linux-arm-kernel@lists.infradead.org; Tue, 16 Apr 2019 16:22:27 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id d193so10012778ybh.13 for ; Tue, 16 Apr 2019 09:22:23 -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=7F9exMRREX45C8pUViq8Do93XD3VpokDWa83r/8/32I=; b=TbOLv6mZmd63hxyjHCSHuv7ywkKnUziSn/tgy31HFnxtNpgFssBiAUH4RRts4ihb4+ Vzz2AvNg5t1JMiMSbILV4MXLEgZ+sdI9HBCi5OA3bniDstq5Ab1hRXFQ63jMgSg83xW/ 1iuCBy2lssUPD17tMCI9GETlCM2C4TqoTV9C+5tah7RaYs+GjW4FZTtmJfOztBfxTZOg KQTNkxP4o9UUEjeNr3RCG+/feemcOMshhAnqxsedvcj/o1T8fx9IF4h3H0TILywdVog3 xSmJD1uiBizVOxLnjSyJsAqs5quxI8MiQalrAymJepq7BksJ3HjwUn0FBzGWWyc7ZwlX vD+w== 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=7F9exMRREX45C8pUViq8Do93XD3VpokDWa83r/8/32I=; b=NgeyRIItV/aDTXuhe9jhcmP9jgNWIX01gMgTNBKVs51R9UzEqnH4hV/CXIjbyF4h2B 7vD4vYU4m8aYBwr+jHUlFP8VJRjdtngg1vgP39Sjhtf6zn9Q2q8U+5Mc8RduO5+XCRBy pfzo4DqreAFpM92riWGbMteTu+qWJv4utO0ekaX6siFnEU4F7Cbi7+OI5v559ZUaVun3 3fjLU/2PJqxGZZi/cT9ZZ4CDrnqN5mehePpI4MVzjmSg6Hs3XOPdmgBuWfCM3sTfWt6C hQMcQkPCRnelCkMQLuI5m3zf7pM34fSVyOLw1AyfmQzuT3ZRNiWOdEp4izCkMhH3CFIZ 4JuQ== X-Gm-Message-State: APjAAAU+GrQFZGNnGQjxM14Xa41LBadw1UqlA/eoTvc2G1Q72Nimynw4 oTljRTHGzjyT8c5TkkNDsbQis2Dk6isK X-Google-Smtp-Source: APXvYqy2qI3SZ2tJw6VpF4UtNMa11VvLM38g252ji92E3Ij0RxjO9Axjq1LQmhFPoxzNHq3TcAh4bOaB1Y2k X-Received: by 2002:a25:cf97:: with SMTP id f145mr989704ybg.46.1555431743090; Tue, 16 Apr 2019 09:22:23 -0700 (PDT) Date: Tue, 16 Apr 2019 09:21:49 -0700 In-Reply-To: <20190416162150.150154-1-venture@google.com> Message-Id: <20190416162150.150154-2-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 1/3] ARM: dts: aspeed: zaius: add Infineon and Intersil regulators 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_092224_898188_46A0410E X-CRM114-Status: UNSURE ( 9.67 ) 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: devicetree@vger.kernel.org, Maxim Sloyko , linux-aspeed@lists.ozlabs.org, Robert Lippert , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.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: Maxim Sloyko Add the nodes for the ir38064 and isl68137 devices on the Zaius board. Signed-off-by: Maxim Sloyko Signed-off-by: Robert Lippert Signed-off-by: Patrick Venture --- arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 65 ++++++++++++++++++++-- 1 file changed, 60 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts index 2c5aa90a546d7..63e892f16d050 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts @@ -296,6 +296,32 @@ reg = <0x54>; }; }; + + }; + + vrm@64 { + compatible = "isil,isl68137"; + reg = <0x64>; + }; + + vrm@40 { + compatible = "isil,isl68137"; + reg = <0x40>; + }; + + vrm@60 { + compatible = "isil,isl68137"; + reg = <0x60>; + }; + + vrm@43 { + compatible = "infineon,ir38064"; + reg = <0x43>; + }; + + vrm@41 { + compatible = "isil,isl68137"; + reg = <0x41>; }; /* Master selector PCA9541A @70h (other master: CPU0) @@ -311,18 +337,47 @@ /* CPU0 VR ISL68137 0.7V, 0.96V PMBUS @64h */ /* CPU0 VR ISL68137 1.2V CH03 PMBUS @40h */ /* CPU0 VR ISL68137 0.8V PMBUS @60h */ - /* CPU0 VR 1.0V IR38064 I2C @11h, PMBUS @41h */ + /* CPU0 VR 1.0V IR38064 I2C @11h, PMBUS @43h */ /* CPU0 VR ISL68137 1.2V CH47 PMBUS @41h */ + /* Master selector PCA9541A @70h (other master: CPU0) + * LM5066I PMBUS @10h + */ + /* 12V SMPS Q54SH12050NNDH @61h */ }; &i2c8 { status = "okay"; - /* CPU1 VR ISL68137 0.7V, 0.96V PMBUS @65h */ - /* CPU1 VR ISL68137 1.2V CH03 PMBUS @44h */ - /* CPU1 VR ISL68137 0.8V PMBUS @61h */ + vrm@64 { + compatible = "isil,isl68137"; + reg = <0x64>; + }; + + vrm@40 { + compatible = "isil,isl68137"; + reg = <0x40>; + }; + + vrm@41 { + compatible = "isil,isl68137"; + reg = <0x41>; + }; + + vrm@42 { + compatible = "infineon,ir38064"; + reg = <0x42>; + }; + + vrm@60 { + compatible = "isil,isl68137"; + reg = <0x60>; + }; + + /* CPU1 VR ISL68137 0.7V, 0.96V PMBUS @64h */ + /* CPU1 VR ISL68137 1.2V CH03 PMBUS @40h */ + /* CPU1 VR ISL68137 1.2V CH47 PMBUS @41h */ /* CPU1 VR 1.0V IR38064 I2C @12h, PMBUS @42h */ - /* CPU0 VR ISL68137 1.2V CH47 PMBUS @45h */ + /* CPU1 VR ISL68137 0.8V PMBUS @60h */ }; From patchwork Tue Apr 16 16:21:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Venture X-Patchwork-Id: 10903425 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 997EF14DB for ; Tue, 16 Apr 2019 16:22:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B3E428956 for ; Tue, 16 Apr 2019 16:22:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F8A828970; Tue, 16 Apr 2019 16:22:46 +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 D47F92894D for ; Tue, 16 Apr 2019 16:22:45 +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=qBOq07UNTNhVjFBB8Cobs41Uhga8clQhHCPpBelfkA0=; b=FltvVItz7s5BxC nqLT+TRsKbnKNkrJ1XIKTz/1BJaEkV+0ODR0pGPqF9UT8x2XHYYQJ8w0VdIk+e3U/jC3uOokoHtF5 IQRJV8fi5AESsSYyXIYwRIv7/Kj6s0iDFn+EeXRPy7o8hoptAn/UMnO/LKkr7kH1Y91HO71iastvV P4AJ/La+6qIaIW7QzCcI7lmEJoSvARSKfGYTJzYXNK2L8MPxjgDhjRgC/CvRgM/GbzyMMnEr55GB2 ZTFpR7bxiAUX1QYWn4+Xd7fjbMmt7IlvgwrKbG5ih+Z2Iq+b4Yk+WAntoBAZfK/B1DJORYt/3iRWW KtPcwFK/MGhfXbCA8Ckg==; 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 1hGQr4-00061z-B9; Tue, 16 Apr 2019 16:22:42 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hGQqr-0005m9-CX for linux-arm-kernel@lists.infradead.org; Tue, 16 Apr 2019 16:22:30 +0000 Received: by mail-yb1-xb49.google.com with SMTP id q9so16022340ybg.21 for ; Tue, 16 Apr 2019 09:22:28 -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=BelyAusOx0YfiakkT+ISkR4vR8JMKkPLQAmRbMojJck=; b=nvABPtNO6Lg9G2r0uL7lHQpP3tXFz2i5Qqd2QyfCuqSD4AqUuggZKu0I48SjXBnKl/ +OzKJjgTExCF9MzhGXQzTe7x5CQs2P4x5C4RbGLQkyokAkkbX/zeGH1cOelAnwg2Trc9 k3KMjogiB8pDMRJcTR4VXPT88UZv+ocDyLfLAnoiFvj5DC1ri4lOIYxvGBtFm0HzxQX3 xlf3Hpe83YKyMDEaoc7iVu/9Ut2DyzW3StRq5ArUsIHiYbVPDlP19NkRrU/LgPevMdZC Zva5aeBk8chzsj6Xq4FA3JsnjCWtO3mvJDQr/7jdM5rLJc2E+Rc+6k+Cu6wOpLbxHAfU EAxQ== 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=BelyAusOx0YfiakkT+ISkR4vR8JMKkPLQAmRbMojJck=; b=FbzE+Fs8RhdHKj7UVCksuXcUBMw7AOH+dV7+YJOnucXgDZR0kZ4NZeT30D+9rn7Ikb 8SPNRRHv0pc/Nzfd6xmRdwy1nBhiBzTRt57qoIDR8gTpiH1SNxDGzytyMFGtXvXjIKsH 9qvWy7aVccpMIlmCOQFOPSnvABjiA6Hm4IBmzW3DUlr2ymOzG/NVRJdNnvvPdcnpIte9 y2T920fVlp3sgb0CvTe4gHi9TtYmTjCD9I4AtGkevbaylKZ9Y3VADCL1S1xThFi4FqOA ovIkEG2WBVA+0gEuY7+8iwUI+t873rEWT9x3uqUF8gc5xP1/D22SZ+aCAAwmYUWIhWmA QeDg== X-Gm-Message-State: APjAAAUbvgJ4PwlZicpXORMEycr8IZFvQE6hx5vPwubnJcew6uuCCij/ I/sUkn7zknFA71k5Bl7olAtFGKnviZng X-Google-Smtp-Source: APXvYqxv9nfTEuvVY34Q+m+TiayX7m8XCPbwroqmXgonTqTIk8WLKclTe6eJdFH3s97gDXhAPBvSrQXshjJd X-Received: by 2002:a25:3494:: with SMTP id b142mr977209yba.48.1555431747602; Tue, 16 Apr 2019 09:22:27 -0700 (PDT) Date: Tue, 16 Apr 2019 09:21:50 -0700 In-Reply-To: <20190416162150.150154-1-venture@google.com> Message-Id: <20190416162150.150154-3-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 2/3] ARM: dts: aspeed: zaius: update 12V brick I2C address 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_092229_436549_DF453EEC X-CRM114-Status: GOOD ( 10.52 ) 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 I2C address of the brick is different depending on the board SKU. Update the values to instantiate addresses which work for most boards. Signed-off-by: Robert Lippert Signed-off-by: Patrick Venture --- arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts index 63e892f16d050..51265af622574 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts @@ -328,10 +328,21 @@ * LM5066I PMBUS @10h */ - /* 12V Quarter Brick DC/DC Converter Q54SJ12050 @61h */ - power-brick@61 { + /* + * Brick will be one of these types/addresses. Depending + * on the board SKU only one is actually present and will successfully + * instantiate while the others will fail the probe operation. + * These are the PVT (and presumably beyond) addresses: + * 12V Quarter Brick DC/DC Converter Q54SJ12050 @6Ah + * 12V Quarter Brick DC/DC Converter Q54SH12050 @30h + */ + power-brick@6a { + compatible = "delta,dps800"; + reg = <0x6a>; + }; + power-brick@30 { compatible = "delta,dps800"; - reg = <0x61>; + reg = <0x30>; }; /* CPU0 VR ISL68137 0.7V, 0.96V PMBUS @64h */ @@ -342,7 +353,6 @@ /* Master selector PCA9541A @70h (other master: CPU0) * LM5066I PMBUS @10h */ - /* 12V SMPS Q54SH12050NNDH @61h */ }; &i2c8 { 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 Venture 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