soc: qcom: msm_bus: relocate msm bus into soc/qcom

Change-Id: I80780a6f8d80143c697847abf82579c8e8194090
Signed-off-by: David Dai <daidavid1@codeaurora.org>

31 files changed, 26 insertions, 26 deletions

diff --git a/drivers/platform/msm/Kconfig b/drivers/platform/msm/Kconfig
index 4f04e788f85b..3d75cb1882d1 100644
--- a/drivers/platform/msm/Kconfig
+++ b/drivers/platform/msm/Kconfig
@@ -44,29 +44,4 @@ config GPIO_USB_DETECT
 	  USB driver of VBUS presence/disconnection using the power_supply
 	  framework.
 
-config QCOM_BUS_SCALING
-	bool "Bus scaling driver"
-	help
-		This option enables bus scaling on MSM devices.  Bus scaling
-		allows devices to request the clocks be set to rates sufficient
-		for the active devices needs without keeping the clocks at max
-		frequency when a slower speed is sufficient.
-
-config QCOM_BUSPM_DEV
-	tristate "MSM Bus Performance Monitor Kernel Module"
-	depends on QCOM_BUS_SCALING
-	help
-	  This kernel module is used to mmap() hardware registers for the
-	  performance monitors, counters, etc. The module can also be used to
-	  allocate physical memory which is used by bus performance hardware to
-	  dump performance data
-
-config QCOM_BUS_TOPOLOGY_ADHOC
-	bool "ad-hoc bus scaling topology"
-	help
-		This option enables a driver that can handle adhoc bus topologies.
-		Adhoc bus topology driver allows one to many connections and maintains
-		directionality of connections by explicitly listing device connections
-		thus avoiding illegal routes.
-
 endmenu
diff --git a/drivers/platform/msm/Makefile b/drivers/platform/msm/Makefile
index d26832a5b396..a4ad7e9e558a 100644
--- a/drivers/platform/msm/Makefile
+++ b/drivers/platform/msm/Makefile
@@ -6,4 +6,3 @@ obj-$(CONFIG_QPNP_REVID) += qpnp-revid.o
 obj-$(CONFIG_QPNP_COINCELL) += qpnp-coincell.o
 obj-$(CONFIG_QPNP_HAPTIC) += qpnp-haptic.o
 obj-$(CONFIG_GPIO_USB_DETECT) += gpio-usbdetect.o
-obj-$(CONFIG_QCOM_BUS_SCALING) += msm_bus/
diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig
index e25a37e7ecd5..f345cfd96886 100644
--- a/drivers/soc/qcom/Kconfig
+++ b/drivers/soc/qcom/Kconfig
@@ -100,6 +100,31 @@ config MSM_RPM_SMD
 	  the MSM_MPM config that programs the MPM module to monitor interrupts
 	  during sleep modes.
 
+config QCOM_BUS_SCALING
+	bool "Bus scaling driver"
+	help
+	  This option enables bus scaling on MSM devices.  Bus scaling
+	  allows devices to request the clocks be set to rates sufficient
+	  for the active devices needs without keeping the clocks at max
+	  frequency when a slower speed is sufficient.
+
+config QCOM_BUSPM_DEV
+	tristate "MSM Bus Performance Monitor Kernel Module"
+	depends on QCOM_BUS_SCALING
+	help
+	  This kernel module is used to mmap() hardware registers for the
+	  performance monitors, counters, etc. The module can also be used to
+	  allocate physical memory which is used by bus performance hardware to
+	  dump performance data
+
+config QCOM_BUS_TOPOLOGY_ADHOC
+	bool "ad-hoc bus scaling topology"
+	help
+	  This option enables a driver that can handle adhoc bus topologies.
+	  Adhoc bus topology driver allows one to many connections and maintains
+	  directionality of connections by explicitly listing device connections
+	  thus avoiding illegal routes.
+
 config QCOM_GSBI
         tristate "QCOM General Serial Bus Interface"
         depends on ARCH_QCOM
diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile
index 03e670118ecb..d921b50b3607 100644
--- a/drivers/soc/qcom/Makefile
+++ b/drivers/soc/qcom/Makefile
@@ -28,3 +28,4 @@ obj-$(CONFIG_QCOM_MEMORY_DUMP_V2) += memory_dump_v2.o
 obj-$(CONFIG_QCOM_WATCHDOG_V2) += watchdog_v2.o
 obj-$(CONFIG_TRACER_PKT)	+=	tracer_pkt.o
 obj-$(CONFIG_SOC_BUS)  +=      socinfo.o
+obj-$(CONFIG_QCOM_BUS_SCALING) += msm_bus/
diff --git a/drivers/platform/msm/msm_bus/Makefile b/drivers/soc/qcom/msm_bus/Makefile
index 9cd50e05657f..9cd50e05657f 100644
--- a/drivers/platform/msm/msm_bus/Makefile
+++ b/drivers/soc/qcom/msm_bus/Makefile
diff --git a/drivers/platform/msm/msm_bus/msm-buspm-dev.c b/drivers/soc/qcom/msm_bus/msm-buspm-dev.c
index 4d9262b676b7..4d9262b676b7 100644
--- a/drivers/platform/msm/msm_bus/msm-buspm-dev.c
+++ b/drivers/soc/qcom/msm_bus/msm-buspm-dev.c
diff --git a/drivers/platform/msm/msm_bus/msm_bus_adhoc.h b/drivers/soc/qcom/msm_bus/msm_bus_adhoc.h
index 7440e0473e8b..7440e0473e8b 100644
--- a/drivers/platform/msm/msm_bus/msm_bus_adhoc.h
+++ b/drivers/soc/qcom/msm_bus/msm_bus_adhoc.h
diff --git a/drivers/platform/msm/msm_bus/msm_bus_arb.c b/drivers/soc/qcom/msm_bus/msm_bus_arb.c
index 0a92e182210d..0a92e182210d 100644
--- a/drivers/platform/msm/msm_bus/msm_bus_arb.c
+++ b/drivers/soc/qcom/msm_bus/msm_bus_arb.c
diff --git a/drivers/platform/msm/msm_bus/msm_bus_arb_adhoc.c b/drivers/soc/qcom/msm_bus/msm_bus_arb_adhoc.c
index b35bb3def995..b35bb3def995 100644
--- a/drivers/platform/msm/msm_bus/msm_bus_arb_adhoc.c
+++ b/drivers/soc/qcom/msm_bus/msm_bus_arb_adhoc.c
diff --git a/drivers/platform/msm/msm_bus/msm_bus_bimc.c b/drivers/soc/qcom/msm_bus/msm_bus_bimc.c
index 88a94713dee2..88a94713dee2 100644
--- a/drivers/platform/msm/msm_bus/msm_bus_bimc.c
+++ b/drivers/soc/qcom/msm_bus/msm_bus_bimc.c
diff --git a/drivers/platform/msm/msm_bus/msm_bus_bimc.h b/drivers/soc/qcom/msm_bus/msm_bus_bimc.h
index 12c8325e9863..12c8325e9863 100644
--- a/drivers/platform/msm/msm_bus/msm_bus_bimc.h
+++ b/drivers/soc/qcom/msm_bus/msm_bus_bimc.h
diff --git a/drivers/platform/msm/msm_bus/msm_bus_bimc_adhoc.c b/drivers/soc/qcom/msm_bus/msm_bus_bimc_adhoc.c
index 816224cf9163..816224cf9163 100644
--- a/drivers/platform/msm/msm_bus/msm_bus_bimc_adhoc.c
+++ b/drivers/soc/qcom/msm_bus/msm_bus_bimc_adhoc.c
diff --git a/drivers/platform/msm/msm_bus/msm_bus_board_8974.c b/drivers/soc/qcom/msm_bus/msm_bus_board_8974.c
index 1fec726de87e..1fec726de87e 100644
--- a/drivers/platform/msm/msm_bus/msm_bus_board_8974.c
+++ b/drivers/soc/qcom/msm_bus/msm_bus_board_8974.c
diff --git a/drivers/platform/msm/msm_bus/msm_bus_client_api.c b/drivers/soc/qcom/msm_bus/msm_bus_client_api.c
index 9e065429dd4b..9e065429dd4b 100644
--- a/drivers/platform/msm/msm_bus/msm_bus_client_api.c
+++ b/drivers/soc/qcom/msm_bus/msm_bus_client_api.c
diff --git a/drivers/platform/msm/msm_bus/msm_bus_config.c b/drivers/soc/qcom/msm_bus/msm_bus_config.c
index ea7fe7f2e1dd..ea7fe7f2e1dd 100644
--- a/drivers/platform/msm/msm_bus/msm_bus_config.c
+++ b/drivers/soc/qcom/msm_bus/msm_bus_config.c
diff --git a/drivers/platform/msm/msm_bus/msm_bus_core.c b/drivers/soc/qcom/msm_bus/msm_bus_core.c
index 0939aa98616f..0939aa98616f 100644
--- a/drivers/platform/msm/msm_bus/msm_bus_core.c
+++ b/drivers/soc/qcom/msm_bus/msm_bus_core.c
diff --git a/drivers/platform/msm/msm_bus/msm_bus_core.h b/drivers/soc/qcom/msm_bus/msm_bus_core.h
index 254181b450e5..254181b450e5 100644
--- a/drivers/platform/msm/msm_bus/msm_bus_core.h
+++ b/drivers/soc/qcom/msm_bus/msm_bus_core.h
diff --git a/drivers/platform/msm/msm_bus/msm_bus_dbg.c b/drivers/soc/qcom/msm_bus/msm_bus_dbg.c
index 88ba18653cf5..88ba18653cf5 100644
--- a/drivers/platform/msm/msm_bus/msm_bus_dbg.c
+++ b/drivers/soc/qcom/msm_bus/msm_bus_dbg.c
diff --git a/drivers/platform/msm/msm_bus/msm_bus_dbg_voter.c b/drivers/soc/qcom/msm_bus/msm_bus_dbg_voter.c
index e4c8f1f446df..e4c8f1f446df 100644
--- a/drivers/platform/msm/msm_bus/msm_bus_dbg_voter.c
+++ b/drivers/soc/qcom/msm_bus/msm_bus_dbg_voter.c
diff --git a/drivers/platform/msm/msm_bus/msm_bus_fabric.c b/drivers/soc/qcom/msm_bus/msm_bus_fabric.c
index 236dc85bac3c..236dc85bac3c 100644
--- a/drivers/platform/msm/msm_bus/msm_bus_fabric.c
+++ b/drivers/soc/qcom/msm_bus/msm_bus_fabric.c
diff --git a/drivers/platform/msm/msm_bus/msm_bus_fabric_adhoc.c b/drivers/soc/qcom/msm_bus/msm_bus_fabric_adhoc.c
index 91e2db6d21e8..91e2db6d21e8 100644
--- a/drivers/platform/msm/msm_bus/msm_bus_fabric_adhoc.c
+++ b/drivers/soc/qcom/msm_bus/msm_bus_fabric_adhoc.c
diff --git a/drivers/platform/msm/msm_bus/msm_bus_id.c b/drivers/soc/qcom/msm_bus/msm_bus_id.c
index 9ab24e68463b..9ab24e68463b 100644
--- a/drivers/platform/msm/msm_bus/msm_bus_id.c
+++ b/drivers/soc/qcom/msm_bus/msm_bus_id.c
diff --git a/drivers/platform/msm/msm_bus/msm_bus_noc.c b/drivers/soc/qcom/msm_bus/msm_bus_noc.c
index 7f7c74202412..7f7c74202412 100644
--- a/drivers/platform/msm/msm_bus/msm_bus_noc.c
+++ b/drivers/soc/qcom/msm_bus/msm_bus_noc.c
diff --git a/drivers/platform/msm/msm_bus/msm_bus_noc.h b/drivers/soc/qcom/msm_bus/msm_bus_noc.h
index 3995f63e79e3..3995f63e79e3 100644
--- a/drivers/platform/msm/msm_bus/msm_bus_noc.h
+++ b/drivers/soc/qcom/msm_bus/msm_bus_noc.h
diff --git a/drivers/platform/msm/msm_bus/msm_bus_noc_adhoc.c b/drivers/soc/qcom/msm_bus/msm_bus_noc_adhoc.c
index a47faaccf16d..a47faaccf16d 100644
--- a/drivers/platform/msm/msm_bus/msm_bus_noc_adhoc.c
+++ b/drivers/soc/qcom/msm_bus/msm_bus_noc_adhoc.c
diff --git a/drivers/platform/msm/msm_bus/msm_bus_of.c b/drivers/soc/qcom/msm_bus/msm_bus_of.c
index b625a6c8336e..b625a6c8336e 100644
--- a/drivers/platform/msm/msm_bus/msm_bus_of.c
+++ b/drivers/soc/qcom/msm_bus/msm_bus_of.c
diff --git a/drivers/platform/msm/msm_bus/msm_bus_of_adhoc.c b/drivers/soc/qcom/msm_bus/msm_bus_of_adhoc.c
index 620da95d1be4..620da95d1be4 100644
--- a/drivers/platform/msm/msm_bus/msm_bus_of_adhoc.c
+++ b/drivers/soc/qcom/msm_bus/msm_bus_of_adhoc.c
diff --git a/drivers/platform/msm/msm_bus/msm_bus_rpm_smd.c b/drivers/soc/qcom/msm_bus/msm_bus_rpm_smd.c
index 964f2c1e2e75..964f2c1e2e75 100644
--- a/drivers/platform/msm/msm_bus/msm_bus_rpm_smd.c
+++ b/drivers/soc/qcom/msm_bus/msm_bus_rpm_smd.c
diff --git a/drivers/platform/msm/msm_bus/msm_bus_rules.c b/drivers/soc/qcom/msm_bus/msm_bus_rules.c
index 297ba9fc3c35..297ba9fc3c35 100644
--- a/drivers/platform/msm/msm_bus/msm_bus_rules.c
+++ b/drivers/soc/qcom/msm_bus/msm_bus_rules.c
diff --git a/drivers/platform/msm/msm_bus/msm_buspm_coresight.c b/drivers/soc/qcom/msm_bus/msm_buspm_coresight.c
index cf8216c860df..cf8216c860df 100644
--- a/drivers/platform/msm/msm_bus/msm_buspm_coresight.c
+++ b/drivers/soc/qcom/msm_bus/msm_buspm_coresight.c
diff --git a/drivers/platform/msm/msm_bus/msm_buspm_coresight_adhoc.c b/drivers/soc/qcom/msm_bus/msm_buspm_coresight_adhoc.c
index 9aec82463f6c..9aec82463f6c 100644
--- a/drivers/platform/msm/msm_bus/msm_buspm_coresight_adhoc.c
+++ b/drivers/soc/qcom/msm_bus/msm_buspm_coresight_adhoc.c