Commit 9fb3b4ca authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'icc-5.11-rc1' of... 

Merge tag 'icc-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc

 into char-misc-next

Georgi writes:

interconnect changes for 5.11

Here are the interconnect changes for the 5.10-rc1 merge window
consisting of new driver and a cleanup.

Driver changes:
- New driver for Samsung Exynos SoCs
- Misc cleanups

Signed-off-by: default avatarGeorgi Djakov <georgi.djakov@linaro.org>

* tag 'icc-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc:
  MAINTAINERS: Add entry for Samsung interconnect drivers
  interconnect: Add generic interconnect driver for Exynos SoCs
  interconnect: qcom: Simplify the vcd compare function
parents 907d4ad5 2a211904

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -15373,6 +15373,14 @@ L: linux-fbdev@vger.kernel.org 
S:	Maintained

F:	drivers/video/fbdev/s3c-fb.c









SAMSUNG INTERCONNECT DRIVERS









M:	Sylwester Nawrocki <s.nawrocki@samsung.com>









M:	Artur Świgoń <a.swigon@samsung.com>









L:	linux-pm@vger.kernel.org









L:	linux-samsung-soc@vger.kernel.org









S:	Supported









F:	drivers/interconnect/samsung/

















SAMSUNG LAPTOP DRIVER









M:	Corentin Chary <corentin.chary@gmail.com>









L:	platform-driver-x86@vger.kernel.org
































drivers/interconnect/Kconfig



+1
−0






























Original line number
Diff line number
Diff line







@@ -13,5 +13,6 @@ if INTERCONNECT

















source "drivers/interconnect/imx/Kconfig"









source "drivers/interconnect/qcom/Kconfig"









source "drivers/interconnect/samsung/Kconfig"



















endif
























drivers/interconnect/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -6,3 +6,4 @@ icc-core-objs				:= core.o bulk.o







obj-$(CONFIG_INTERCONNECT)		+= icc-core.o









obj-$(CONFIG_INTERCONNECT_IMX)		+= imx/









obj-$(CONFIG_INTERCONNECT_QCOM)		+= qcom/









obj-$(CONFIG_INTERCONNECT_SAMSUNG)	+= samsung/
























drivers/interconnect/qcom/bcm-voter.c



+4
−11






























Original line number
Diff line number
Diff line







@@ -41,17 +41,10 @@ struct bcm_voter {

















static int cmp_vcd(void *priv, struct list_head *a, struct list_head *b)









{









	const struct qcom_icc_bcm *bcm_a =









			list_entry(a, struct qcom_icc_bcm, list);









	const struct qcom_icc_bcm *bcm_b =









			list_entry(b, struct qcom_icc_bcm, list);



















	if (bcm_a->aux_data.vcd < bcm_b->aux_data.vcd)









		return -1;









	else if (bcm_a->aux_data.vcd == bcm_b->aux_data.vcd)









		return 0;









	else









		return 1;









	const struct qcom_icc_bcm *bcm_a = list_entry(a, struct qcom_icc_bcm, list);









	const struct qcom_icc_bcm *bcm_b = list_entry(b, struct qcom_icc_bcm, list);



















	return bcm_a->aux_data.vcd - bcm_b->aux_data.vcd;









}



















static u64 bcm_div(u64 num, u32 base)
































drivers/interconnect/samsung/Kconfig
0 → 100644



+13
−0






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0-only









config INTERCONNECT_SAMSUNG









	bool "Samsung SoC interconnect drivers"









	depends on ARCH_EXYNOS || COMPILE_TEST









	help









	  Interconnect drivers for Samsung SoCs.



















config INTERCONNECT_EXYNOS









	tristate "Exynos generic interconnect driver"









	depends on INTERCONNECT_SAMSUNG









	default y if ARCH_EXYNOS









	help









	  Generic interconnect driver for Exynos SoCs.