Move include/nuttx/timer.h, rtc.h and watchdog.h to include/nuttx/timers/.

arch/arm/src/c5471/c5471_watchdog.c

@@ -48,7 +48,7 @@
 
 #include <nuttx/fs/fs.h>
 #include <nuttx/irq.h>
-#include <nuttx/watchdog.h>
+#include <nuttx/timers/watchog.h>
 #include <arch/watchdog.h>
 
 #include "chip.h"

arch/arm/src/sam34/sam_rtt.c

@@ -46,7 +46,7 @@
 #include <stdint.h>
 #include <errno.h>
 #include <debug.h>
-#include <nuttx/timer.h>
+#include <nuttx/timers/timer.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"

arch/arm/src/sam34/sam_tc.c

@@ -47,7 +47,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/timer.h>
+#include <nuttx/timers/timer.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"

arch/arm/src/sam34/sam_wdt.c

@@ -47,7 +47,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/watchdog.h>
+#include <nuttx/timers/watchog.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"

arch/arm/src/sama5/sam_wdt.c

@@ -44,7 +44,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/watchdog.h>
+#include <nuttx/timers/watchog.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"

arch/arm/src/stm32/stm32_iwdg.c

@@ -45,7 +45,7 @@
 #include <debug.h>
 
 #include <nuttx/clock.h>
-#include <nuttx/watchdog.h>
+#include <nuttx/timers/watchog.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"

arch/arm/src/stm32/stm32_rtc.h

@@ -189,7 +189,7 @@ int stm32_rtc_cancelalarm(void);
  * Description:
  *   Instantiate the RTC lower half driver for the STM32.  General usage:
  *
- *     #include <nuttx/rtc.h>
+ *     #include <nuttx/timers/rtc.h>
  *     #include "stm32_rtc.h>
  *
  *     struct rtc_lowerhalf_s *lower;

arch/arm/src/stm32/stm32_rtc_lowerhalf.c

@@ -44,7 +44,7 @@
 #include <errno.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/rtc.h>
+#include <nuttx/timers/rtc.h>
 
 #include "chip.h"
 #include "stm32_rtc.h"
@@ -265,7 +265,7 @@ static int stm32_settime(FAR struct rtc_lowerhalf_s *lower,
  * Description:
  *   Instantiate the RTC lower half driver for the STM32.  General usage:
  *
- *     #include <nuttx/rtc.h>
+ *     #include <nuttx/timers/rtc.h>
  *     #include "stm32_rtc.h>
  *
  *     struct rtc_lowerhalf_s *lower;

arch/arm/src/stm32/stm32_rtcounter.c

@@ -61,7 +61,7 @@
 #include <nuttx/config.h>
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
-#include <nuttx/rtc.h>
+#include <nuttx/timers/rtc.h>
 #include <arch/board/board.h>
 
 #include <stdlib.h>

arch/arm/src/stm32/stm32_wwdg.c

@@ -44,7 +44,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/watchdog.h>
+#include <nuttx/timers/watchog.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"

arch/arm/src/tiva/tiva_timerlow32.c

@@ -48,7 +48,7 @@
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/timer.h>
+#include <nuttx/timers/timer.h>
 
 #include <arch/board/board.h>