Moved, renamed, and deleted files

The original directory structure was scattered and unorganized.
Changes are basically to make it look like kernel structure.

2 files changed, 126 insertions, 0 deletions

diff --git a/drivers/mtk_wcn_combo/drv_fm/Makefile b/drivers/mtk_wcn_combo/drv_fm/Makefile
new file mode 100755
index 00000000..e9fec34a
--- /dev/null
+++ b/drivers/mtk_wcn_combo/drv_fm/Makefile
@@ -0,0 +1,82 @@
+# Makefile generated by Mediatek
+# fm support
+
+#6628 FM driver
+ifeq ($(CONFIG_MTK_COMBO_CHIP_MT6628), y)
+$(warning MT6628_FM)
+ccflags-y += -I$(src)/inc \
+			 -I$(src)/mt6628/inc \
+			 -I$(src)/../common/include \
+			 -I$(src)/../common/linux/include \
+			 -I$(src)/cust/mt6628 \
+			 -I$(src)/private/inc \
+			 -DMT6628_FM
+
+obj-$(CONFIG_MTK_COMBO_FM) += mtk_fm_drv.o
+	mtk_fm_drv-objs	+=  core/fm_module.o \
+						core/fm_main.o \
+						core/fm_config.o \
+						core/fm_rds_parser.o \
+						core/fm_patch.o \
+						core/fm_utils.o \
+						core/fm_link.o \
+						core/fm_eint.o  \
+						mt6628/pub/mt6628_fm_lib.o \
+						mt6628/pub/mt6628_fm_rds.o \
+						mt6628/pub/mt6628_fm_cmd.o \
+						mt6628/pub/mt6628_fm_config.o
+$(warning $(mtk_fm_drv-objs))
+endif
+
+# MT6620 FM driver
+ifeq ($(CONFIG_MTK_COMBO_CHIP_MT6620), y)
+$(warning MT6620_FM)
+	ccflags-y += -I$(src)/inc \
+					-I$(src)/mt6620/inc \
+					-I$(src)/../common/include \
+					-I$(src)/../common/linux/include \
+					-I$(src)/cust/mt6620 \
+					-I$(src)/private/inc \
+					-DMT6620_FM
+
+	obj-$(CONFIG_MTK_COMBO_FM) += mtk_fm_drv.o
+	mtk_fm_drv-objs	+= core/fm_module.o \
+					core/fm_main.o \
+					core/fm_config.o \
+					core/fm_rds_parser.o \
+					core/fm_patch.o \
+					core/fm_utils.o \
+					core/fm_link.o \
+					core/fm_eint.o \
+					mt6620/pub/mt6620_fm_lib.o \
+					mt6620/pub/mt6620_fm_rds.o \
+					mt6620/pub/mt6620_fm_cmd.o \
+					mt6620/pub/mt6620_fm_config.o
+$(warning $(mtk_fm_drv-objs))
+endif
+
+# MT6626 FM driver 
+ifeq ($(CONFIG_MTK_COMBO_CHIP_MT6626), y)
+FM_CHIP = mt6626
+FM_CHIP_PATH = $(FM_CHIP)/pub/$(FM_CHIP)
+ccflags-y := -I$(src)/inc \
+				-I$(src)/$(FM_CHIP)/inc \
+				-I$(src)/cust/$(FM_CHIP) \
+				-I$(src)/private/inc \
+				-DMT6626_FM
+
+obj-$(CONFIG_MTK_COMBO_FM) += mtk_fm_drv.o
+mtk_fm_drv-objs	:= core/fm_module.o \
+				core/fm_main.o \
+				core/fm_config.o \
+				core/fm_patch.o \
+				core/fm_rds_parser.o \
+				core/fm_utils.o \
+				core/fm_link.o \
+				$(FM_CHIP_PATH)_fm_lib.o \
+				$(FM_CHIP_PATH)_fm_rds.o \
+				$(FM_CHIP_PATH)_fm_link.o \
+				$(FM_CHIP_PATH)_fm_eint.o
+endif
+
+
diff --git a/drivers/mtk_wcn_combo/drv_fm/private/Makefile b/drivers/mtk_wcn_combo/drv_fm/private/Makefile
new file mode 100755
index 00000000..1a8e7960
--- /dev/null
+++ b/drivers/mtk_wcn_combo/drv_fm/private/Makefile
@@ -0,0 +1,44 @@
+# Makefile generated by Mediatek
+
+# fm support
+ifeq ($(MTK_FM_SUPPORT), yes)
+
+ifeq ($(CUSTOM_KERNEL_FM), mt6628)
+PRIV_CHIP = mt6628
+PRIV_SRC_PATH = private/src/$(PRIV_CHIP)
+PRIV_CONFIG = $(CONFIG_MTK_FM)
+
+ccflags-y :=  \
+				-I$(src)/inc \
+				-I$(src)/$(PRIV_SRC_PATH) \
+				-I$(src)/../inc \
+				-I$(src)/../cust/$(PRIV_CHIP) \
+				-I$(src)/../../combo/common_mt6628/include \
+				-I$(src)/../../combo/common_mt6628/linux/include 
+
+
+obj-$(PRIV_CONFIG) += mtk_fm_priv.o
+mtk_fm_priv-objs	:= \
+				src/$(PRIV_CHIP)/$(PRIV_CHIP)_fm_private.o 
+endif
+
+ifeq ($(CUSTOM_KERNEL_FM), mt6620)
+PRIV_CHIP = mt6620
+PRIV_SRC_PATH = private/src/$(PRIV_CHIP)
+PRIV_CONFIG = $(CONFIG_MTK_FM)
+
+ccflags-y :=  \
+				-I$(src)/inc \
+				-I$(src)/$(PRIV_SRC_PATH) \
+				-I$(src)/../inc \
+				-I$(src)/../cust/$(PRIV_CHIP) \
+				-I$(src)/../../combo/common/include \
+				-I$(src)/../../combo/common/linux/include 
+
+
+obj-$(PRIV_CONFIG) += mtk_fm_priv.o
+mtk_fm_priv-objs	:= \
+				src/$(PRIV_CHIP)/$(PRIV_CHIP)_fm_private.o 
+endif
+
+endif