michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arch: nxp: lpc54xxx: Rename SoC bits from LPC54114 to LPC54114_M4

Browse source 
Rename various SoC related defines and files from just being LPC54114
to LPC54114_M4.  This is in prep for supporting a build for the second
core on the LPC54114 (the Cortex-M0+).

* Renamed Kconfig SOC_LPC54114 to SOC_LPC54114_M4
* Renamed Kconfig.defconfig.lpc54114 to Kconfig.defconfig.lpc54114_m4
* Introduced nxp_lpc54xxx_m4.dtsi based on nxp_lpc54xxx.dtsi
* Moved some pinmux related defines into SoC code.

Signed-off-by: Stanislav Poboril <stanislav.poboril@nxp.com>
Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Stanislav Poboril 2018-05-15 13:47:24 -05:00 • committed by Kumar Gala
commit fd4759b5d7
9 changed files with 42 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/soc/nxp_lpc/lpc54xxx/Kconfig.defconfig.lpc54114 → arch/arm/soc/nxp_lpc/lpc54xxx/Kconfig.defconfig.lpc54114_m4
View file

@ -5,7 +5,7 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
if SOC_LPC54114 if SOC_LPC54114_M4
config SOC config SOC
string string
@ -32,4 +32,4 @@ config USART_MCUX_LPC
endif # SERIAL endif # SERIAL
endif # SOC_LPC54114 endif # SOC_LPC54114_M4

2
arch/arm/soc/nxp_lpc/lpc54xxx/Kconfig.series
View file

@ -7,7 +7,7 @@
config SOC_SERIES_LPC54XXX config SOC_SERIES_LPC54XXX
bool "LPC LPC54xxx Series MCU" bool "LPC LPC54xxx Series MCU"
select CPU_CORTEX_M4 select HAS_MCUX
select SOC_FAMILY_LPC select SOC_FAMILY_LPC
select SYS_POWER_LOW_POWER_STATE_SUPPORTED select SYS_POWER_LOW_POWER_STATE_SUPPORTED
select CPU_HAS_SYSTICK select CPU_HAS_SYSTICK

6
arch/arm/soc/nxp_lpc/lpc54xxx/Kconfig.soc
View file

@ -9,9 +9,9 @@ choice
prompt "LPC LPC54XXX MCU Selection" prompt "LPC LPC54XXX MCU Selection"
depends on SOC_SERIES_LPC54XXX depends on SOC_SERIES_LPC54XXX
config SOC_LPC54114 config SOC_LPC54114_M4
bool "SOC_LPC54114" bool "SOC_LPC54114_M4"
select HAS_MCUX select CPU_CORTEX_M4
endchoice endchoice

11
arch/arm/soc/nxp_lpc/lpc54xxx/soc.h
View file

@ -25,6 +25,17 @@ extern "C" {
#include <fsl_common.h> #include <fsl_common.h>
#endif /* !_ASMLANGUAGE */ #endif /* !_ASMLANGUAGE */
#define IOCON_PIO_DIGITAL_EN 0x80u
#define IOCON_PIO_FUNC0 0x00u
#define IOCON_PIO_FUNC1 0x01u
#define IOCON_PIO_FUNC2 0x02u
#define IOCON_PIO_INPFILT_OFF 0x0100u
#define IOCON_PIO_INV_DI 0x00u
#define IOCON_PIO_MODE_INACT 0x00u
#define IOCON_PIO_OPENDRAIN_DI 0x00u
#define IOCON_PIO_SLEW_STANDARD 0x00u
#define IOCON_PIO_MODE_PULLUP 0x10u
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

2
boards/arm/lpcxpresso54114/lpcxpresso54114.dts
View file

@ -6,7 +6,7 @@
/dts-v1/; /dts-v1/;
#include <nxp/nxp_lpc54xxx.dtsi> #include <nxp/nxp_lpc54xxx_m4.dtsi>
/ { / {
model = "NXP LPCXpresso54114 board"; model = "NXP LPCXpresso54114 board";

2
boards/arm/lpcxpresso54114/lpcxpresso54114_defconfig
View file

@ -5,7 +5,7 @@
# #
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SOC_LPC54114=y CONFIG_SOC_LPC54114_M4=y
CONFIG_SOC_SERIES_LPC54XXX=y CONFIG_SOC_SERIES_LPC54XXX=y
CONFIG_BOARD_LPCXPRESSO54114=y CONFIG_BOARD_LPCXPRESSO54114=y
CONFIG_CONSOLE=y CONFIG_CONSOLE=y

12
boards/arm/lpcxpresso54114/pinmux.c
View file

@ -7,17 +7,7 @@
#include <pinmux.h> #include <pinmux.h>
#include <fsl_common.h> #include <fsl_common.h>
#include <fsl_iocon.h> #include <fsl_iocon.h>
#include <soc.h>
#define IOCON_PIO_DIGITAL_EN 0x80u
#define IOCON_PIO_FUNC0 0x00u
#define IOCON_PIO_FUNC1 0x01u
#define IOCON_PIO_FUNC2 0x02u
#define IOCON_PIO_INPFILT_OFF 0x0100u
#define IOCON_PIO_INV_DI 0x00u
#define IOCON_PIO_MODE_INACT 0x00u
#define IOCON_PIO_OPENDRAIN_DI 0x00u
#define IOCON_PIO_SLEW_STANDARD 0x00u
#define IOCON_PIO_MODE_PULLUP 0x10u
static int lpcxpresso_54114_pinmux_init(struct device *dev) static int lpcxpresso_54114_pinmux_init(struct device *dev)
{ {

1
dts/arm/nxp/nxp_lpc54xxx.dtsi
View file

@ -4,7 +4,6 @@
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#include <arm/armv7-m.dtsi>
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
/ { / {

22
dts/arm/nxp/nxp_lpc54xxx_m4.dtsi Normal file
View file

@ -0,0 +1,22 @@
/*
* Copyright (c) 2018 Linaro Limited
*
* SPDX-License-Identifier: Apache-2.0
*/
#include <arm/armv7-m.dtsi>
#include <nxp/nxp_lpc54xxx.dtsi>
/ {
cpus {
cpu@0 {
compatible = "arm,cortex-m4f";
};
/delete-node/ cpu@1;
};
};
&nvic {
arm,num-irq-priority-bits = <3>;
};