Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bae14da1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: msm_bus: Reorg bus scaling directory"

parents 57285d97 db4fe1da

drivers/platform/msm/msm_bus/Makefile

+9 −7
Original line number Diff line number Diff line 
#

# Makefile for msm-bus driver specific files

#

obj-y += msm_bus_bimc.o msm_bus_noc.o msm_bus_core.o msm_bus_client_api.o

obj-y +=  msm_bus_core.o msm_bus_client_api.o

obj-$(CONFIG_OF) += msm_bus_of.o

obj-$(CONFIG_MSM_RPM_SMD) += msm_bus_rpm_smd.o



ifdef CONFIG_BUS_TOPOLOGY_ADHOC

	obj-y += msm_bus_fabric_adhoc.o msm_bus_arb_adhoc.o msm_bus_rules.o

	obj-y += msm_bus_fabric_adhoc.o msm_bus_arb_adhoc.o msm_bus_rules.o \

		msm_bus_bimc_adhoc.o msm_bus_noc_adhoc.o

	obj-$(CONFIG_OF) += msm_bus_of_adhoc.o

	obj-$(CONFIG_DEBUG_BUS_VOTER) += msm_bus_dbg_voter.o

	obj-$(CONFIG_CORESIGHT) +=  msm_buspm_coresight_adhoc.o

else

	obj-y += msm_bus_fabric.o msm_bus_config.o msm_bus_arb.o

	obj-y += msm_bus_fabric.o msm_bus_config.o msm_bus_arb.o \

		msm_bus_bimc.o msm_bus_noc.o

	obj-$(CONFIG_CORESIGHT) +=  msm_buspm_coresight.o

endif



ifdef CONFIG_ARCH_MSM8974

	obj-$(CONFIG_ARCH_MSM8974) += msm_bus_board_8974.o

else

	obj-y += msm_bus_id.o

endif

endif





obj-$(CONFIG_DEBUG_FS) += msm_bus_dbg.o

obj-$(CONFIG_MSM_BUSPM_DEV) += msm-buspm-dev.o

drivers/platform/msm/msm_bus/msm_bus_bimc.c

+1 −959

File changed.

Preview size limit exceeded, changes collapsed.

drivers/platform/msm/msm_bus/msm_bus_bimc_adhoc.c

0 → 100644
+718 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/platform/msm/msm_bus/msm_bus_core.h

+6 −2
Original line number Diff line number Diff line
@@ -291,8 +291,6 @@ int msm_bus_get_num_fab(void); 
int msm_bus_hw_fab_init(struct msm_bus_fabric_registration *pdata,

	struct msm_bus_hw_algorithm *hw_algo);

void msm_bus_board_init(struct msm_bus_fabric_registration *pdata);

void msm_bus_board_set_nfab(struct msm_bus_fabric_registration *pdata,

	int nfab);

#if defined(CONFIG_MSM_RPM_SMD)

int msm_bus_rpm_hw_init(struct msm_bus_fabric_registration *pdata,

	struct msm_bus_hw_algorithm *hw_algo);
@@ -394,7 +392,13 @@ void msm_bus_of_get_nfab(struct platform_device *pdev, 
		struct msm_bus_fabric_registration *pdata);

struct msm_bus_fabric_registration

	*msm_bus_of_get_fab_data(struct platform_device *pdev);

static inline void msm_bus_board_set_nfab(struct msm_bus_fabric_registration

		*pdata,	int nfab)

{

}

#else

void msm_bus_board_set_nfab(struct msm_bus_fabric_registration *pdata,

	int nfab);

static inline void msm_bus_of_get_nfab(struct platform_device *pdev,

		struct msm_bus_fabric_registration *pdata)

{

drivers/platform/msm/msm_bus/msm_bus_noc.c

+0 −268

File changed.

Preview size limit exceeded, changes collapsed.