Skip to content
Commit 360b48d6 authored by Kumar Gala's avatar Kumar Gala
Browse files

Merge arm branch into master



Main changes:

- Device tree support for all STM32 based SoC/Boards
- Support for NXP KW40Z SoC & hexiwear_kw40z board
- Atmel SAM I2C, UART & GPIO drivers
- Some various Nordic SoC platform cleanups

----------------------------------------------------------------
Erwan Gouriou (6):
      dts: provide stm32 soc dtsi files for stm32 base boards
      dts: add dts for nucleo boards
      dts: provide dts for stm32 eval boards
      dts: provide dts files for non st stm32 based boards
      drivers: i2c: stm32: fix i2c_2 instance config
      drivers: pinmux: stm32l4 fix

Gustavo Denardin (2):
      arm: Support for MKL25Z soc
      arm: GPIO driver modifications for MKL25Z soc support

Kumar Gala (15):
      dts: arm: Introduce st/mem.h for FLASH & SRAM sizes
      sanitcheck: add nrf52_blenano2
      serial: mcux: remove bits related to !HAS_DTS
      dts: arm: st: Make flash/sram sizes human readable
      dts: arm: st: Add additional SoCs into mem.h
      dts: arm: ST: Cleanup DTS bits on STM32L4 SoCs
      arm: dts: st: Convert STM32F4 based boards to dts
      arm: dts: st: Convert STM32F1 based boards to dts
      arm: dts: st: Convert STM32F3 based boards to dts
      serial: stm32: remove bits related to !HAS_DTS
      arm: st: dts: remove last !HAS_DTS from stm32 SoCs
      arm: nxp: kl2x: remove HAS_DTS references
      arm: nrf52: Introduce NRF52 SoC Specific config options
      arm: curie_ble: Report curie_ble as a unique board
      arm: dts: Add DTS support for NRF52832 SoC

Maureen Helm (6):
      ext: mcux: Import ksdk 1.3 device header files for kw40z
      ext: mcux: Adapt ksdk 1.3 for kw40z to work with mcux 2.x drivers
      kw40z: Add kw40z SoC
      hexiwear_kw40z: Add hexiwear_kw40z board
      samples: nfc_hello: Add CONFIG_SERIAL=y to project conf
      sanitycheck: Add hexiwear_kw40z

Piotr Mienkowski (3):
      drivers: Add Atmel SAM family I2C (TWIHS) driver
      drivers: Add Atmel SAM serial (UART) driver
      drivers: Extend Atmel SAM GPIO driver

 arch/arm/soc/atmel_sam/common/soc_gpio.h           |    49 +-
 arch/arm/soc/atmel_sam/same70/soc_pinmap.h         |    60 +-
 ...ig.nrf52832 => Kconfig.defconfig.nrf52832_QFAA} |     8 +-
 ...ig.nrf52840 => Kconfig.defconfig.nrf52840_QIAA} |     6 +-
 .../soc/nordic_nrf5/nrf52/Kconfig.defconfig.series |     2 +
 arch/arm/soc/nordic_nrf5/nrf52/Kconfig.soc         |    18 +-
 arch/arm/soc/nxp_kinetis/Kconfig                   |     1 +
 .../soc/nxp_kinetis/kl2x/Kconfig.defconfig.mkl25z4 |    60 +
 .../soc/nxp_kinetis/kl2x/Kconfig.defconfig.series  |    15 +
 arch/arm/soc/nxp_kinetis/kl2x/Kconfig.series       |    16 +
 arch/arm/soc/nxp_kinetis/kl2x/Kconfig.soc          |    78 +
 arch/arm/soc/nxp_kinetis/kl2x/Makefile             |     8 +
 arch/arm/soc/nxp_kinetis/kl2x/linker.ld            |    31 +
 arch/arm/soc/nxp_kinetis/kl2x/soc.c                |   127 +
 arch/arm/soc/nxp_kinetis/kl2x/soc.h                |    65 +
 .../soc/nxp_kinetis/kwx/Kconfig.defconfig.mkw40z4  |    60 +
 arch/arm/soc/nxp_kinetis/kwx/Kconfig.soc           |    14 +
 arch/arm/soc/st_stm32/Kconfig.defconfig            |    12 -
 .../soc/st_stm32/stm32f1/Kconfig.defconfig.series  |     6 -
 .../st_stm32/stm32f1/Kconfig.defconfig.stm32f103xb |     8 -
 .../st_stm32/stm32f1/Kconfig.defconfig.stm32f103xe |     6 -
 .../st_stm32/stm32f1/Kconfig.defconfig.stm32f107xc |     6 -
 .../soc/st_stm32/stm32f3/Kconfig.defconfig.series  |    10 -
 .../st_stm32/stm32f3/Kconfig.defconfig.stm32f303xc |     6 -
 .../st_stm32/stm32f3/Kconfig.defconfig.stm32f334x8 |     6 -
 .../st_stm32/stm32f3/Kconfig.defconfig.stm32f373xc |     6 -
 .../soc/st_stm32/stm32f4/Kconfig.defconfig.series  |    10 -
 .../st_stm32/stm32f4/Kconfig.defconfig.stm32f401xe |     6 -
 .../st_stm32/stm32f4/Kconfig.defconfig.stm32f407xx |     6 -
 .../st_stm32/stm32f4/Kconfig.defconfig.stm32f411xe |     6 -
 .../st_stm32/stm32f4/Kconfig.defconfig.stm32f429xx |     6 -
 .../soc/st_stm32/stm32l4/Kconfig.defconfig.series  |     6 -
 .../st_stm32/stm32l4/Kconfig.defconfig.stm32l476xx |     9 -
 boards/arm/96b_carbon/96b_carbon_defconfig         |     4 +-
 boards/arm/96b_nitrogen/Kconfig.board              |     2 +-
 boards/arm/curie_ble/Kconfig.defconfig             |     4 +-
 boards/arm/hexiwear_kw40z/Kconfig.board            |    11 +
 boards/arm/hexiwear_kw40z/Kconfig.defconfig        |    65 +
 boards/arm/hexiwear_kw40z/Makefile                 |    10 +
 boards/arm/hexiwear_kw40z/board.h                  |    12 +
 boards/arm/hexiwear_kw40z/doc/hexiwear_kw40z.rst   |   203 +
 boards/arm/hexiwear_kw40z/hexiwear_kw40z_defconfig |    12 +
 boards/arm/hexiwear_kw40z/pinmux.c                 |    37 +
 boards/arm/nrf52840_pca10056/Kconfig.board         |     2 +-
 .../nrf52840_pca10056/nrf52840_pca10056_defconfig  |     2 +-
 boards/arm/nrf52_blenano2/Kconfig.board            |     2 +-
 boards/arm/nrf52_blenano2/nrf52_blenano2_defconfig |     2 +-
 boards/arm/nrf52_pca10040/Kconfig.board            |     2 +-
 boards/arm/nrf52_pca10040/nrf52_pca10040_defconfig |     2 +-
 boards/arm/nucleo_f103rb/nucleo_f103rb_defconfig   |     4 +-
 boards/arm/nucleo_f334r8/nucleo_f334r8_defconfig   |     4 +-
 boards/arm/nucleo_f401re/nucleo_f401re_defconfig   |     4 +-
 boards/arm/nucleo_f411re/nucleo_f411re_defconfig   |     4 +-
 boards/arm/nucleo_l476rg/nucleo_l476rg_defconfig   |     1 -
 .../arm/olimexino_stm32/olimexino_stm32_defconfig  |     1 -
 .../arm/sam_e70_xplained/doc/sam_e70_xplained.rst  |     4 +
 boards/arm/stm3210c_eval/stm3210c_eval_defconfig   |     4 +-
 boards/arm/stm32373c_eval/stm32373c_eval_defconfig |     4 +-
 boards/arm/stm32_mini_a15/stm32_mini_a15_defconfig |     4 +-
 drivers/gpio/gpio_mcux.c                           |    52 +
 drivers/i2c/Kconfig                                |     7 +
 drivers/i2c/Makefile                               |     1 +
 drivers/i2c/i2c_stm32lx.c                          |     2 +-
 drivers/i2c/twihs_sam.c                            |   391 +
 drivers/pinmux/stm32/pinmux_stm32l4x.h             |     1 +
 drivers/serial/Kconfig                             |     2 +
 drivers/serial/Kconfig.mcux                        |    72 -
 drivers/serial/Kconfig.mcux_lpuart                 |    12 -
 drivers/serial/Kconfig.nrf5                        |     2 +
 drivers/serial/Kconfig.stm32                       |    50 -
 drivers/serial/Kconfig.uart_sam                    |   176 +
 drivers/serial/Makefile                            |     1 +
 drivers/serial/uart_sam.c                          |   274 +
 drivers/serial/uart_stm32.c                        |    41 -
 dts/arm/96b_carbon.dts                             |    29 +
 dts/arm/96b_carbon.fixup                           |    19 +
 dts/arm/Makefile                                   |    10 +
 dts/arm/hexiwear_kw40z.dts                         |    28 +
 dts/arm/hexiwear_kw40z.fixup                       |     4 +
 dts/arm/nordic/mem.h                               |    31 +
 dts/arm/nordic/nrf52832.dtsi                       |    31 +
 dts/arm/nucleo_f103rb.dts                          |    24 +
 dts/arm/nucleo_f103rb.fixup                        |    13 +
 dts/arm/nucleo_f334r8.dts                          |    24 +
 dts/arm/nucleo_f334r8.fixup                        |    13 +
 dts/arm/nucleo_f401re.dts                          |    29 +
 dts/arm/nucleo_f401re.fixup                        |    19 +
 dts/arm/nucleo_f411re.dts                          |    29 +
 dts/arm/nucleo_f411re.fixup                        |    19 +
 dts/arm/nucleo_l476rg.dts                          |    20 +-
 dts/arm/nxp/nxp_kw40z.dtsi                         |   185 +
 dts/arm/olimexino_stm32.dts                        |    19 +-
 dts/arm/st/mem.h                                   |    43 +
 dts/arm/st/stm32f103Xb.dtsi                        |    48 +
 dts/arm/st/stm32f103Xe.dtsi                        |    48 +
 dts/arm/st/stm32f103xb.dtsi                        |    97 -
 dts/arm/st/stm32f107.dtsi                          |    45 +
 dts/arm/st/stm32f334.dtsi                          |    45 +
 dts/arm/st/stm32f373.dtsi                          |    45 +
 dts/arm/st/stm32f4.dtsi                            |    45 +
 dts/arm/st/stm32f401.dtsi                          |     7 +
 dts/arm/st/stm32f411.dtsi                          |     7 +
 dts/arm/st/stm32l476.dtsi                          |    82 +-
 dts/arm/stm3210c_eval.dts                          |    24 +
 dts/arm/stm3210c_eval.fixup                        |    13 +
 dts/arm/stm32373c_eval.dts                         |    24 +
 dts/arm/stm32373c_eval.fixup                       |    13 +
 dts/arm/stm32_mini_a15.dts                         |    24 +
 dts/arm/stm32_mini_a15.fixup                       |    13 +
 dts/arm/yaml/nordic,nrf-uart.yaml                  |    30 +
 dts/arm/yaml/nordic,nrf-uarte.yaml                 |    30 +
 ext/hal/nxp/mcux/README                            |     8 +-
 ext/hal/nxp/mcux/devices/MKW20Z4/MKW20Z4.h         | 13769 +++++++++++
 .../nxp/mcux/devices/MKW20Z4/MKW20Z4_features.h    |  1350 ++
 .../mcux/devices/MKW20Z4/fsl_device_registers.h    |    56 +
 ext/hal/nxp/mcux/devices/MKW20Z4/system_MKW20Z4.c  |   296 +
 ext/hal/nxp/mcux/devices/MKW20Z4/system_MKW20Z4.h  |   294 +
 ext/hal/nxp/mcux/devices/MKW30Z4/MKW30Z4.h         | 13769 +++++++++++
 .../nxp/mcux/devices/MKW30Z4/MKW30Z4_features.h    |  1350 ++
 .../mcux/devices/MKW30Z4/fsl_device_registers.h    |    56 +
 ext/hal/nxp/mcux/devices/MKW30Z4/system_MKW30Z4.c  |   296 +
 ext/hal/nxp/mcux/devices/MKW30Z4/system_MKW30Z4.h  |   294 +
 ext/hal/nxp/mcux/devices/MKW40Z4/MKW40Z4.h         | 13769 +++++++++++
 ext/hal/nxp/mcux/devices/MKW40Z4/MKW40Z4.svd       | 23338 +++++++++++++++++++
 .../nxp/mcux/devices/MKW40Z4/MKW40Z4_features.h    |  1350 ++
 ext/hal/nxp/mcux/devices/MKW40Z4/fsl_clock.c       |     1 +
 ext/hal/nxp/mcux/devices/MKW40Z4/fsl_clock.h       |     1 +
 .../mcux/devices/MKW40Z4/fsl_device_registers.h    |    56 +
 ext/hal/nxp/mcux/devices/MKW40Z4/system_MKW40Z4.c  |   296 +
 ext/hal/nxp/mcux/devices/MKW40Z4/system_MKW40Z4.h  |   294 +
 samples/nfc/nfc_hello/prj.conf                     |     1 +
 scripts/sanity_chk/arches/arm.ini                  |     3 +-
 132 files changed, 73563 insertions(+), 536 deletions(-)
 rename arch/arm/soc/nordic_nrf5/nrf52/{Kconfig.defconfig.nrf52832 => Kconfig.defconfig.nrf52832_QFAA} (75%)
 rename arch/arm/soc/nordic_nrf5/nrf52/{Kconfig.defconfig.nrf52840 => Kconfig.defconfig.nrf52840_QIAA} (79%)
 create mode 100644 arch/arm/soc/nxp_kinetis/kl2x/Kconfig.defconfig.mkl25z4
 create mode 100644 arch/arm/soc/nxp_kinetis/kl2x/Kconfig.defconfig.series
 create mode 100644 arch/arm/soc/nxp_kinetis/kl2x/Kconfig.series
 create mode 100644 arch/arm/soc/nxp_kinetis/kl2x/Kconfig.soc
 create mode 100644 arch/arm/soc/nxp_kinetis/kl2x/Makefile
 create mode 100644 arch/arm/soc/nxp_kinetis/kl2x/linker.ld
 create mode 100644 arch/arm/soc/nxp_kinetis/kl2x/soc.c
 create mode 100644 arch/arm/soc/nxp_kinetis/kl2x/soc.h
 create mode 100644 arch/arm/soc/nxp_kinetis/kwx/Kconfig.defconfig.mkw40z4
 create mode 100644 boards/arm/hexiwear_kw40z/Kconfig.board
 create mode 100644 boards/arm/hexiwear_kw40z/Kconfig.defconfig
 create mode 100644 boards/arm/hexiwear_kw40z/Makefile
 create mode 100644 boards/arm/hexiwear_kw40z/board.h
 create mode 100644 boards/arm/hexiwear_kw40z/doc/hexiwear_kw40z.rst
 create mode 100644 boards/arm/hexiwear_kw40z/hexiwear_kw40z_defconfig
 create mode 100644 boards/arm/hexiwear_kw40z/pinmux.c
 create mode 100644 drivers/i2c/twihs_sam.c
 create mode 100644 drivers/serial/Kconfig.uart_sam
 create mode 100644 drivers/serial/uart_sam.c
 create mode 100644 dts/arm/96b_carbon.dts
 create mode 100644 dts/arm/96b_carbon.fixup
 create mode 100644 dts/arm/hexiwear_kw40z.dts
 create mode 100644 dts/arm/hexiwear_kw40z.fixup
 create mode 100644 dts/arm/nordic/mem.h
 create mode 100644 dts/arm/nordic/nrf52832.dtsi
 create mode 100644 dts/arm/nucleo_f103rb.dts
 create mode 100644 dts/arm/nucleo_f103rb.fixup
 create mode 100644 dts/arm/nucleo_f334r8.dts
 create mode 100644 dts/arm/nucleo_f334r8.fixup
 create mode 100644 dts/arm/nucleo_f401re.dts
 create mode 100644 dts/arm/nucleo_f401re.fixup
 create mode 100644 dts/arm/nucleo_f411re.dts
 create mode 100644 dts/arm/nucleo_f411re.fixup
 create mode 100644 dts/arm/nxp/nxp_kw40z.dtsi
 create mode 100644 dts/arm/st/mem.h
 create mode 100644 dts/arm/st/stm32f103Xb.dtsi
 create mode 100644 dts/arm/st/stm32f103Xe.dtsi
 delete mode 100644 dts/arm/st/stm32f103xb.dtsi
 create mode 100644 dts/arm/st/stm32f107.dtsi
 create mode 100644 dts/arm/st/stm32f334.dtsi
 create mode 100644 dts/arm/st/stm32f373.dtsi
 create mode 100644 dts/arm/st/stm32f4.dtsi
 create mode 100644 dts/arm/st/stm32f401.dtsi
 create mode 100644 dts/arm/st/stm32f411.dtsi
 create mode 100644 dts/arm/stm3210c_eval.dts
 create mode 100644 dts/arm/stm3210c_eval.fixup
 create mode 100644 dts/arm/stm32373c_eval.dts
 create mode 100644 dts/arm/stm32373c_eval.fixup
 create mode 100644 dts/arm/stm32_mini_a15.dts
 create mode 100644 dts/arm/stm32_mini_a15.fixup
 create mode 100644 dts/arm/yaml/nordic,nrf-uart.yaml
 create mode 100644 dts/arm/yaml/nordic,nrf-uarte.yaml
 create mode 100644 ext/hal/nxp/mcux/devices/MKW20Z4/MKW20Z4.h
 create mode 100644 ext/hal/nxp/mcux/devices/MKW20Z4/MKW20Z4_features.h
 create mode 100644 ext/hal/nxp/mcux/devices/MKW20Z4/fsl_device_registers.h
 create mode 100644 ext/hal/nxp/mcux/devices/MKW20Z4/system_MKW20Z4.c
 create mode 100644 ext/hal/nxp/mcux/devices/MKW20Z4/system_MKW20Z4.h
 create mode 100644 ext/hal/nxp/mcux/devices/MKW30Z4/MKW30Z4.h
 create mode 100644 ext/hal/nxp/mcux/devices/MKW30Z4/MKW30Z4_features.h
 create mode 100644 ext/hal/nxp/mcux/devices/MKW30Z4/fsl_device_registers.h
 create mode 100644 ext/hal/nxp/mcux/devices/MKW30Z4/system_MKW30Z4.c
 create mode 100644 ext/hal/nxp/mcux/devices/MKW30Z4/system_MKW30Z4.h
 create mode 100644 ext/hal/nxp/mcux/devices/MKW40Z4/MKW40Z4.h
 create mode 100644 ext/hal/nxp/mcux/devices/MKW40Z4/MKW40Z4.svd
 create mode 100644 ext/hal/nxp/mcux/devices/MKW40Z4/MKW40Z4_features.h
 create mode 100644 ext/hal/nxp/mcux/devices/MKW40Z4/fsl_clock.c
 create mode 100644 ext/hal/nxp/mcux/devices/MKW40Z4/fsl_clock.h
 create mode 100644 ext/hal/nxp/mcux/devices/MKW40Z4/fsl_device_registers.h
 create mode 100644 ext/hal/nxp/mcux/devices/MKW40Z4/system_MKW40Z4.c
 create mode 100644 ext/hal/nxp/mcux/devices/MKW40Z4/system_MKW40Z4.h

Change-Id: I8d3fcd3ff46b33f5cc622b65e09da513b483fc3b
Signed-off-by: default avatarKumar Gala <kumar.gala@linaro.org>
parents 4ada031f 929c1592
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment