From fb2082e6aeeffdaec6c5b7408832fb620b549ce0 Mon Sep 17 00:00:00 2001
From: ksschwabe <ksschwabe@gmail.com>
Date: Wed, 26 Aug 2015 11:03:32 +0200
Subject: [PATCH] Introduce new variable for TONE_ALARM_CLOCK_POWER_REG to
 account for timers being on different APBs

---
 src/drivers/stm32/tone_alarm/tone_alarm.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/drivers/stm32/tone_alarm/tone_alarm.cpp b/src/drivers/stm32/tone_alarm/tone_alarm.cpp
index beffbdd8b6..023ce426cc 100644
--- a/src/drivers/stm32/tone_alarm/tone_alarm.cpp
+++ b/src/drivers/stm32/tone_alarm/tone_alarm.cpp
@@ -121,6 +121,7 @@
 #if   TONE_ALARM_TIMER == 2
 # define TONE_ALARM_BASE		STM32_TIM2_BASE
 # define TONE_ALARM_CLOCK		STM32_APB1_TIM2_CLKIN
+# define TONE_ALARM_CLOCK_POWER_REG   STM32_RCC_APB1ENR
 # define TONE_ALARM_CLOCK_ENABLE	RCC_APB1ENR_TIM2EN
 # ifdef CONFIG_STM32_TIM2
 #  error Must not set CONFIG_STM32_TIM2 when TONE_ALARM_TIMER is 2
@@ -128,6 +129,7 @@
 #elif TONE_ALARM_TIMER == 3
 # define TONE_ALARM_BASE		STM32_TIM3_BASE
 # define TONE_ALARM_CLOCK		STM32_APB1_TIM3_CLKIN
+# define TONE_ALARM_CLOCK_POWER_REG   STM32_RCC_APB1ENR
 # define TONE_ALARM_CLOCK_ENABLE	RCC_APB1ENR_TIM3EN
 # ifdef CONFIG_STM32_TIM3
 #  error Must not set CONFIG_STM32_TIM3 when TONE_ALARM_TIMER is 3
@@ -135,6 +137,7 @@
 #elif TONE_ALARM_TIMER == 4
 # define TONE_ALARM_BASE		STM32_TIM4_BASE
 # define TONE_ALARM_CLOCK		STM32_APB1_TIM4_CLKIN
+# define TONE_ALARM_CLOCK_POWER_REG   STM32_RCC_APB1ENR
 # define TONE_ALARM_CLOCK_ENABLE	RCC_APB1ENR_TIM4EN
 # ifdef CONFIG_STM32_TIM4
 #  error Must not set CONFIG_STM32_TIM4 when TONE_ALARM_TIMER is 4
@@ -142,6 +145,7 @@
 #elif TONE_ALARM_TIMER == 5
 # define TONE_ALARM_BASE		STM32_TIM5_BASE
 # define TONE_ALARM_CLOCK		STM32_APB1_TIM5_CLKIN
+# define TONE_ALARM_CLOCK_POWER_REG   STM32_RCC_APB1ENR
 # define TONE_ALARM_CLOCK_ENABLE	RCC_APB1ENR_TIM5EN
 # ifdef CONFIG_STM32_TIM5
 #  error Must not set CONFIG_STM32_TIM5 when TONE_ALARM_TIMER is 5
@@ -149,6 +153,7 @@
 #elif TONE_ALARM_TIMER == 9
 # define TONE_ALARM_BASE		STM32_TIM9_BASE
 # define TONE_ALARM_CLOCK		STM32_APB2_TIM9_CLKIN
+# define TONE_ALARM_CLOCK_POWER_REG   STM32_RCC_APB2ENR
 # define TONE_ALARM_CLOCK_ENABLE	RCC_APB2ENR_TIM9EN
 # ifdef CONFIG_STM32_TIM9
 #  error Must not set CONFIG_STM32_TIM9 when TONE_ALARM_TIMER is 9
@@ -156,6 +161,7 @@
 #elif TONE_ALARM_TIMER == 10
 # define TONE_ALARM_BASE		STM32_TIM10_BASE
 # define TONE_ALARM_CLOCK		STM32_APB2_TIM10_CLKIN
+# define TONE_ALARM_CLOCK_POWER_REG   STM32_RCC_APB2ENR
 # define TONE_ALARM_CLOCK_ENABLE	RCC_APB2ENR_TIM10EN
 # ifdef CONFIG_STM32_TIM10
 #  error Must not set CONFIG_STM32_TIM10 when TONE_ALARM_TIMER is 10
@@ -163,6 +169,7 @@
 #elif TONE_ALARM_TIMER == 11
 # define TONE_ALARM_BASE		STM32_TIM11_BASE
 # define TONE_ALARM_CLOCK		STM32_APB2_TIM11_CLKIN
+# define TONE_ALARM_CLOCK_POWER_REG   STM32_RCC_APB2ENR
 # define TONE_ALARM_CLOCK_ENABLE	RCC_APB2ENR_TIM11EN
 # ifdef CONFIG_STM32_TIM11
 #  error Must not set CONFIG_STM32_TIM11 when TONE_ALARM_TIMER is 11
@@ -376,7 +383,7 @@ ToneAlarm::init()
 	stm32_configgpio(GPIO_TONE_ALARM_IDLE);
 
 	/* clock/power on our timer */
-	modifyreg32(STM32_RCC_APB1ENR, 0, TONE_ALARM_CLOCK_ENABLE);
+    modifyreg32(TONE_ALARM_CLOCK_POWER_REG, 0, TONE_ALARM_CLOCK_ENABLE);
 
 	/* initialise the timer */
 	rCR1 = 0;