From 0b1ffec27b0dca8d57d8bfd6a9c3da62fe851812 Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Mon, 10 Feb 2020 14:09:51 +0100 Subject: reset_source: migrate from reset_source_name to reset_source_to_string Whether reset_source_name() returns the just set reset_source is dependent on probe order and the priorities of prior reset sources in relation to the current one. Make this more robust by using the new reset_source_to_string. Signed-off-by: Ahmad Fatoum Signed-off-by: Sascha Hauer --- arch/arm/mach-imx/imx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch') diff --git a/arch/arm/mach-imx/imx.c b/arch/arm/mach-imx/imx.c index 0942d50695..d5ce25d457 100644 --- a/arch/arm/mach-imx/imx.c +++ b/arch/arm/mach-imx/imx.c @@ -202,5 +202,5 @@ void imx_set_reset_reason(void __iomem *srsr, reset_source_set_prinst(type, RESET_SOURCE_DEFAULT_PRIORITY, instance); pr_info("i.MX reset reason %s (SRSR: 0x%08x)\n", - reset_source_name(), reg); + reset_source_to_string(type), reg); } -- cgit v1.2.3 From 137693f333dc348d7c7705931f5f83a24b1a850b Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Mon, 24 Feb 2020 09:11:53 +0100 Subject: ARM: stm32mp: dk2: delete unused includes These includes are no longer needed because we don't need to hard code memory size in board code anymore for the STM32MP. Drop them. Signed-off-by: Ahmad Fatoum Signed-off-by: Sascha Hauer --- arch/arm/boards/stm32mp157c-dk2/board.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'arch') diff --git a/arch/arm/boards/stm32mp157c-dk2/board.c b/arch/arm/boards/stm32mp157c-dk2/board.c index 6da99d9353..4636603121 100644 --- a/arch/arm/boards/stm32mp157c-dk2/board.c +++ b/arch/arm/boards/stm32mp157c-dk2/board.c @@ -1,9 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ #include -#include #include -#include -#include #include static int dk2_postcore_init(void) -- cgit v1.2.3 From ca001226d30824156ccf3b1f3be0bfd3990e2ebd Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Mon, 24 Feb 2020 09:11:54 +0100 Subject: ARM: stm32mp: add aliases for mmc1 and mmc2 With the latest update, dts/src/arm/stm32mp151.dtsi now defines the two other sdmmc nodes as well. Have barebox set aliases for them. Signed-off-by: Ahmad Fatoum Signed-off-by: Sascha Hauer --- arch/arm/dts/stm32mp151.dtsi | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch') diff --git a/arch/arm/dts/stm32mp151.dtsi b/arch/arm/dts/stm32mp151.dtsi index e416c89856..8f8249dbc4 100644 --- a/arch/arm/dts/stm32mp151.dtsi +++ b/arch/arm/dts/stm32mp151.dtsi @@ -19,6 +19,8 @@ gpio10 = &gpiok; gpio25 = &gpioz; mmc0 = &sdmmc1; + mmc1 = &sdmmc2; + mmc2 = &sdmmc3; }; psci { -- cgit v1.2.3