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=-11.5 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 393AFC388F9 for ; Fri, 30 Oct 2020 13:56:00 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (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 294052076E for ; Fri, 30 Oct 2020 13:55:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="daQwk7/9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 294052076E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=openbmc-bounces+openbmc=archiver.kernel.org@lists.ozlabs.org Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4CN3k33PWYzDqBH for ; Sat, 31 Oct 2020 00:55:55 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=linux.ibm.com (client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com; envelope-from=eajames@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=daQwk7/9; dkim-atps=neutral Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4CN3d52C90zDqBY for ; Sat, 31 Oct 2020 00:51:37 +1100 (AEDT) Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 09UDW1qB027697; Fri, 30 Oct 2020 09:51:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=subject : to : cc : references : from : message-id : date : mime-version : in-reply-to : content-type : content-transfer-encoding; s=pp1; bh=v6r508KY0tRAVLZj4jgQ62IB/g5jj8SBMEr9f7XcrQM=; b=daQwk7/9d67N0hxZo4kTWQ/rrUc6OXUcHcl/b0xXCpLshnwzxjnonbGBI8Jr1JJ+RHxh HBTt1R3D/5kyUNqdTuYiP0WrcQ742w8mb9QScDR2q5zRVdBu2P1ZTMuWoK1nE6vuButN qqT0NV4hdDm10jZEzc3orWeKhsaS/O2jkUYWm9fbnSd7VldvKo7W/dosZvpZt6XnxhRk OLzLqSwjryqdIIO9RP9BAcxARH1V39r2cS48bfJCoi/YDDTjTISRm/yoPZftjZqv6iJ/ EuW8sGzLIeVzDwuxivbElhEzOoW2Lo7Kov9g5B5nssIQZH0OXaoJV3NHtQUMCmX2vDSB qw== Received: from ppma03dal.us.ibm.com (b.bd.3ea9.ip4.static.sl-reverse.com [169.62.189.11]) by mx0a-001b2d01.pphosted.com with ESMTP id 34gjg0k697-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 30 Oct 2020 09:51:33 -0400 Received: from pps.filterd (ppma03dal.us.ibm.com [127.0.0.1]) by ppma03dal.us.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 09UDmvAX023706; Fri, 30 Oct 2020 13:51:32 GMT Received: from b01cxnp22034.gho.pok.ibm.com (b01cxnp22034.gho.pok.ibm.com [9.57.198.24]) by ppma03dal.us.ibm.com with ESMTP id 34etf9n08a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 30 Oct 2020 13:51:32 +0000 Received: from b01ledav002.gho.pok.ibm.com (b01ledav002.gho.pok.ibm.com [9.57.199.107]) by b01cxnp22034.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 09UDpVVF52953440 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Oct 2020 13:51:32 GMT Received: from b01ledav002.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E1E9A124053; Fri, 30 Oct 2020 13:51:31 +0000 (GMT) Received: from b01ledav002.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AB575124054; Fri, 30 Oct 2020 13:51:31 +0000 (GMT) Received: from [9.85.192.58] (unknown [9.85.192.58]) by b01ledav002.gho.pok.ibm.com (Postfix) with ESMTP; Fri, 30 Oct 2020 13:51:31 +0000 (GMT) Subject: Re: [PATCH linux dev-5.8 v3] ARM: dts: Aspeed: Rainier: Add 4U device-tree To: Joel Stanley References: <20201028185647.14565-1-eajames@linux.ibm.com> From: Eddie James Message-ID: <5d230deb-8c8b-01b7-95b0-45e1f25dfd8e@linux.ibm.com> Date: Fri, 30 Oct 2020 08:51:31 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.3.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.312, 18.0.737 definitions=2020-10-30_04:2020-10-30, 2020-10-30 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 impostorscore=0 bulkscore=0 adultscore=0 priorityscore=1501 phishscore=0 mlxscore=0 spamscore=0 lowpriorityscore=0 mlxlogscore=999 clxscore=1015 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2010300098 X-BeenThere: openbmc@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development list for OpenBMC List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: OpenBMC Maillist Errors-To: openbmc-bounces+openbmc=archiver.kernel.org@lists.ozlabs.org Sender: "openbmc" On 10/29/20 11:14 PM, Joel Stanley wrote: > Hi Eddie, > > On Wed, 28 Oct 2020 at 18:56, Eddie James wrote: >> Add a device-tree for the Rainier 4U system. Change the model name >> on the existing Rainier device-tree to 2U, and remove the two >> extra power supplies that are only present on the 4U system. Also >> add labels to the fan nodes for use in the 4U device-tree. >> >> Signed-off-by: Eddie James >> --- >> Changes since v2: >> - Just reference individual fan nodes rather than the whole fan >> controller >> >> Changes since v1: >> - Don't rename the 2U dts >> - Include the 2U dts from the 4U and make the necessary Changes >> >> arch/arm/boot/dts/Makefile | 1 + >> .../boot/dts/aspeed-bmc-ibm-rainier-4u.dts | 37 +++++++++++++++++++ >> arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 20 +++------- >> 3 files changed, 43 insertions(+), 15 deletions(-) >> create mode 100644 arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts >> >> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile >> index 7e4d3600e16d..9a2ab5e6e924 100644 >> --- a/arch/arm/boot/dts/Makefile >> +++ b/arch/arm/boot/dts/Makefile >> @@ -1360,6 +1360,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ >> aspeed-bmc-facebook-yamp.dtb \ >> aspeed-bmc-facebook-yosemitev2.dtb \ >> aspeed-bmc-ibm-rainier.dtb \ >> + aspeed-bmc-ibm-rainier-4u.dtb \ >> aspeed-bmc-intel-s2600wf.dtb \ >> aspeed-bmc-inspur-fp5280g2.dtb \ >> aspeed-bmc-lenovo-hr630.dtb \ >> diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts >> new file mode 100644 >> index 000000000000..9c35ac1d19a6 >> --- /dev/null >> +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts >> @@ -0,0 +1,37 @@ >> +// SPDX-License-Identifier: GPL-2.0-or-later >> +// Copyright 2020 IBM Corp. >> +/dts-v1/; >> + >> +#include "aspeed-bmc-ibm-rainier-4u.dts" > Did you test this patch? Yes, Rainier hardware BMC booted to Ready state. I suspect it wouldn't power on properly due to bad fan configuration though, so I didn't try that. DTS looked good under /sys/firmware though. Thanks, Eddie > >> + >> +/ { >> + model = "Rainier 4U"; >> +}; >> + >> +&i2c3 { >> + power-supply@6a { >> + compatible = "ibm,cffps"; >> + reg = <0x6a>; >> + }; >> + >> + power-supply@6b { >> + compatible = "ibm,cffps"; >> + reg = <0x6b>; >> + }; >> +}; >> + >> +&fan0 { >> + tach-pulses = <4>; >> +}; >> + >> +&fan1 { >> + tach-pulses = <4>; >> +}; >> + >> +&fan2 { >> + tach-pulses = <4>; >> +}; >> + >> +&fan3 { >> + tach-pulses = <4>; >> +}; >> diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts >> index 183e1a4dcc65..676ae5602fb9 100644 >> --- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts >> +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts >> @@ -8,7 +8,7 @@ >> #include >> >> / { >> - model = "Rainier"; >> + model = "Rainier 2U"; >> compatible = "ibm,rainier-bmc", "aspeed,ast2600"; >> >> aliases { >> @@ -646,16 +646,6 @@ power-supply@69 { >> compatible = "ibm,cffps"; >> reg = <0x69>; >> }; >> - >> - power-supply@6a { >> - compatible = "ibm,cffps"; >> - reg = <0x6a>; >> - }; >> - >> - power-supply@6b { >> - compatible = "ibm,cffps"; >> - reg = <0x6b>; >> - }; >> }; >> >> &i2c4 { >> @@ -775,25 +765,25 @@ max31785@52 { >> #address-cells = <1>; >> #size-cells = <0>; >> >> - fan@0 { >> + fan0: fan@0 { >> compatible = "pmbus-fan"; >> reg = <0>; >> tach-pulses = <2>; >> }; >> >> - fan@1 { >> + fan1: fan@1 { >> compatible = "pmbus-fan"; >> reg = <1>; >> tach-pulses = <2>; >> }; >> >> - fan@2 { >> + fan2: fan@2 { >> compatible = "pmbus-fan"; >> reg = <2>; >> tach-pulses = <2>; >> }; >> >> - fan@3 { >> + fan3: fan@3 { >> compatible = "pmbus-fan"; >> reg = <3>; >> tach-pulses = <2>; >> -- >> 2.26.2 >>