Bluetooth: Move controller code to subsys/bluetooth

Move controller code from drivers/controller to
subsys/bluetooth/controller.

Change-Id: I73f675188485aa3267507bad7647796e593a3da0
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

MAINTAINERS

@@ -185,7 +185,7 @@ BLUETOOTH CONTROLLER
 M:	Vinayak Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
 M:	Carles Cufi <carles.cufi@nordicsemi.no>
 S:	Supported
-F:	drivers/bluetooth/controller/
+F:	subsys/bluetooth/controller/
 
 CC3200 SDK
 M:      Gil Pitney <gil.pitney@linaro.org>

drivers/bluetooth/Kconfig

@@ -28,8 +28,6 @@ source "drivers/bluetooth/hci/Kconfig"
 
 source "drivers/bluetooth/nble/Kconfig"
 
-source "drivers/bluetooth/controller/Kconfig"
-
 config BLUETOOTH_NRF51_PM
 	bool "nRF51 Power Management [EXPERIMENTAL]"
 	depends on BLUETOOTH_H4 || NBLE

drivers/bluetooth/Makefile

@@ -1,4 +1,3 @@
 obj-y += hci/
 obj-$(CONFIG_NBLE) += nble/
 obj-$(CONFIG_BLUETOOTH_NRF51_PM) += nrf51_pm.o
-obj-$(CONFIG_BLUETOOTH_CONTROLLER) += controller/

subsys/bluetooth/Kconfig

@@ -16,3 +16,5 @@
 #
 
 source "subsys/bluetooth/host/Kconfig"
+
+source "subsys/bluetooth/controller/Kconfig"

subsys/bluetooth/Makefile

@@ -1 +1,2 @@
 obj-$(CONFIG_BLUETOOTH) += host/
+obj-$(CONFIG_BLUETOOTH_CONTROLLER) += controller/

subsys/bluetooth/controller/Makefile

@@ -1,6 +1,6 @@
-ccflags-$(CONFIG_BLUETOOTH_CONTROLLER) += -I$(srctree)/drivers/bluetooth/controller/util
-ccflags-$(CONFIG_BLUETOOTH_CONTROLLER) += -I$(srctree)/drivers/bluetooth/controller/hal
-ccflags-$(CONFIG_BLUETOOTH_CONTROLLER) += -I$(srctree)/drivers/bluetooth/controller/ll
+ccflags-$(CONFIG_BLUETOOTH_CONTROLLER) += -I$(srctree)/subsys/bluetooth/controller/util
+ccflags-$(CONFIG_BLUETOOTH_CONTROLLER) += -I$(srctree)/subsys/bluetooth/controller/hal
+ccflags-$(CONFIG_BLUETOOTH_CONTROLLER) += -I$(srctree)/subsys/bluetooth/controller/ll
 obj-$(CONFIG_BLUETOOTH_CONTROLLER) += util/mem.o
 obj-$(CONFIG_BLUETOOTH_CONTROLLER) += util/memq.o
 obj-$(CONFIG_BLUETOOTH_CONTROLLER) += util/work.o

subsys/bluetooth/controller/hci/hci_driver.c

@@ -32,7 +32,7 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/log.h>
 #include <bluetooth/hci.h>
-#include <bluetooth/hci_driver.h>
+#include <drivers/bluetooth/hci_driver.h>
 
 #include "util/defines.h"
 #include "util/work.h"

subsys/bluetooth/controller/ll/ctrl_internal.h

@@ -236,4 +236,3 @@ struct pdu_data_q_tx {
 #define LL_MEM_TOTAL (LL_MEM_CONN + LL_MEM_RXQ + (LL_MEM_TXQ * 2) + \
 		LL_MEM_RX_POOL_SZ + \
 		LL_MEM_RX_LINK_POOL + LL_MEM_TX_CTRL_POOL + LL_MEM_TX_DATA_POOL)
-