zephyrproject-rtos · MaureenHelm · Oct 18, 2019 · Sep 7, 2019 · Sep 7, 2019 · Sep 7, 2019
diff --git a/boards/arm/96b_wistrio/96b_wistrio.dts b/boards/arm/96b_wistrio/96b_wistrio.dts
@@ -5,7 +5,7 @@
  */
 
 /dts-v1/;
-#include <st/l1/stm32l151Xb.dtsi>
+#include <st/l1/stm32l151Xb-a.dtsi>
 
 / {
 	model = "RAKWireless 96boards WisTrio board";
@@ -58,3 +58,11 @@
 		label = "LIS3DH";
 	};
 };
+
+&spi1 {
+	status = "okay";
+};
+
+&rtc {
+	status = "okay";
+};
diff --git a/boards/arm/96b_wistrio/96b_wistrio_defconfig b/boards/arm/96b_wistrio/96b_wistrio_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SOC_SERIES_STM32L1X=y
-CONFIG_SOC_STM32L151XB=y
+CONFIG_SOC_STM32L151XBA=y
 # 32MHz system clock
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=32000000
 

diff --git a/boards/arm/96b_wistrio/Kconfig.board b/boards/arm/96b_wistrio/Kconfig.board
@@ -7,4 +7,4 @@
 
 config BOARD_96B_WISTRIO
 	bool "96boards WisTrio Development Board"
-	depends on SOC_STM32L151XB
+	depends on SOC_STM32L151XBA
diff --git a/boards/arm/96b_wistrio/doc/96b_wistrio.rst b/boards/arm/96b_wistrio/doc/96b_wistrio.rst
@@ -7,7 +7,7 @@ Overview
 ********
 
 96Boards WisTrio LoRa Tracker board is based on the RAK Wireless RAK5205
-chipset integrating SX1276 LoRaWAN Modem, STM32L151CB MCU and GPS module.
+chipset integrating SX1276 LoRaWAN Modem, STM32L151CB-A MCU and GPS module.
 Zephyr applications use the 96b_wistrio configuration to run on these
 boards.
 
@@ -65,6 +65,10 @@ features:
 +-----------+------------+-------------------------------------+
 | I2C       | on-chip    | i2c                                 |
 +-----------+------------+-------------------------------------+
+| SPI       | on-chip    | spi                                 |
++-----------+------------+-------------------------------------+
+| RTC       | on-chip    | rtc                                 |
++-----------+------------+-------------------------------------+
 
 The default board configuration can be found in the defconfig file:
 
@@ -103,6 +107,17 @@ The default I2C mapping is:
 I2C1 also goes to the J22 connector and can be used to attach external
 sensors.
 
+SPI
+---
+
+96Boards WisTrio board has 1 SPI connected to on-chip LoRa Radio.
+The default SPI mapping is:
+
+- SPI1_SCLK  : PA5
+- SPI1_MISO  : PA6
+- SPI1_MOSI  : PA7
+- SPI1_NSS   : PB0
+
 Programming and Debugging
 *************************
 

diff --git a/drivers/counter/counter_ll_stm32_rtc.c b/drivers/counter/counter_ll_stm32_rtc.c
@@ -30,7 +30,8 @@ LOG_MODULE_REGISTER(counter_rtc_stm32, CONFIG_COUNTER_LOG_LEVEL);
 	|| defined(CONFIG_SOC_SERIES_STM32F3X)	\
 	|| defined(CONFIG_SOC_SERIES_STM32F7X) \
 	|| defined(CONFIG_SOC_SERIES_STM32WBX) \
-	|| defined(CONFIG_SOC_SERIES_STM32G4X)
+	|| defined(CONFIG_SOC_SERIES_STM32G4X) \
+	|| defined(CONFIG_SOC_SERIES_STM32L1X)
 #define RTC_EXTI_LINE	LL_EXTI_LINE_17
 #endif
 

diff --git a/dts/arm/st/l1/stm32l1.dtsi b/dts/arm/st/l1/stm32l1.dtsi
@@ -28,6 +28,16 @@
 	};
 
 	soc {
+		rtc: rtc@40002800 {
+			compatible = "st,stm32-rtc";
+			reg = <0x40002800 0x400>;
+			interrupts = <41 0>;
+			clocks = <&rcc STM32_CLOCK_BUS_APB1 0x10000000>;
+			prescaler = <32768>;
+			status = "disabled";
+			label = "RTC_0";
+		};
+
 		usart2: serial@40004400 {
 			compatible = "st,stm32-usart", "st,stm32-uart";
 			reg = <0x40004400 0x400>;

diff --git a/dts/arm/st/l1/stm32l151Xb-a.dtsi b/dts/arm/st/l1/stm32l151Xb-a.dtsi
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2019 Linaro Limited
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <mem.h>
+#include <st/l1/stm32l151.dtsi>
+
+/ {
+	sram0: memory@20000000 {
+		reg = <0x20000000 DT_SIZE_K(32)>;
+	};
+
+	soc {
+		flash-controller@40023c00 {
+			flash0: flash@8000000 {
+				reg = <0x08000000 DT_SIZE_K(128)>;
+			};
+		};
+	};
+};
diff --git a/soc/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l151xba b/soc/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l151xba
@@ -0,0 +1,31 @@
+# Kconfig - ST Microelectronics STM32L151XB-A MCU
+#
+# Copyright (c) 2019 Linaro Ltd.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+if SOC_STM32L151XBA
+
+config SOC
+	string
+	default "stm32l151xba"
+
+config NUM_IRQS
+	int
+	default 45
+
+if GPIO_STM32
+
+config GPIO_STM32_PORTD
+	default y
+
+config GPIO_STM32_PORTE
+	default y
+
+config GPIO_STM32_PORTH
+	default y
+
+endif # GPIO_STM32
+
+endif # SOC_STM32L151XBA
diff --git a/soc/arm/st_stm32/stm32l1/Kconfig.soc b/soc/arm/st_stm32/stm32l1/Kconfig.soc
@@ -15,4 +15,7 @@ config SOC_STM32L151X8A
 config SOC_STM32L151XB
 	bool "STM32L151XB"
 
+config SOC_STM32L151XBA
+	bool "STM32L151XBA"
+
 endchoice
diff --git a/soc/arm/st_stm32/stm32l1/dts_fixup.h b/soc/arm/st_stm32/stm32l1/dts_fixup.h
@@ -130,4 +130,10 @@
 #define DT_WWDT_0_CLOCK_BITS		DT_INST_0_ST_STM32_WINDOW_WATCHDOG_CLOCK_BITS
 #define DT_WWDT_0_CLOCK_BUS		DT_INST_0_ST_STM32_WINDOW_WATCHDOG_CLOCK_BUS
 
+#define DT_RTC_0_BASE_ADDRESS           DT_ST_STM32_RTC_40002800_BASE_ADDRESS
+#define DT_RTC_0_IRQ_PRI                DT_ST_STM32_RTC_40002800_IRQ_0_PRIORITY
+#define DT_RTC_0_IRQ                    DT_ST_STM32_RTC_40002800_IRQ_0
+#define DT_RTC_0_NAME                   DT_ST_STM32_RTC_40002800_LABEL
+#define DT_RTC_0_CLOCK_BITS             DT_ST_STM32_RTC_40002800_CLOCK_BITS
+#define DT_RTC_0_CLOCK_BUS              DT_ST_STM32_RTC_40002800_CLOCK_BUS
 /* End of SoC Level DTS fixup file */
diff --git a/soc/arm/st_stm32/stm32l1/soc.h b/soc/arm/st_stm32/stm32l1/soc.h
@@ -51,6 +51,12 @@
 #include <stm32l1xx_ll_i2c.h>
 #endif
 
+#if defined(CONFIG_COUNTER_RTC_STM32)
+#include <stm32l1xx_ll_rtc.h>
+#include <stm32l1xx_ll_exti.h>
+#include <stm32l1xx_ll_pwr.h>
+#endif
+
 #ifdef CONFIG_SPI_STM32
 #include <stm32l1xx_ll_spi.h>
 #endif