From patchwork Wed Mar 1 18:50:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 13156331 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 D4B6CC64ED6 for ; Wed, 1 Mar 2023 18:50:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230039AbjCASuk (ORCPT ); Wed, 1 Mar 2023 13:50:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58650 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230020AbjCASui (ORCPT ); Wed, 1 Mar 2023 13:50:38 -0500 Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 45B964D618 for ; Wed, 1 Mar 2023 10:50:37 -0800 (PST) Received: by mail-pl1-x630.google.com with SMTP id z2so14983652plf.12 for ; Wed, 01 Mar 2023 10:50:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RP9FrgqNQaeNofvRfVHHkZnngHHL0TDN12M7kvtBOo4=; b=eq6OyecIb7kmMZCRU1+fDFronDX6DA+uoeVzcElhLVIton+n+MJA31hE9IG3MVdV1j U1950gg7Zup//bgJW/TNmrN206/rV8zKLsOWKboURYz37rNbiu1bMiPv2DaYtASMcou/ AhqSKfG3z4Ck1rk1/x8yP6A6xhFQ6fzIuBkuA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RP9FrgqNQaeNofvRfVHHkZnngHHL0TDN12M7kvtBOo4=; b=LCTcaAdKRLuC6x1YxS4YXAyjrpMAeyaj6LXbNutwNLatdx0pOCJHgoDz/p2ZD49HmT 6QBk5/bSZLuU8OSwqsOKWT6oDgmE41g6w+7+tLXEVKZk4/U/Xza7D774OT58PV4PxTBb cHJ2YHL1ti2x7gunqQWQs2bcsA3fXXwH2KNF6VroFPlQrrm6IChlkQlWmTPA2OSPVuLa KWT/K43aGTua8kKAvKZ9JsyX69u3TVeSccc4BNcky324st+MJ3JvMKZRUqTAEfJUKC5F UOpnEi3Ia9WHcJygLGF/OQpoTIfW4BVWyHFatIPkQrBb61clwz3rN5/j/G8SOwU7aRLd gvVw== X-Gm-Message-State: AO0yUKXD4GZZw1faudoCgEbSv2SXAYZT1dfL8XiEZp4nR2NQBbmcVvzN F/iI+meYvYt2jEE4OHpgIbD8CQ== X-Google-Smtp-Source: AK7set82ucyBImDl/02D6W4i0FvhHcd9KANE8nbMECIh5g0t2HpdmGFmVu7f9fb1fGOtUUJX9JZBtA== X-Received: by 2002:a17:903:40cf:b0:19c:d457:ff21 with SMTP id t15-20020a17090340cf00b0019cd457ff21mr7036557pld.54.1677696636565; Wed, 01 Mar 2023 10:50:36 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:9d:2:f4ac:1f4d:6f3b:f98]) by smtp.gmail.com with ESMTPSA id p5-20020a170902780500b0019a8530c063sm8761982pll.102.2023.03.01.10.50.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 10:50:36 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: mka@chromium.org, swboyd@chromium.org, Konrad Dybcio , Douglas Anderson , Andy Gross , Krzysztof Kozlowski , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/4] arm64: dts: qcom: sc7180: Delete kingoftown-rev0 Date: Wed, 1 Mar 2023 10:50:04 -0800 Message-Id: <20230301104859.2.I68cbe5d5d45074428469da8c52f1d6a78bdc62fc@changeid> X-Mailer: git-send-email 2.39.2.722.g9855ee24e9-goog In-Reply-To: <20230301185007.1101006-1-dianders@chromium.org> References: <20230301185007.1101006-1-dianders@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The earliest kingoftown that I could find in my pile of boards was -rev2 and even that revision looks pretty rough (plastics on the case are very unfinished). Though I don't actually have details about how many -rev0 devices were produced, I can't imagine anyone still using one. Let's delete support. Signed-off-by: Douglas Anderson --- arch/arm64/boot/dts/qcom/Makefile | 3 +- .../dts/qcom/sc7180-trogdor-kingoftown-r0.dts | 38 ------------------- ...n-r1.dts => sc7180-trogdor-kingoftown.dts} | 0 3 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown-r0.dts rename arch/arm64/boot/dts/qcom/{sc7180-trogdor-kingoftown-r1.dts => sc7180-trogdor-kingoftown.dts} (100%) diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index a51060378ddc..3ce51093ed8f 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -83,8 +83,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r3-lte.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-homestar-r2.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-homestar-r3.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-homestar-r4.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-kingoftown-r0.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-kingoftown-r1.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-kingoftown.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r0.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r1.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r1-kb.dtb diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown-r0.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown-r0.dts deleted file mode 100644 index 3abd6222fe46..000000000000 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown-r0.dts +++ /dev/null @@ -1,38 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Google Kingoftown board device tree source - * - * Copyright 2021 Google LLC. - */ - -/dts-v1/; - -#include "sc7180-trogdor.dtsi" -#include "sc7180-trogdor-ti-sn65dsi86.dtsi" -#include "sc7180-trogdor-kingoftown.dtsi" - -/ { - model = "Google Kingoftown (rev0)"; - compatible = "google,kingoftown-rev0", "qcom,sc7180"; -}; - -/* - * In rev1+, the enable pin of pp3300_fp_tp will be tied to pp1800_l10a - * power rail instead, since kingoftown does not have FP. - */ -&pp3300_fp_tp { - gpio = <&tlmm 74 GPIO_ACTIVE_HIGH>; - enable-active-high; - - pinctrl-names = "default"; - pinctrl-0 = <&en_fp_rails>; -}; - -&tlmm { - en_fp_rails: en-fp-rails-state { - pins = "gpio74"; - function = "gpio"; - drive-strength = <2>; - bias-disable; - }; -}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dts similarity index 100% rename from arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown-r1.dts rename to arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dts