Re: [PATCH 2/3] arm: dts: am625_sk: Switch to OF_UPSTREAM
Hi Nishanth,
Thank you for the patch.
On mer., juin 05, 2024 at 10:27, Nishanth Menon wrote:
> Enable OF_UPSTREAM for am625-sk board. Remove DT files that
> are now available in dts/upstream. Update the appended files based on
> version of latest OF_UPSTREAM sync point (v6.10-rc1).
>
> Signed-off-by: Nishanth Menon
Reviewed-by: Mattijs Korpershoek
Boot tested to main U-Boot via DFU on AM62X SK EVM.
Tested-by: Mattijs Korpershoek
> ---
> arch/arm/dts/Makefile|3 +-
> arch/arm/dts/k3-am62-main.dtsi | 1058 --
> arch/arm/dts/k3-am62-mcu.dtsi| 176 -
> arch/arm/dts/k3-am62-thermal.dtsi| 36 -
> arch/arm/dts/k3-am62-wakeup.dtsi | 96 ---
> arch/arm/dts/k3-am62.dtsi| 122 ---
> arch/arm/dts/k3-am625-sk-binman.dtsi |2 +-
> arch/arm/dts/k3-am625-sk.dts | 299
> arch/arm/dts/k3-am625.dtsi | 155
> arch/arm/dts/k3-am62x-sk-common.dtsi | 535 -
> configs/am62x_evm_a53_defconfig |3 +-
> 11 files changed, 4 insertions(+), 2481 deletions(-)
> delete mode 100644 arch/arm/dts/k3-am62-main.dtsi
> delete mode 100644 arch/arm/dts/k3-am62-mcu.dtsi
> delete mode 100644 arch/arm/dts/k3-am62-thermal.dtsi
> delete mode 100644 arch/arm/dts/k3-am62-wakeup.dtsi
> delete mode 100644 arch/arm/dts/k3-am62.dtsi
> delete mode 100644 arch/arm/dts/k3-am625-sk.dts
> delete mode 100644 arch/arm/dts/k3-am625.dtsi
> delete mode 100644 arch/arm/dts/k3-am62x-sk-common.dtsi
>
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index 813426a3e519..5b0bcf336924 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -1198,8 +1198,7 @@ dtb-$(CONFIG_SOC_K3_AM642) += k3-am642-r5-evm.dtb \
> k3-am642-r5-sk.dtb \
> k3-am642-r5-phycore-som-2gb.dtb
>
> -dtb-$(CONFIG_SOC_K3_AM625) += k3-am625-sk.dtb \
> - k3-am625-r5-sk.dtb \
> +dtb-$(CONFIG_SOC_K3_AM625) += k3-am625-r5-sk.dtb \
> k3-am625-r5-beagleplay.dtb \
> k3-am625-verdin-r5.dtb \
> k3-am625-r5-phycore-som-2gb.dtb
> diff --git a/arch/arm/dts/k3-am62-main.dtsi b/arch/arm/dts/k3-am62-main.dtsi
> deleted file mode 100644
> index e9cffca073ef..
> --- a/arch/arm/dts/k3-am62-main.dtsi
> +++ /dev/null
> @@ -1,1058 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0-only OR MIT
> -/*
> - * Device Tree Source for AM625 SoC Family Main Domain peripherals
> - *
> - * Copyright (C) 2020-2024 Texas Instruments Incorporated -
> https://www.ti.com/
> - */
> -
> -_main {
> - oc_sram: sram@7000 {
> - compatible = "mmio-sram";
> - reg = <0x00 0x7000 0x00 0x1>;
> - #address-cells = <1>;
> - #size-cells = <1>;
> - ranges = <0x0 0x00 0x7000 0x1>;
> - };
> -
> - gic500: interrupt-controller@180 {
> - compatible = "arm,gic-v3";
> - #address-cells = <2>;
> - #size-cells = <2>;
> - ranges;
> - #interrupt-cells = <3>;
> - interrupt-controller;
> - reg = <0x00 0x0180 0x00 0x1>, /* GICD */
> - <0x00 0x0188 0x00 0xc>, /* GICR */
> - <0x00 0x0188 0x00 0xc>, /* GICR */
> - <0x01 0x 0x00 0x2000>,/* GICC */
> - <0x01 0x0001 0x00 0x1000>,/* GICH */
> - <0x01 0x0002 0x00 0x2000>;/* GICV */
> - /*
> - * vcpumntirq:
> - * virtual CPU interface maintenance interrupt
> - */
> - interrupts = ;
> -
> - gic_its: msi-controller@182 {
> - compatible = "arm,gic-v3-its";
> - reg = <0x00 0x0182 0x00 0x1>;
> - socionext,synquacer-pre-its = <0x100 0x40>;
> - msi-controller;
> - #msi-cells = <1>;
> - };
> - };
> -
> - main_conf: bus@10 {
> - compatible = "simple-bus";
> - #address-cells = <1>;
> - #size-cells = <1>;
> - ranges = <0x0 0x00 0x0010 0x2>;
> -
> - phy_gmii_sel: phy@4044 {
> - compatible = "ti,am654-phy-gmii-sel";
> - reg = <0x4044 0x8>;
> - #phy-cells = <1>;
> - };
> -
> - epwm_tbclk: clock-controller@4130 {
> - compatible = "ti,am62-epwm-tbclk";
> - reg = <0x4130 0x4>;
> - #clock-cells = <1>;
> - };
> -
> - audio_refclk0: clock-controller@82e0 {
> - compatible = "ti,am62-audio-refclk";
> - reg = <0x82e0 0x4>;
> - clocks = <_clks 157 0>;
> -
[PATCH 2/3] arm: dts: am625_sk: Switch to OF_UPSTREAM
Enable OF_UPSTREAM for am625-sk board. Remove DT files that
are now available in dts/upstream. Update the appended files based on
version of latest OF_UPSTREAM sync point (v6.10-rc1).
Signed-off-by: Nishanth Menon
---
arch/arm/dts/Makefile|3 +-
arch/arm/dts/k3-am62-main.dtsi | 1058 --
arch/arm/dts/k3-am62-mcu.dtsi| 176 -
arch/arm/dts/k3-am62-thermal.dtsi| 36 -
arch/arm/dts/k3-am62-wakeup.dtsi | 96 ---
arch/arm/dts/k3-am62.dtsi| 122 ---
arch/arm/dts/k3-am625-sk-binman.dtsi |2 +-
arch/arm/dts/k3-am625-sk.dts | 299
arch/arm/dts/k3-am625.dtsi | 155
arch/arm/dts/k3-am62x-sk-common.dtsi | 535 -
configs/am62x_evm_a53_defconfig |3 +-
11 files changed, 4 insertions(+), 2481 deletions(-)
delete mode 100644 arch/arm/dts/k3-am62-main.dtsi
delete mode 100644 arch/arm/dts/k3-am62-mcu.dtsi
delete mode 100644 arch/arm/dts/k3-am62-thermal.dtsi
delete mode 100644 arch/arm/dts/k3-am62-wakeup.dtsi
delete mode 100644 arch/arm/dts/k3-am62.dtsi
delete mode 100644 arch/arm/dts/k3-am625-sk.dts
delete mode 100644 arch/arm/dts/k3-am625.dtsi
delete mode 100644 arch/arm/dts/k3-am62x-sk-common.dtsi
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 813426a3e519..5b0bcf336924 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -1198,8 +1198,7 @@ dtb-$(CONFIG_SOC_K3_AM642) += k3-am642-r5-evm.dtb \
k3-am642-r5-sk.dtb \
k3-am642-r5-phycore-som-2gb.dtb
-dtb-$(CONFIG_SOC_K3_AM625) += k3-am625-sk.dtb \
- k3-am625-r5-sk.dtb \
+dtb-$(CONFIG_SOC_K3_AM625) += k3-am625-r5-sk.dtb \
k3-am625-r5-beagleplay.dtb \
k3-am625-verdin-r5.dtb \
k3-am625-r5-phycore-som-2gb.dtb
diff --git a/arch/arm/dts/k3-am62-main.dtsi b/arch/arm/dts/k3-am62-main.dtsi
deleted file mode 100644
index e9cffca073ef..
--- a/arch/arm/dts/k3-am62-main.dtsi
+++ /dev/null
@@ -1,1058 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only OR MIT
-/*
- * Device Tree Source for AM625 SoC Family Main Domain peripherals
- *
- * Copyright (C) 2020-2024 Texas Instruments Incorporated - https://www.ti.com/
- */
-
-_main {
- oc_sram: sram@7000 {
- compatible = "mmio-sram";
- reg = <0x00 0x7000 0x00 0x1>;
- #address-cells = <1>;
- #size-cells = <1>;
- ranges = <0x0 0x00 0x7000 0x1>;
- };
-
- gic500: interrupt-controller@180 {
- compatible = "arm,gic-v3";
- #address-cells = <2>;
- #size-cells = <2>;
- ranges;
- #interrupt-cells = <3>;
- interrupt-controller;
- reg = <0x00 0x0180 0x00 0x1>, /* GICD */
- <0x00 0x0188 0x00 0xc>, /* GICR */
- <0x00 0x0188 0x00 0xc>, /* GICR */
- <0x01 0x 0x00 0x2000>,/* GICC */
- <0x01 0x0001 0x00 0x1000>,/* GICH */
- <0x01 0x0002 0x00 0x2000>;/* GICV */
- /*
-* vcpumntirq:
-* virtual CPU interface maintenance interrupt
-*/
- interrupts = ;
-
- gic_its: msi-controller@182 {
- compatible = "arm,gic-v3-its";
- reg = <0x00 0x0182 0x00 0x1>;
- socionext,synquacer-pre-its = <0x100 0x40>;
- msi-controller;
- #msi-cells = <1>;
- };
- };
-
- main_conf: bus@10 {
- compatible = "simple-bus";
- #address-cells = <1>;
- #size-cells = <1>;
- ranges = <0x0 0x00 0x0010 0x2>;
-
- phy_gmii_sel: phy@4044 {
- compatible = "ti,am654-phy-gmii-sel";
- reg = <0x4044 0x8>;
- #phy-cells = <1>;
- };
-
- epwm_tbclk: clock-controller@4130 {
- compatible = "ti,am62-epwm-tbclk";
- reg = <0x4130 0x4>;
- #clock-cells = <1>;
- };
-
- audio_refclk0: clock-controller@82e0 {
- compatible = "ti,am62-audio-refclk";
- reg = <0x82e0 0x4>;
- clocks = <_clks 157 0>;
- assigned-clocks = <_clks 157 0>;
- assigned-clock-parents = <_clks 157 8>;
- #clock-cells = <0>;
- };
-
- audio_refclk1: clock-controller@82e4 {
- compatible = "ti,am62-audio-refclk";
- reg =
