diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-03-18 08:48:17 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-03-18 08:48:17 +0100 |
| commit | 1e23cf5c7b71c29cc8dd7b0c5b80929d286b554e (patch) | |
| tree | d5a3f3b108f37f1e80ccd64242222b2cc5548607 /arch/arm | |
| parent | 8c02f14d1db16068a005b9674da42f14f344ab89 (diff) | |
| parent | a2d10b46f39e36c0e19bfde0737e27d2b0bf43ba (diff) | |
| download | barebox-1e23cf5c7b71c29cc8dd7b0c5b80929d286b554e.tar.gz barebox-1e23cf5c7b71c29cc8dd7b0c5b80929d286b554e.tar.xz | |
Merge branch 'for-next/stm32'
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boards/stm32mp157c-dk2/board.c | 3 | ||||
| -rw-r--r-- | arch/arm/dts/stm32mp151.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/imx.c | 2 |
3 files changed, 3 insertions, 4 deletions
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 <common.h> -#include <linux/sizes.h> #include <init.h> -#include <asm/memory.h> -#include <mach/stm32.h> #include <mach/bbu.h> static int dk2_postcore_init(void) 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 { diff --git a/arch/arm/mach-imx/imx.c b/arch/arm/mach-imx/imx.c index ca2e77befe..0bbe44e4dd 100644 --- a/arch/arm/mach-imx/imx.c +++ b/arch/arm/mach-imx/imx.c @@ -206,5 +206,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); } |