From e5565c24bb49f477c4326d2b5275ed88b50af1ef Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Tue, 10 Sep 2024 20:37:18 +0200 Subject: [PATCH 1/3] pinctrl: exynos: fix type of count integer unsigned int count is used to capture return of dev_read_string_count. When an error occurs dev_read_string_count returns -ve, which can hence not be handled correctly. Use int instead of unsigned int so that errors are detected. Fixes: 16ca80adc551 ("pinctrl: Add pinctrl driver support for Exynos7420 SoC") Signed-off-by: Henrik Grimler Signed-off-by: Minkyu Kang --- drivers/pinctrl/exynos/pinctrl-exynos.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/exynos/pinctrl-exynos.c b/drivers/pinctrl/exynos/pinctrl-exynos.c index b393127c642..b37282fa9d6 100644 --- a/drivers/pinctrl/exynos/pinctrl-exynos.c +++ b/drivers/pinctrl/exynos/pinctrl-exynos.c @@ -114,8 +114,8 @@ static void exynos_pinctrl_set_pincfg(unsigned long reg_base, u32 pin_num, int exynos_pinctrl_set_state(struct udevice *dev, struct udevice *config) { struct exynos_pinctrl_priv *priv = dev_get_priv(dev); - unsigned int count, idx; - unsigned int pinvals[PINCFG_TYPE_NUM]; + int count; + unsigned int idx, pinvals[PINCFG_TYPE_NUM]; /* * refer to the following document for the pinctrl bindings From 57e77dc80e082b11f6fc2c9c5dd9ec9330a5a1a6 Mon Sep 17 00:00:00 2001 From: Sam Protsenko Date: Wed, 30 Oct 2024 15:46:27 -0500 Subject: [PATCH 2/3] arm: dts: e850-96: Remove TRNG node from appended dts Commit 136b7b6d2e98 ("Subtree merge tag 'v6.11-dts' of dts repo [1] into dts/upstream") updates the upstream dts for E850-96 board, bringing upstream TRNG node. There is no need to keep TRNG node in appended dts anymore, so remove it. Tested on E850-96 board by running 'rng' command in U-Boot shell. Signed-off-by: Sam Protsenko Signed-off-by: Minkyu Kang --- arch/arm/dts/exynos850-e850-96-u-boot.dtsi | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/arch/arm/dts/exynos850-e850-96-u-boot.dtsi b/arch/arm/dts/exynos850-e850-96-u-boot.dtsi index 3aa5d8bb10d..6d7148f7264 100644 --- a/arch/arm/dts/exynos850-e850-96-u-boot.dtsi +++ b/arch/arm/dts/exynos850-e850-96-u-boot.dtsi @@ -3,17 +3,6 @@ * Copyright (c) 2023 Linaro Ltd. */ -&soc { - /* TODO: Remove this node once it appears in upstream dts */ - trng: rng@12081400 { - compatible = "samsung,exynos850-trng"; - reg = <0x12081400 0x100>; - clocks = <&cmu_core CLK_GOUT_SSS_ACLK>, - <&cmu_core CLK_GOUT_SSS_PCLK>; - clock-names = "secss", "pclk"; - }; -}; - &pmu_system_controller { bootph-all; samsung,uart-debug-1; From 0bbc17f06bf3ecee019090b76c8c20480516945e Mon Sep 17 00:00:00 2001 From: Sam Protsenko Date: Mon, 18 Nov 2024 21:28:00 -0600 Subject: [PATCH 3/3] configs: e850-96: Disable PSCI reset PSCI reset is not implemented in Exynos850 EL3 firmware. Disable it to fix the reset in cases where it can be used, e.g. when running EFI selftest. Signed-off-by: Sam Protsenko Signed-off-by: Minkyu Kang --- configs/e850-96_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/e850-96_defconfig b/configs/e850-96_defconfig index 5797c6cb1f9..c36196c510c 100644 --- a/configs/e850-96_defconfig +++ b/configs/e850-96_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y +CONFIG_ARM_SMCCC=y CONFIG_ARCH_EXYNOS=y CONFIG_TEXT_BASE=0xf8800000 CONFIG_SYS_MALLOC_LEN=0x81f000 @@ -9,6 +10,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xf8c00000 CONFIG_DEFAULT_DEVICE_TREE="exynos/exynos850-e850-96" CONFIG_SYS_LOAD_ADDR=0x80000000 +# CONFIG_PSCI_RESET is not set CONFIG_ANDROID_BOOT_IMAGE=y # CONFIG_AUTOBOOT is not set # CONFIG_DISPLAY_CPUINFO is not set