From patchwork Fri May 20 23:13:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 12857534 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 CA90CC433EF for ; Fri, 20 May 2022 23:14:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238557AbiETXOB (ORCPT ); Fri, 20 May 2022 19:14:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234031AbiETXN7 (ORCPT ); Fri, 20 May 2022 19:13:59 -0400 Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4DD0186293 for ; Fri, 20 May 2022 16:13:58 -0700 (PDT) Received: by mail-pf1-x436.google.com with SMTP id a11so8911778pff.1 for ; Fri, 20 May 2022 16:13:58 -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:mime-version :content-transfer-encoding; bh=pRRzBzpTvPKL4ArnfdaUFW1cDfFNVquKut1ZEam2zu8=; b=Qn7a9XbSwUWVcls8bMgVqhGcd6+Uwun0qQOM4rQuyzDlHm+4/j7XV0G8dnCzhmutcD 4ogENdLmRs9/m0jWAb5dgPeXelOheCwNpo2dqZTr/cpMqwyz/+7qy4JelCfRidWzdMeO uiA5o4DcC87pPoYpzsQDuH4KvqtDikBFd6dlQ= 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:mime-version :content-transfer-encoding; bh=pRRzBzpTvPKL4ArnfdaUFW1cDfFNVquKut1ZEam2zu8=; b=uRt3KjoAz5J3Xyz3EjiHUG/7of+SfaPpxCmbep4TzYnhvU3FvvAbaCWUDk+rUH3Iyd r9QtxaMwooaRS/FlxdNS8BE/YqeiEy1xjAiZkDw0QXUsW2bhKxWZ5BbuiW1i06Y1Cjpu d8Xl931fDIR9I3HpiZ/avmlWkGiqv3b0uOta8VUtkSHn1r8wGNuGMY1AleGbyzDf6fkl Kv/f2Jcr4n8R+b1lkiKD7jWopQLUyKQcMqn1l73qQ3oXQCU2Ygx/aGbo91D+/h6z6i8j wCkfWk7WgNq+XNryY895m4KYb1Mb2AvrPlo0NaKezEbqikFhmsk3LrTnpbrnyiRNCiO+ 5ddg== X-Gm-Message-State: AOAM533jviFU/nZ6U3vMuBQXhJ2UytWIKlm+uxnbJP7qUkdLjgEbyIjl XZbzw4IBhb1Xt1r3ybZq5hrieQ== X-Google-Smtp-Source: ABdhPJw94RKVYJtddL2x1+4L2GbIeueEMeZstosPkRJ/Wmtdl9kxiE1lO4z96eViqqe4F3Vs3PWpQA== X-Received: by 2002:a62:3881:0:b0:4b0:b1c:6fd9 with SMTP id f123-20020a623881000000b004b00b1c6fd9mr12445491pfa.27.1653088437410; Fri, 20 May 2022 16:13:57 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:201:72c1:e5e8:3ad8:f199]) by smtp.gmail.com with ESMTPSA id o16-20020a17090ac09000b001d77f392280sm2420777pjs.30.2022.05.20.16.13.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 May 2022 16:13:56 -0700 (PDT) From: Stephen Boyd To: Andy Gross , Bjorn Andersson Cc: linux-kernel@vger.kernel.org, patches@lists.linux.dev, linux-arm-msm@vger.kernel.org, Douglas Anderson , "Joseph S. Barrera III" , Matthias Kaehlcke Subject: [PATCH] arm64: dts: qcom: Remove duplicate sc7180-trogdor include on lazor Date: Fri, 20 May 2022 16:13:55 -0700 Message-Id: <20220520231355.1559104-1-swboyd@chromium.org> X-Mailer: git-send-email 2.36.1.124.g0e6072fb45-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The sc7180-trogdor-lazor-*.dtsi files all include sc7180-trogdor.dtsi and sc7180-trogdor-lazor.dtsi, so including it here in the sc7180-trogdor-lazor.dtsi file means we have a duplicate include after commit 19794489fa24 ("arm64: dts: qcom: Only include sc7180.dtsi in sc7180-trogdor.dtsi"). We include the sc7180-trogdor.dtsi file in a board like sc7180-trogdor-lazor-r1.dts so that we can include the display bridge snippet (e.g. sc7180-trogdor-ti-sn65dsi86.dtsi) instead of making ever increasing variants like sc7180-trogdor-lazor-ti-sn65dsi86.dtsi. Fix this by dropping the include and making a note that the sc7180-trogdor-lazor.dtsi file must be included after sc7180-trogdor.dtsi Reported-by: Douglas Anderson Cc: "Joseph S. Barrera III" Cc: Matthias Kaehlcke Fixes: 19794489fa24 ("arm64: dts: qcom: Only include sc7180.dtsi in sc7180-trogdor.dtsi") Signed-off-by: Stephen Boyd Reviewed-by: Douglas Anderson --- arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 19794489fa2474a55c00848e00ca3d15ea01d36c diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi index fe2369c29aad..88f6a7d4d020 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi @@ -5,7 +5,7 @@ * Copyright 2020 Google LLC. */ -#include "sc7180-trogdor.dtsi" +/* This file must be included after sc7180-trogdor.dtsi */ &ap_sar_sensor { semtech,cs0-ground;