From 51a19c4274ca897cec279d1b2d883957ab4705c5 Mon Sep 17 00:00:00 2001 From: Suman Anna Date: Thu, 29 Apr 2021 20:13:31 -0500 Subject: [PATCH] arm: dts: k3-am654: Add a specific IDK overlay for SR1.0 The AM654 IDK daughter card supports few additional peripherals like MCAN and 4 ICSSG Ethernet ports. The ICSSG IP is different between the two AM65x Silicon Revisions SR1.0 and SR2.0, and so warrants a separate overlay file when using on top of a AM654 base board populated with a SR1.0 silicon. Add a new k3-am654-idk-sr1.dts overlay file, which includes the k3-am654-idk.dts overlay file. The built overlays are identical for now, but will diverge after ICSSG Ethernet support is added. This fixes the following warning currently seen in A53 SPL on AM65x EVMs with SR1.0 after the board logic is fixed up to pick the separate overlay for kernel in commit ba961d78ac16 ("board: ti: am65x: Use different overlay for IDK with SR1.0 EVM") "cannot find image node 'k3-am654-idk-sr1': -1" Signed-off-by: Suman Anna --- arch/arm/dts/Makefile | 3 ++- arch/arm/dts/k3-am654-idk-sr1.dts | 8 ++++++++ configs/am65x_evm_a53_defconfig | 2 +- configs/am65x_hs_evm_a53_defconfig | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 arch/arm/dts/k3-am654-idk-sr1.dts diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 2f7addb590..ed9269660e 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -968,7 +968,8 @@ dtb-$(CONFIG_STM32MP15x) += \ dtb-$(CONFIG_SOC_K3_AM6) += k3-am654-base-board.dtb k3-am654-r5-base-board.dtb \ k3-am654-pcie-usb2.dtbo k3-am654-pcie-usb3.dtbo \ - k3-am654-idk.dtbo + k3-am654-idk.dtbo \ + k3-am654-idk-sr1.dtbo dtb-$(CONFIG_SOC_K3_J721E) += k3-j721e-common-proc-board.dtb \ k3-j721e-r5-common-proc-board.dtb \ k3-j7200-common-proc-board.dtb \ diff --git a/arch/arm/dts/k3-am654-idk-sr1.dts b/arch/arm/dts/k3-am654-idk-sr1.dts new file mode 100644 index 0000000000..f6232b9803 --- /dev/null +++ b/arch/arm/dts/k3-am654-idk-sr1.dts @@ -0,0 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * DT overlay for IDK application board on AM654 EVM SR1.0 + * + * Copyright (C) 2020-2021 Texas Instruments Incorporated - https://www.ti.com/ + */ + +#include "k3-am654-idk.dts" diff --git a/configs/am65x_evm_a53_defconfig b/configs/am65x_evm_a53_defconfig index 6049021814..2b287c2f47 100644 --- a/configs/am65x_evm_a53_defconfig +++ b/configs/am65x_evm_a53_defconfig @@ -24,7 +24,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y # CONFIG_PSCI_RESET is not set CONFIG_DEFAULT_DEVICE_TREE="k3-am654-base-board" -CONFIG_OF_OVERLAY_LIST="k3-am654-pcie-usb2 k3-am654-pcie-usb3 k3-am654-idk" +CONFIG_OF_OVERLAY_LIST="k3-am654-pcie-usb2 k3-am654-pcie-usb3 k3-am654-idk k3-am654-idk-sr1" CONFIG_DISTRO_DEFAULTS=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_LOAD_FIT=y diff --git a/configs/am65x_hs_evm_a53_defconfig b/configs/am65x_hs_evm_a53_defconfig index 2c1a3cb1ac..fddb080479 100644 --- a/configs/am65x_hs_evm_a53_defconfig +++ b/configs/am65x_hs_evm_a53_defconfig @@ -24,7 +24,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y # CONFIG_PSCI_RESET is not set CONFIG_DEFAULT_DEVICE_TREE="k3-am654-base-board" -CONFIG_OF_OVERLAY_LIST="k3-am654-pcie-usb2 k3-am654-pcie-usb3 k3-am654-idk" +CONFIG_OF_OVERLAY_LIST="k3-am654-pcie-usb2 k3-am654-pcie-usb3 k3-am654-idk k3-am654-idk-sr1" CONFIG_DISTRO_DEFAULTS=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_FIT_IMAGE_POST_PROCESS=y