From 3f624153e76e9c38cd3686769a7f675c4c3343ea Mon Sep 17 00:00:00 2001
From: Aaron Lindsay <aaron@aclindsay.com>
Date: Wed, 3 Oct 2012 23:30:19 -0400
Subject: [PATCH] devices -> drivers

---
 Makefile                                         | 2 +-
 {devices => drivers}/bcm2835_mailbox.c           | 0
 {devices => drivers}/bcm2835_videocore.c         | 2 +-
 {devices => drivers}/kernel.mk                   | 2 +-
 {devices => drivers}/pi_mini_uart.c              | 0
 {devices => drivers}/pl011.c                     | 0
 {devices => drivers}/pl110.c                     | 0
 {devices => drivers}/pl111.c                     | 0
 include/{devices => drivers}/bcm2835_mailbox.h   | 0
 include/{devices => drivers}/bcm2835_videocore.h | 0
 include/{devices => drivers}/pi_mini_uart.h      | 0
 include/{devices => drivers}/pl011.h             | 0
 include/{devices => drivers}/pl110.h             | 0
 include/{devices => drivers}/pl111.h             | 0
 kernel/start_kernel.c                            | 8 ++++----
 15 files changed, 7 insertions(+), 7 deletions(-)
 rename {devices => drivers}/bcm2835_mailbox.c (100%)
 rename {devices => drivers}/bcm2835_videocore.c (98%)
 rename {devices => drivers}/kernel.mk (94%)
 rename {devices => drivers}/pi_mini_uart.c (100%)
 rename {devices => drivers}/pl011.c (100%)
 rename {devices => drivers}/pl110.c (100%)
 rename {devices => drivers}/pl111.c (100%)
 rename include/{devices => drivers}/bcm2835_mailbox.h (100%)
 rename include/{devices => drivers}/bcm2835_videocore.h (100%)
 rename include/{devices => drivers}/pi_mini_uart.h (100%)
 rename include/{devices => drivers}/pl011.h (100%)
 rename include/{devices => drivers}/pl110.h (100%)
 rename include/{devices => drivers}/pl111.h (100%)

diff --git a/Makefile b/Makefile
index 6e8a350..24c3964 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ KOBJS :=
 
 # Initialize sub-directory Makefile inclusion
 BASEDIR = $(shell pwd)
-SUBDIRS := boot kernel devices
+SUBDIRS := boot kernel drivers
 ifneq (,$(SUBDIRS))
 	include $(patsubst %,%/kernel.mk,$(SUBDIRS))
 endif
diff --git a/devices/bcm2835_mailbox.c b/drivers/bcm2835_mailbox.c
similarity index 100%
rename from devices/bcm2835_mailbox.c
rename to drivers/bcm2835_mailbox.c
diff --git a/devices/bcm2835_videocore.c b/drivers/bcm2835_videocore.c
similarity index 98%
rename from devices/bcm2835_videocore.c
rename to drivers/bcm2835_videocore.c
index 2847137..8cbda3c 100644
--- a/devices/bcm2835_videocore.c
+++ b/drivers/bcm2835_videocore.c
@@ -22,7 +22,7 @@
 #include <framebuffer.h>
 #include <kmalloc.h>
 #include <print.h>
-#include <devices/bcm2835_mailbox.h>
+#include <drivers/bcm2835_mailbox.h>
 
 struct bcm2835_config {
 	uint32 width;
diff --git a/devices/kernel.mk b/drivers/kernel.mk
similarity index 94%
rename from devices/kernel.mk
rename to drivers/kernel.mk
index beaafe2..f57b01f 100644
--- a/devices/kernel.mk
+++ b/drivers/kernel.mk
@@ -1,4 +1,4 @@
-DIRNAME := devices
+DIRNAME := drivers
 SUBDIRS :=
 
 include $(BASEDIR)/header.mk
diff --git a/devices/pi_mini_uart.c b/drivers/pi_mini_uart.c
similarity index 100%
rename from devices/pi_mini_uart.c
rename to drivers/pi_mini_uart.c
diff --git a/devices/pl011.c b/drivers/pl011.c
similarity index 100%
rename from devices/pl011.c
rename to drivers/pl011.c
diff --git a/devices/pl110.c b/drivers/pl110.c
similarity index 100%
rename from devices/pl110.c
rename to drivers/pl110.c
diff --git a/devices/pl111.c b/drivers/pl111.c
similarity index 100%
rename from devices/pl111.c
rename to drivers/pl111.c
diff --git a/include/devices/bcm2835_mailbox.h b/include/drivers/bcm2835_mailbox.h
similarity index 100%
rename from include/devices/bcm2835_mailbox.h
rename to include/drivers/bcm2835_mailbox.h
diff --git a/include/devices/bcm2835_videocore.h b/include/drivers/bcm2835_videocore.h
similarity index 100%
rename from include/devices/bcm2835_videocore.h
rename to include/drivers/bcm2835_videocore.h
diff --git a/include/devices/pi_mini_uart.h b/include/drivers/pi_mini_uart.h
similarity index 100%
rename from include/devices/pi_mini_uart.h
rename to include/drivers/pi_mini_uart.h
diff --git a/include/devices/pl011.h b/include/drivers/pl011.h
similarity index 100%
rename from include/devices/pl011.h
rename to include/drivers/pl011.h
diff --git a/include/devices/pl110.h b/include/drivers/pl110.h
similarity index 100%
rename from include/devices/pl110.h
rename to include/drivers/pl110.h
diff --git a/include/devices/pl111.h b/include/drivers/pl111.h
similarity index 100%
rename from include/devices/pl111.h
rename to include/drivers/pl111.h
diff --git a/kernel/start_kernel.c b/kernel/start_kernel.c
index eab9d11..1c48d4b 100644
--- a/kernel/start_kernel.c
+++ b/kernel/start_kernel.c
@@ -27,13 +27,13 @@
 #include <console.h>
 
 #ifdef CONFIG_VEXPRESS_A9
-#include <devices/pl011.h>
-#include <devices/pl111.h>
+#include <drivers/pl011.h>
+#include <drivers/pl111.h>
 #endif
 
 #ifdef CONFIG_RPI
-#include <devices/pi_mini_uart.h>
-#include <devices/bcm2835_videocore.h>
+#include <drivers/pi_mini_uart.h>
+#include <drivers/bcm2835_videocore.h>
 #endif
 
 struct fb myfb;