From patchwork Thu Mar 2 21:11:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 63586 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp73830wrd; Thu, 2 Mar 2023 13:15:28 -0800 (PST) X-Google-Smtp-Source: AK7set9g9jiYa/eXsbO9LnFEoAo1Y4q9SagZsanVhVb09L/ll8LlcZ7DKGGnmBTqkSUqCnTDF+cE X-Received: by 2002:a17:906:d1c7:b0:8dc:cfe8:da53 with SMTP id bs7-20020a170906d1c700b008dccfe8da53mr3055761ejb.10.1677791728699; Thu, 02 Mar 2023 13:15:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677791728; cv=none; d=google.com; s=arc-20160816; b=S9JjubIeTNusujaPTSx9hZOAy2kWvm5Gshpy19FitW/9T9/MOAKSkh2Bs6dz19szlW D9+rG4PHg4f61HKocdl1HXadVUvofjRqRxP32/tlf5c/UH00Ct8XbQUJR7+6v7/luiQv 8RZxhl0z4ryr+N3ETPM2Bvk2YmiRG7ehH0Ow7DP7zvMs9L4bNZoiB026yovMF+46A19G IIQc7Wa6hlubi5kwlXbcZC0RkB2D35+7ylSbFmKSOvinoovEYRZ7ztcHGvw/BrJcneUO /7ffz7N69ck4lsMys8eYOp/Da1Cy9FTs49wZFl+jFG9qlEmN/VFlCkV0WdJMBJiIYcb4 NukA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=tWAMygCylqh58NKKkBtb38EW2K6DR/A0BM3WbKZf+OY=; b=KOWRrPfcSfFk51UbeNLYU9JzniXAXSNIscrFbd0jBYavYgiiBWq4iK+AaIROOhfhSN Tig3Sn52mliYktLSlrO1YK3ilzWCKiG5h64KhJKQP+tWiBfMkqKx7N7gIyWE0vHvgoEM ar7acktk90ExG+fCQ8xhZ4Oai5i/MJJmTZ5h50PMVC2n8JILWR0C3vpd7TMBkqVZISxH aVXtwjoD8so/KQfzJyQhqAFgQhzHTDsWZXiS71l81phbGO7t3M69ZN2d36rr4Hh5B02j AbHsdgHGsz2l/Jzfc/GIMtXSeA+1BJFoUTg3ABCbGbARy+/5Q81U8NHwqaC3hV2p1HmU b2VA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=cy2wNkBN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hf23-20020a1709072c5700b008d594c60342si319960ejc.182.2023.03.02.13.15.05; Thu, 02 Mar 2023 13:15:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=cy2wNkBN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229642AbjCBVLd (ORCPT + 99 others); Thu, 2 Mar 2023 16:11:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229506AbjCBVLa (ORCPT ); Thu, 2 Mar 2023 16:11:30 -0500 Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 652775652A for ; Thu, 2 Mar 2023 13:11:29 -0800 (PST) Received: by mail-pj1-x1034.google.com with SMTP id p3-20020a17090ad30300b0023a1cd5065fso339848pju.0 for ; Thu, 02 Mar 2023 13:11:29 -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=tWAMygCylqh58NKKkBtb38EW2K6DR/A0BM3WbKZf+OY=; b=cy2wNkBN2aeiKS59LTkdCMsChPyapo+wQIWOqAZv9LNPB000DvBdhG31hinMrK8hvN ckCB6Cx5FhtPHDMDGj1ADfTyCZyAozwAidEWpin7TFZgy61f8RVOmwpSWoS6dRDlHtLA h0YTUOkWYUOYBS0IAkF3wnPJ+NJwLyMtqR78g= 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=tWAMygCylqh58NKKkBtb38EW2K6DR/A0BM3WbKZf+OY=; b=nVf67CvyPsGSlON2NhdH02LVN5jgiWfGhpUQLncCncQQ0d2MY34UUReICUkwd60fNn g7TJwL5wXnyHuqz8fCamz47ndohyeVXqCJOYkHlG/z/sdaEvMgOMXO8wQkN8tmp6Ju1g ejbC3WgpSaH3Mvr7D0k/0M+2/oFhskuREyPZ4J/p7YtgL72ZMJWS+m/b/1xwg5ONRrg6 EPiKzodAXLbywuAoZ5hfCVJrz/tPcXeVRkzhVaM3iPYZXO4Mg6FH5f7Zjmd9S0WLoGeT BfgVOCp5ePZNR5qd1J+b7x8qjcIQOoTii53pOOWd6kR+ICtXxdso1/VK4sGKJiVoro+X vEsw== X-Gm-Message-State: AO0yUKW6dx1UhgFYFwb6urcnvjfiPT3Tg33aqySAVesQiDZF3jUKg3v8 1yOUA8q8Rfy3Modh4Pr6OQbZbw== X-Received: by 2002:a17:902:d2cd:b0:19d:af21:dc2f with SMTP id n13-20020a170902d2cd00b0019daf21dc2fmr13994381plc.33.1677791489075; Thu, 02 Mar 2023 13:11:29 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:9d:2:a558:99c0:81e9:a93c]) by smtp.gmail.com with ESMTPSA id a16-20020a170902b59000b00195f242d0a0sm114497pls.194.2023.03.02.13.11.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 13:11:28 -0800 (PST) From: Douglas Anderson To: Bjorn Andersson Cc: Konrad Dybcio , mka@chromium.org, swboyd@chromium.org, 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 v2 2/4] arm64: dts: qcom: sc7180: Delete kingoftown-rev0 Date: Thu, 2 Mar 2023 13:11:05 -0800 Message-Id: <20230302131031.v2.2.I68cbe5d5d45074428469da8c52f1d6a78bdc62fc@changeid> X-Mailer: git-send-email 2.40.0.rc0.216.gc4246ad0f0-goog In-Reply-To: <20230302211108.2129598-1-dianders@chromium.org> References: <20230302211108.2129598-1-dianders@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759292140119902525?= X-GMAIL-MSGID: =?utf-8?q?1759292140119902525?= 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 Reviewed-by: Konrad Dybcio --- Changes in v2: - Get rid of kingoftown.dtsi and merge into dts (Konrad) arch/arm64/boot/dts/qcom/Makefile | 3 +- .../dts/qcom/sc7180-trogdor-kingoftown-r0.dts | 38 ------------------- .../dts/qcom/sc7180-trogdor-kingoftown-r1.dts | 17 --------- ...own.dtsi => sc7180-trogdor-kingoftown.dts} | 10 ++++- 4 files changed, 10 insertions(+), 58 deletions(-) delete mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown-r0.dts delete mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown-r1.dts rename arch/arm64/boot/dts/qcom/{sc7180-trogdor-kingoftown.dtsi => sc7180-trogdor-kingoftown.dts} (95%) 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-r1.dts deleted file mode 100644 index e0752ba7df11..000000000000 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown-r1.dts +++ /dev/null @@ -1,17 +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-parade-ps8640.dtsi" -#include "sc7180-trogdor-kingoftown.dtsi" - -/ { - model = "Google Kingoftown (rev1+)"; - compatible = "google,kingoftown", "qcom,sc7180"; -}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dts similarity index 95% rename from arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dtsi rename to arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dts index 315ac5eb5f78..36326ef972dc 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dts @@ -5,10 +5,18 @@ * Copyright 2021 Google LLC. */ -/* This file must be included after sc7180-trogdor.dtsi */ +/dts-v1/; + +#include "sc7180-trogdor.dtsi" +#include "sc7180-trogdor-parade-ps8640.dtsi" #include #include "sc7180-trogdor-lte-sku.dtsi" +/ { + model = "Google Kingoftown"; + compatible = "google,kingoftown", "qcom,sc7180"; +}; + &alc5682 { compatible = "realtek,rt5682s"; /delete-property/ VBAT-supply;