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 {