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 1E18AC433F5 for ; Fri, 25 Mar 2022 23:44:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231500AbiCYXpd (ORCPT ); Fri, 25 Mar 2022 19:45:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229841AbiCYXpX (ORCPT ); Fri, 25 Mar 2022 19:45:23 -0400 Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6742A108 for ; Fri, 25 Mar 2022 16:43:48 -0700 (PDT) Received: by mail-pf1-x430.google.com with SMTP id h19so6821133pfv.1 for ; Fri, 25 Mar 2022 16:43:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FSWUNqTS/J7688At5bZOQtpG3+9Hz7weNAL/xXN4vlw=; b=Q3uuErJzFFUe83QDREvO9Nsf+uoPteWy3fC98dw6WwmBfoPKY1Qaaf+0YlxzKFGJZ+ YExYnPANIW5BqYAlDfiEg3X+OaI9RyiP9vMkZXTj0TcsxRDwAajLwpa1lgBUmlsHMDTX mK1puREcHQxT9xgoA+cL5zPBpx/GCCBtcmYmk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FSWUNqTS/J7688At5bZOQtpG3+9Hz7weNAL/xXN4vlw=; b=A0en4gInUk1QMQ/BGzxKKjg8en9i8hfbdX7peATOh0Ik5HDarI3zqRkgTrr1gGrNgy ZgGJ1/Pf4nNHt/1UMIG9XdQh+3fez+UI0u/W5zNnaIxojJtP26IYcS6Zrhy9dexy066r xG80E2gKGc7SdlvJFtb2jrxSEF9VYxKnJaClzAX/xVhaJg1QYtvJKmCZ+ZXNSZwC44/s d5P8fLzsGY84DZ7ihi/a0otLiMm25WMMfVumPKaJQfYOuOll6gyYYgQhDF695rQAvIGq HAhbwXILs73AjenziQigRH6Y7njzUFu2ThXVmmIW33EIfB66+tMm0E9wJlzqDBDDuNPD Dryw== X-Gm-Message-State: AOAM532azBcVnJ2+NJGouDTxp9LuOsHryLz4j+F7234sXc0WZ4wdMkX6 3Y+HzA9UO7PAbRm7mDVk3yW+Lw== X-Google-Smtp-Source: ABdhPJyjq+wtj3gMGv265JeGRq8z2mL+7OD4zA6obYgYBju68n4sA6WnryDMKOeSJEE4AYIFUFhgVg== X-Received: by 2002:a05:6a00:14d5:b0:4fb:2adf:dcdd with SMTP id w21-20020a056a0014d500b004fb2adfdcddmr1086184pfu.72.1648251827775; Fri, 25 Mar 2022 16:43:47 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:201:5662:afcf:5e0a:c3a5]) by smtp.gmail.com with ESMTPSA id b17-20020a056a000a9100b004e1b7cdb8fdsm8684525pfl.70.2022.03.25.16.43.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Mar 2022 16:43:47 -0700 (PDT) From: Stephen Boyd To: Andy Gross , Bjorn Andersson Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Joseph Barrera , Douglas Anderson Subject: [PATCH 2/2] arm64: dts: qcom: sc7180-trogdor: Simplify spi0/spi6 labeling Date: Fri, 25 Mar 2022 16:43:43 -0700 Message-Id: <20220325234344.199841-3-swboyd@chromium.org> X-Mailer: git-send-email 2.35.1.1021.g381101b075-goog In-Reply-To: <20220325234344.199841-1-swboyd@chromium.org> References: <20220325234344.199841-1-swboyd@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi index 8da61a52f150..186be3f419d7 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi @@ -5,11 +5,6 @@ * Copyright 2020 Google LLC. */ -#include "sc7180.dtsi" - -ap_ec_spi: &spi6 {}; -ap_h1_spi: &spi0 {}; - #include "sc7180-trogdor.dtsi" #include "sc7180-trogdor-ti-sn65dsi86.dtsi" diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi index 532c7dcc3f73..9b3e3d13c165 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi @@ -5,9 +5,6 @@ * Copyright 2021 Google LLC. */ -ap_ec_spi: &spi6 {}; -ap_h1_spi: &spi0 {}; - #include "sc7180-trogdor.dtsi" / { 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" /* PMICs depend on spmi_bus label and so must come after SoC */ #include "pm6150.dtsi" #include "pm6150l.dtsi" @@ -626,7 +627,7 @@ src_vreg_bob: bob { }; }; -&ap_ec_spi { +ap_ec_spi: &spi6 { status = "okay"; cros_ec: ec@0 { compatible = "google,cros-ec-spi"; @@ -675,7 +676,7 @@ usb_c1: connector@1 { }; }; -&ap_h1_spi { +ap_h1_spi: &spi0 { status = "okay"; cr50: tpm@0 { compatible = "google,cr50"; -- https://chromeos.dev