diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-08-15 10:58:11 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-08-15 10:58:11 +0200 |
| commit | a3e62ffc7341254fd754886e560865556bc731c8 (patch) | |
| tree | 927d7536f9a66998b807d8943b05f3242dab6dd2 /arch | |
| parent | a6aab0ebab471e91beb4e14c2d305b326ac18928 (diff) | |
| parent | d15760e59897f71252294b2bea8fe986efdcb1b8 (diff) | |
| download | barebox-a3e62ffc7341254fd754886e560865556bc731c8.tar.gz barebox-a3e62ffc7341254fd754886e560865556bc731c8.tar.xz | |
Merge branch 'for-next/stm32'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/dts/stm32mp157c.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/mach-stm32mp/Kconfig | 8 |
3 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 0f5190b417..de45bcf82a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -208,7 +208,7 @@ config ARCH_S3C64xx select GENERIC_GPIO config ARCH_STM32MP - bool "ST stm32mp1xx" + bool "STMicroelectronics STM32MP" select CPU_V7 select HAVE_PBL_MULTI_IMAGES select CLKDEV_LOOKUP diff --git a/arch/arm/dts/stm32mp157c.dtsi b/arch/arm/dts/stm32mp157c.dtsi index b97622c8d4..8d9c84a047 100644 --- a/arch/arm/dts/stm32mp157c.dtsi +++ b/arch/arm/dts/stm32mp157c.dtsi @@ -17,6 +17,6 @@ gpio8 = &gpioi; gpio9 = &gpioj; gpio10 = &gpiok; - gpio11 = &gpioz; + gpio25 = &gpioz; }; }; diff --git a/arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp/Kconfig index be16294f5a..6bf950b23f 100644 --- a/arch/arm/mach-stm32mp/Kconfig +++ b/arch/arm/mach-stm32mp/Kconfig @@ -1,10 +1,14 @@ if ARCH_STM32MP -config ARCH_STM32MP1157 +config ARCH_NR_GPIO + int + default 416 + +config ARCH_STM32MP157 bool config MACH_STM32MP157C_DK2 - select ARCH_STM32MP1157 + select ARCH_STM32MP157 select ARM_USE_COMPRESSED_DTB bool "STM32MP157C-DK2 board" |