diff mbox series

[v2,2/4] arm64: dts: qcom: sc7180: Delete kingoftown-rev0

Message ID 20230302131031.v2.2.I68cbe5d5d45074428469da8c52f1d6a78bdc62fc@changeid (mailing list archive)
State Accepted
Headers show
Series arm64: dts: qcom: sc7180: Delete a few unused trogdor dts files | expand

Commit Message

Doug Anderson March 2, 2023, 9:11 p.m. UTC 
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 <dianders@chromium.org>
---

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%)

Comments

Konrad Dybcio March 3, 2023, 12:48 a.m. UTC | #1 
On 2.03.2023 22:11, Douglas Anderson wrote:
> 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 <dianders@chromium.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
> 
> 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 <arm/cros-ec-keyboard.dtsi>
>  #include "sc7180-trogdor-lte-sku.dtsi"
>  
> +/ {
> +	model = "Google Kingoftown";
> +	compatible = "google,kingoftown", "qcom,sc7180";
> +};
> +
>  &alc5682 {
>  	compatible = "realtek,rt5682s";
>  	/delete-property/ VBAT-supply;
diff mbox series

Patch

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 <arm/cros-ec-keyboard.dtsi>
 #include "sc7180-trogdor-lte-sku.dtsi"
 
+/ {
+	model = "Google Kingoftown";
+	compatible = "google,kingoftown", "qcom,sc7180";
+};
+
 &alc5682 {
 	compatible = "realtek,rt5682s";
 	/delete-property/ VBAT-supply;