From mboxrd@z Thu Jan 1 00:00:00 1970 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=-6.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 6AB3FC433FF for ; Fri, 2 Aug 2019 04:21:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 370B32073D for ; Fri, 2 Aug 2019 04:21:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=jms.id.au header.i=@jms.id.au header.b="l77Xm6dV" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731461AbfHBEVR (ORCPT ); Fri, 2 Aug 2019 00:21:17 -0400 Received: from mail-qk1-f194.google.com ([209.85.222.194]:36671 "EHLO mail-qk1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731051AbfHBEVQ (ORCPT ); Fri, 2 Aug 2019 00:21:16 -0400 Received: by mail-qk1-f194.google.com with SMTP id g18so53812749qkl.3; Thu, 01 Aug 2019 21:21:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jms.id.au; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=q9UBcMKtePrtEaomibezEEEJmQ4FGM8GYQb7rZ+rqS0=; b=l77Xm6dVdFosSZz4ISpaeYA7N3fyZ4FrUY6Msp8xRh2WT283dDS5cl5Ph96Lh17ca4 1sqbwz0J5Wo2+Hfyw9n1MlhFQZ6Xp2/iNaSYddqSxhO3pMI6shuo+Yr47tn26F1OIeyN 0vybk8mv34jD1mv+IIMd50UPndQRhkiafo+WY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=q9UBcMKtePrtEaomibezEEEJmQ4FGM8GYQb7rZ+rqS0=; b=muLWKdBbVGWTFrzUpzlpw6MOuQeDngrwfKPnIBYX++zJa+bcCv8vZIGNpJB1PWXyGn mww/obcHfioyym8VtB2F3+e57AGsD0d3j3upsPIBq06v9wtnkKBjIFwS/dQOEOumhoRI SjpjaUf2QvTVxuWfeKHA33deky49/GVW9wdHcbeMqINuEnHI90BoT62gTCPLSdy5p6LY OJDg6d46GtccZu+SVjNlxiuPYFWTpcrLQ8VqmdZqz8QDv9tQtpzeyeCyrIjZRmJqTCr/ LFvMAgVP33f6yLWYzEf7OwNNFoRRMNJE8htQP4OdMHJ/Cq4+/YnREH2U56fgpcviGOaX KSvA== X-Gm-Message-State: APjAAAXdDtbwf+Z0I+SnV6XuqD7txb4sms2ILCCMmXlSDPAyIJpw46yB y2FeoorHVmNQVEOy31oudmA0wj6vvfZLCpryWJg= X-Google-Smtp-Source: APXvYqx+1KRNUxUimqfzDpoeWfQqVYjpwpMAv6POY1MuPBx01LXJU1p7xULXTW7V3lAp+QMTexKFlSiRSNfwf0S6ye0= X-Received: by 2002:a37:b0c6:: with SMTP id z189mr88058946qke.208.1564719675402; Thu, 01 Aug 2019 21:21:15 -0700 (PDT) MIME-Version: 1.0 References: <20190802041010.1234178-1-taoren@fb.com> In-Reply-To: <20190802041010.1234178-1-taoren@fb.com> From: Joel Stanley Date: Fri, 2 Aug 2019 04:21:03 +0000 Message-ID: Subject: Re: [PATCH v2] ARM: dts: aspeed: Add Facebook Wedge100 BMC To: Tao Ren Cc: Rob Herring , Mark Rutland , Andrew Jeffery , devicetree , Linux ARM , linux-aspeed@lists.ozlabs.org, Linux Kernel Mailing List , OpenBMC Maillist Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 2 Aug 2019 at 04:10, Tao Ren wrote: > > Add initial version of device tree for Facebook Wedge100 AST2400 BMC > platform. > > Signed-off-by: Tao Ren > Reviewed-by: Andrew Jeffery > --- > Changes in v2: > - remove "debug" from bootargs. Thanks. I applied wedge40 and then this one fails to apply due to conflicts in the Makefile. Next time you have two patches, send them as a series they apply one atop the other. The naming of these two files suggests they come from a family. I noticed there's very minor differences, a pca9548 switch and the use of a watchdog. Are these device trees complete? If yes, do you think it's worthwhile to have a common wedge description in eg. aspeed-bmc-facebook-wedge.dtsi, and put the unique description in respective dts board files? The upside of this is reduced duplication. If you have a reason not to, then that is okay and we can leave it as you submitted them. Cheers, Joel --- arch/arm/boot/dts/aspeed-bmc-facebook-wedge100.dts 2019-08-02 13:44:26.536934502 +0930 +++ arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts 2019-08-02 13:44:02.980670672 +0930 @@ -5,8 +5,8 @@ #include "aspeed-g4.dtsi" / { - model = "Facebook Wedge 100 BMC"; - compatible = "facebook,wedge100-bmc", "aspeed,ast2400"; + model = "Facebook Wedge 40 BMC"; + compatible = "facebook,wedge40-bmc", "aspeed,ast2400"; aliases { /* @@ -35,8 +35,7 @@ }; &wdt2 { - status = "okay"; - aspeed,reset-type = "system"; + status = "disabled"; }; &fmc { @@ -111,13 +110,6 @@ &i2c7 { status = "okay"; - - i2c-switch@70 { - compatible = "nxp,pca9548"; - #address-cells = <1>; - #size-cells = <0>; - reg = <0x70>; - }; }; > > arch/arm/boot/dts/Makefile | 1 + > .../boot/dts/aspeed-bmc-facebook-wedge100.dts | 149 ++++++++++++++++++ > 2 files changed, 150 insertions(+) > create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-wedge100.dts > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index 39a05a10a2a2..d71504ed82d3 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -1273,6 +1273,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ > aspeed-bmc-facebook-cmm.dtb \ > aspeed-bmc-facebook-minipack.dtb \ > aspeed-bmc-facebook-tiogapass.dtb \ > + aspeed-bmc-facebook-wedge100.dtb \ > aspeed-bmc-facebook-yamp.dtb \ > aspeed-bmc-intel-s2600wf.dtb \ > aspeed-bmc-inspur-fp5280g2.dtb \ > diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-wedge100.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-wedge100.dts > new file mode 100644 > index 000000000000..b1e10f0c85c9 > --- /dev/null > +++ b/arch/arm/boot/dts/aspeed-bmc-facebook-wedge100.dts > @@ -0,0 +1,149 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +// Copyright (c) 2018 Facebook Inc. > +/dts-v1/; > + > +#include "aspeed-g4.dtsi" > + > +/ { > + model = "Facebook Wedge 100 BMC"; > + compatible = "facebook,wedge100-bmc", "aspeed,ast2400"; > + > + aliases { > + /* > + * Override the default uart aliases to avoid breaking > + * the legacy applications. > + */ > + serial0 = &uart5; > + serial1 = &uart1; > + serial2 = &uart3; > + serial3 = &uart4; > + }; > + > + chosen { > + stdout-path = &uart3; > + bootargs = "console=ttyS2,9600n8 root=/dev/ram rw"; > + }; > + > + memory@40000000 { > + reg = <0x40000000 0x20000000>; > + }; > +}; > + > +&wdt1 { > + status = "okay"; > + aspeed,reset-type = "system"; > +}; > + > +&wdt2 { > + status = "okay"; > + aspeed,reset-type = "system"; > +}; > + > +&fmc { > + status = "okay"; > + flash@0 { > + status = "okay"; > + m25p,fast-read; > + label = "fmc0"; > +#include "facebook-bmc-flash-layout.dtsi" > + }; > +}; > + > +&uart1 { > + status = "okay"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_txd1_default > + &pinctrl_rxd1_default>; > +}; > + > +&uart3 { > + status = "okay"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_txd3_default > + &pinctrl_rxd3_default>; > +}; > + > +&uart4 { > + status = "okay"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_txd4_default > + &pinctrl_rxd4_default>; > +}; > + > +&uart5 { > + status = "okay"; > +}; > + > +&mac1 { > + status = "okay"; > + no-hw-checksum; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>; > +}; > + > +&i2c0 { > + status = "okay"; > +}; > + > +&i2c1 { > + status = "okay"; > +}; > + > +&i2c2 { > + status = "okay"; > +}; > + > +&i2c3 { > + status = "okay"; > +}; > + > +&i2c4 { > + status = "okay"; > +}; > + > +&i2c5 { > + status = "okay"; > +}; > + > +&i2c6 { > + status = "okay"; > +}; > + > +&i2c7 { > + status = "okay"; > + > + i2c-switch@70 { > + compatible = "nxp,pca9548"; > + #address-cells = <1>; > + #size-cells = <0>; > + reg = <0x70>; > + }; > +}; > + > +&i2c8 { > + status = "okay"; > +}; > + > +&i2c9 { > + status = "okay"; > +}; > + > +&i2c10 { > + status = "okay"; > +}; > + > +&i2c11 { > + status = "okay"; > +}; > + > +&i2c12 { > + status = "okay"; > +}; > + > +&i2c13 { > + status = "okay"; > +}; > + > +&vhub { > + status = "okay"; > +}; > -- > 2.17.1 >