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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B2D3C433F5 for ; Mon, 28 Mar 2022 16:05:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237237AbiC1QHG (ORCPT ); Mon, 28 Mar 2022 12:07:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239295AbiC1QHG (ORCPT ); Mon, 28 Mar 2022 12:07:06 -0400 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2FE5C4EA1F for ; Mon, 28 Mar 2022 09:05:25 -0700 (PDT) Received: by mail-ed1-x535.google.com with SMTP id r23so17525501edb.0 for ; Mon, 28 Mar 2022 09:05:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Zl5bNVtTXRun7IC2oPFQdw2uugdFrGTUyOrWt/czGSQ=; b=b2dIoq93N/tIB0g20QaOpGQ07fOZZq4vHcMttRbcyFjzu8Wh531Qpskl9anTkXZfju eodCltzgSRcUcl60XDVXyBV6T63R54FkE6Kjr2aECvnthj7PXGS5ja2nzTbnR3g5DSLf kJ8G1NOKEq0RtfF55bYcZTFRX8JmLYZWmgFxk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Zl5bNVtTXRun7IC2oPFQdw2uugdFrGTUyOrWt/czGSQ=; b=t8cWSVprLcsIPZqyWf/gDxzE/ryOkfeQFzSvaNkXSLlONZcSkXJZLmx1x0IjMllzdZ pSWMDKsAYWWBJUlfhDnZbwOUPURZKwnLy7T1QsvhQJjm+N6JJSZCZezNWa0hAJopzB63 9k10nFJ4oQuQ0joo7JmDfKoUqWix3wUrwyramlbt0sZBQVxQjYR7uBF/MAVyyddijNKb 4uArP3BYB6XNt9S1surYRnPOaL04WStQSEmVPqRCQfIiejoRIU4dBcYqI26RFT45KJ/5 9A+uqchZ3giNDi73SqEnUGB8ofru4qlJncxPfXEGco7fNzT0TBk8CuBvhXSrX0KYAz9F aHsw== X-Gm-Message-State: AOAM532kSN8RDZDiPA8CpZy0ZLAel+FkMxgf/gicWp4D5xB7RbRPXaSM pTYPTgJVo/ZrjZOgJ/dW0iBlAZ0BpfLIRjGk X-Google-Smtp-Source: ABdhPJw0WiHqhxbIlpehZDawqnw9fYr7xpybEWPL1ppZdFbpZl/ANpbZCpZdx5vBjO8JS7t44o6M1A== X-Received: by 2002:a50:f68a:0:b0:418:e6e8:5ee2 with SMTP id d10-20020a50f68a000000b00418e6e85ee2mr16897434edn.190.1648483522557; Mon, 28 Mar 2022 09:05:22 -0700 (PDT) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com. [209.85.128.51]) by smtp.gmail.com with ESMTPSA id u5-20020a170906b10500b006ce6fa4f510sm6079057ejy.165.2022.03.28.09.05.18 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 28 Mar 2022 09:05:19 -0700 (PDT) Received: by mail-wm1-f51.google.com with SMTP id n35so8672827wms.5 for ; Mon, 28 Mar 2022 09:05:18 -0700 (PDT) X-Received: by 2002:a05:600c:2e02:b0:38c:8390:d8ca with SMTP id o2-20020a05600c2e0200b0038c8390d8camr27620141wmf.15.1648483518132; Mon, 28 Mar 2022 09:05:18 -0700 (PDT) MIME-Version: 1.0 References: <20220325234344.199841-1-swboyd@chromium.org> <20220325234344.199841-3-swboyd@chromium.org> In-Reply-To: <20220325234344.199841-3-swboyd@chromium.org> From: Doug Anderson Date: Mon, 28 Mar 2022 09:05:05 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 2/2] arm64: dts: qcom: sc7180-trogdor: Simplify spi0/spi6 labeling To: Stephen Boyd Cc: Andy Gross , Bjorn Andersson , LKML , linux-arm-msm , Joseph Barrera Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Hi, On Fri, Mar 25, 2022 at 4:43 PM Stephen Boyd wrote: > > We had to do this spi0/spi6 flip-flop on trogdor-r0 because the spi > buses got swizzled between r0 and r1. The swizzle stopped after r1, but > we kept this around to support either hardware possibility and to keep > trogdor-r0 working. > > trogdor-r0 isn't supported upstream, so this swizzle is not doing > anything besides making a pattern that others try to copy for the EC and > H1 nodes. Let's remove it and simplify the dts files. > > Cc: Joseph Barrera > Cc: Douglas Anderson > Signed-off-by: Stephen Boyd > --- > arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 5 ----- > arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 3 --- > arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 3 --- > arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 5 +++-- > 4 files changed, 3 insertions(+), 13 deletions(-) What about pompom? What about trogdor-r1? > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi > index 75df5d1633b2..fe2369c29aad 100644 > --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi > @@ -5,9 +5,6 @@ > * Copyright 2020 Google LLC. > */ > > -ap_ec_spi: &spi6 {}; > -ap_h1_spi: &spi0 {}; > - > #include "sc7180-trogdor.dtsi" > > &ap_sar_sensor { > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi > index 3bf40b6abcba..3123665f6c3c 100644 > --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi > @@ -11,6 +11,7 @@ > #include > #include > > +#include "sc7180.dtsi" If we're going to move the "sc7180.dtsi" to trogdor then we should move it for everyone, right? Right now you're _only_ removing it from coachz. I think that means that for every other board the "sc7180.dtsi" file is included more than once. These aren't like C header files where there's a convention to have header guards. I _think_ that could actually cause problems too, right? So if you include it once and then you override a status to "okay" and then you included it again it might get changed back to "disabled" ? The easiest solution would be to just leave the sc7180.dtsi include where it was. If you want to try to do better, I _think_ (but haven't tried) that you can change all of the existing includes of "sc7180.dtsi" to be includes of "sc7180-trogdor.dtsi" and then remove the existing includes of "sc7180-trogdor.dtsi". IIRC the reason that the sc7180.dtsi include is scattered everywhere is that we needed the i2c bus before we could define the parade / ti bridge but then we needed the parade / ti bridge before we included the board specific bits so we could define the panel.