[PATCH 0/2] Updates for IOT2050 board
This fixes the freshly merged IOT2050 board and also enables the usage of the USB 3.0 port under U-Boot (as USB 2.0).
Jan
Jan Kiszka (2): board: siemens: iot2050: Adjust to changes in DT and configuration arm: dts: Update IOT2050 device tree files
.../k3-am65-iot2050-common-pg2-u-boot.dtsi | 27 +++++++++++++++++++ arch/arm/dts/k3-am65-iot2050-common-pg2.dtsi | 4 ++- .../dts/k3-am65-iot2050-common-u-boot.dtsi | 2 +- configs/iot2050_defconfig | 6 +++-- include/configs/iot2050.h | 2 -- 5 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 arch/arm/dts/k3-am65-iot2050-common-pg2-u-boot.dtsi
From: Jan Kiszka jan.kiszka@siemens.com
Account for the changes done between merge proposal and the final merge.
Signed-off-by: Jan Kiszka jan.kiszka@siemens.com --- arch/arm/dts/k3-am65-iot2050-common-u-boot.dtsi | 2 +- configs/iot2050_defconfig | 6 ++++-- include/configs/iot2050.h | 2 -- 3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/dts/k3-am65-iot2050-common-u-boot.dtsi b/arch/arm/dts/k3-am65-iot2050-common-u-boot.dtsi index 88c36fcf43..286e25f379 100644 --- a/arch/arm/dts/k3-am65-iot2050-common-u-boot.dtsi +++ b/arch/arm/dts/k3-am65-iot2050-common-u-boot.dtsi @@ -35,7 +35,7 @@
&cbass_main { u-boot,dm-spl; - main-navss { + main_navss: bus@30800000 { u-boot,dm-spl; }; }; diff --git a/configs/iot2050_defconfig b/configs/iot2050_defconfig index 72ee5c83f1..84e387a099 100644 --- a/configs/iot2050_defconfig +++ b/configs/iot2050_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_K3=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y @@ -10,15 +11,16 @@ CONFIG_TARGET_IOT2050_A53=y CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0x680000 CONFIG_ENV_SECT_SIZE=0x20000 +CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_DM_GPIO=y CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="k3-am6528-iot2050-basic" CONFIG_SPL_TEXT_BASE=0x80080000 -CONFIG_SPL_SERIAL_SUPPORT=y +CONFIG_SPL_SERIAL=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_ENV_OFFSET_REDUND=0x6a0000 CONFIG_SPL_SPI_FLASH_SUPPORT=y -CONFIG_SPL_SPI_SUPPORT=y +CONFIG_SPL_SPI=y CONFIG_DISTRO_DEFAULTS=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_LOAD_FIT=y diff --git a/include/configs/iot2050.h b/include/configs/iot2050.h index ddb4cfcc8e..91ed76bb40 100644 --- a/include/configs/iot2050.h +++ b/include/configs/iot2050.h @@ -17,8 +17,6 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SPL_TEXT_BASE + \ CONFIG_SYS_K3_NON_SECURE_MSRAM_SIZE)
-#define CONFIG_SKIP_LOWLEVEL_INIT - #define CONFIG_SPL_MAX_SIZE CONFIG_SYS_K3_MAX_DOWNLODABLE_IMAGE_SIZE
#define CONFIG_SYS_BOOTM_LEN SZ_64M
On Tue, Oct 05, 2021 at 12:04:49PM +0200, Jan Kiszka wrote:
From: Jan Kiszka jan.kiszka@siemens.com
Account for the changes done between merge proposal and the final merge.
Signed-off-by: Jan Kiszka jan.kiszka@siemens.com
Ah, the navss name thing, sorry I didn't remember that yesterday.
Reviewed-by: Tom Rini trini@konsulko.com
On 05.10.21 13:37, Tom Rini wrote:
On Tue, Oct 05, 2021 at 12:04:49PM +0200, Jan Kiszka wrote:
From: Jan Kiszka jan.kiszka@siemens.com
Account for the changes done between merge proposal and the final merge.
Signed-off-by: Jan Kiszka jan.kiszka@siemens.com
Ah, the navss name thing, sorry I didn't remember that yesterday.
Yeah, and my first experiment to revert the DT changes somehow didn't apply which sent me needlessly into an extra bisection loop.
Reviewed-by: Tom Rini trini@konsulko.com
Thanks, Jan
On Tue, Oct 05, 2021 at 12:04:49PM +0200, Jan Kiszka wrote:
From: Jan Kiszka jan.kiszka@siemens.com
Account for the changes done between merge proposal and the final merge.
Signed-off-by: Jan Kiszka jan.kiszka@siemens.com Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
From: Jan Kiszka jan.kiszka@siemens.com
This fixes the usage of the USB 3.0-capable port under U-Boot as USB 2.0-only port.
Original patch by Chao Zeng.
Signed-off-by: Jan Kiszka jan.kiszka@siemens.com --- .../k3-am65-iot2050-common-pg2-u-boot.dtsi | 27 +++++++++++++++++++ arch/arm/dts/k3-am65-iot2050-common-pg2.dtsi | 4 ++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/k3-am65-iot2050-common-pg2-u-boot.dtsi
diff --git a/arch/arm/dts/k3-am65-iot2050-common-pg2-u-boot.dtsi b/arch/arm/dts/k3-am65-iot2050-common-pg2-u-boot.dtsi new file mode 100644 index 0000000000..64dddce648 --- /dev/null +++ b/arch/arm/dts/k3-am65-iot2050-common-pg2-u-boot.dtsi @@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) Siemens AG, 2018-2021 + * + * Authors: + * Chao Zeng chao.zeng@siemens.com + * + * U-Boot bits of the IOT2050 Advanced PG2 variants + * (downgrade of usb0 to USB 2.0 mode) + */ + +&serdes0 { + status = "disabled"; +}; + +&dwc3_0 { + assigned-clock-parents = <&k3_clks 151 4>, /* set REF_CLK to 20MHz i.e. PER0_PLL/48 */ + <&k3_clks 151 9>; /* set PIPE3_TXB_CLK to CLK_12M_RC/256 (for HS only) */ + /delete-property/ phys; + /delete-property/ phy-names; +}; + +&usb0 { + maximum-speed = "high-speed"; + /delete-property/ snps,dis-u1-entry-quirk; + /delete-property/ snps,dis-u2-entry-quirk; +}; diff --git a/arch/arm/dts/k3-am65-iot2050-common-pg2.dtsi b/arch/arm/dts/k3-am65-iot2050-common-pg2.dtsi index c25bce7339..e7e0ca4159 100644 --- a/arch/arm/dts/k3-am65-iot2050-common-pg2.dtsi +++ b/arch/arm/dts/k3-am65-iot2050-common-pg2.dtsi @@ -44,8 +44,10 @@ phy-names = "usb3-phy"; };
-&usb0_phy { +&usb0 { maximum-speed = "super-speed"; snps,dis-u1-entry-quirk; snps,dis-u2-entry-quirk; }; + +#include "k3-am65-iot2050-common-pg2-u-boot.dtsi"
On Tue, Oct 05, 2021 at 12:04:50PM +0200, Jan Kiszka wrote:
From: Jan Kiszka jan.kiszka@siemens.com
This fixes the usage of the USB 3.0-capable port under U-Boot as USB 2.0-only port.
Original patch by Chao Zeng.
Signed-off-by: Jan Kiszka jan.kiszka@siemens.com
Applied to u-boot/master, thanks!
participants (2)
-
Jan Kiszka -
Tom Rini