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

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

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

 into char-misc-linus

Georgi writes:

interconnect fixes for v5.11

This contains a few fixes for iMX and Qualcomm drivers and also
updates my email to my kernel.org address.

- qcom: Fix rpmh link failures when compile test is enabled
- imx: Add a missing of_node_put after of_device_is_available
- imx: Remove a useless test
- imx8mq: Use icc_sync_state

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

* tag 'icc-5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc:
  MAINTAINERS: Update Georgi's email address
  interconnect: imx8mq: Use icc_sync_state
  interconnect: imx: Remove a useless test
  interconnect: imx: Add a missing of_node_put after of_device_is_available
  interconnect: qcom: fix rpmh link failures
parents c9c48bb7 4b1a60a1

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -9240,7 +9240,7 @@ F: tools/testing/selftests/sgx/* 
K:	\bSGX_









INTERCONNECT API









M:	Georgi Djakov <georgi.djakov@linaro.org>









M:	Georgi Djakov <djakov@kernel.org>









L:	linux-pm@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/interconnect/
































drivers/interconnect/imx/imx.c



+2
−1






























Original line number
Diff line number
Diff line







@@ -96,9 +96,10 @@ static int imx_icc_node_init_qos(struct icc_provider *provider,







			return -ENODEV;









		}









		/* Allow scaling to be disabled on a per-node basis */









		if (!dn || !of_device_is_available(dn)) {









		if (!of_device_is_available(dn)) {









			dev_warn(dev, "Missing property %s, skip scaling %s\n",









				 adj->phandle_name, node->name);









			of_node_put(dn);









			return 0;









		}










































drivers/interconnect/imx/imx8mq.c



+2
−0






























Original line number
Diff line number
Diff line







@@ -7,6 +7,7 @@

















#include <linux/module.h>









#include <linux/platform_device.h>









#include <linux/interconnect-provider.h>









#include <dt-bindings/interconnect/imx8mq.h>



















#include "imx.h"








@@ -94,6 +95,7 @@ static struct platform_driver imx8mq_icc_driver = {







	.remove = imx8mq_icc_remove,









	.driver = {









		.name = "imx8mq-interconnect",









		.sync_state = icc_sync_state,









	},









};










































drivers/interconnect/qcom/Kconfig



+15
−8






























Original line number
Diff line number
Diff line







@@ -42,13 +42,23 @@ config INTERCONNECT_QCOM_QCS404







	  This is a driver for the Qualcomm Network-on-Chip on qcs404-based









	  platforms.



















config INTERCONNECT_QCOM_RPMH_POSSIBLE









	tristate









	default INTERCONNECT_QCOM









	depends on QCOM_RPMH || (COMPILE_TEST && !QCOM_RPMH)









	depends on QCOM_COMMAND_DB || (COMPILE_TEST && !QCOM_COMMAND_DB)









	depends on OF || COMPILE_TEST









	help









	  Compile-testing RPMH drivers is possible on other platforms,









	  but in order to avoid link failures, drivers must not be built-in









	  when QCOM_RPMH or QCOM_COMMAND_DB are loadable modules



















config INTERCONNECT_QCOM_RPMH









	tristate



















config INTERCONNECT_QCOM_SC7180









	tristate "Qualcomm SC7180 interconnect driver"









	depends on INTERCONNECT_QCOM









	depends on (QCOM_RPMH && QCOM_COMMAND_DB && OF) || COMPILE_TEST









	depends on INTERCONNECT_QCOM_RPMH_POSSIBLE









	select INTERCONNECT_QCOM_RPMH









	select INTERCONNECT_QCOM_BCM_VOTER









	help








@@ -57,8 +67,7 @@ config INTERCONNECT_QCOM_SC7180

















config INTERCONNECT_QCOM_SDM845









	tristate "Qualcomm SDM845 interconnect driver"









	depends on INTERCONNECT_QCOM









	depends on (QCOM_RPMH && QCOM_COMMAND_DB && OF) || COMPILE_TEST









	depends on INTERCONNECT_QCOM_RPMH_POSSIBLE









	select INTERCONNECT_QCOM_RPMH









	select INTERCONNECT_QCOM_BCM_VOTER









	help








@@ -67,8 +76,7 @@ config INTERCONNECT_QCOM_SDM845

















config INTERCONNECT_QCOM_SM8150









	tristate "Qualcomm SM8150 interconnect driver"









	depends on INTERCONNECT_QCOM









	depends on (QCOM_RPMH && QCOM_COMMAND_DB && OF) || COMPILE_TEST









	depends on INTERCONNECT_QCOM_RPMH_POSSIBLE









	select INTERCONNECT_QCOM_RPMH









	select INTERCONNECT_QCOM_BCM_VOTER









	help








@@ -77,8 +85,7 @@ config INTERCONNECT_QCOM_SM8150

















config INTERCONNECT_QCOM_SM8250









	tristate "Qualcomm SM8250 interconnect driver"









	depends on INTERCONNECT_QCOM









	depends on (QCOM_RPMH && QCOM_COMMAND_DB && OF) || COMPILE_TEST









	depends on INTERCONNECT_QCOM_RPMH_POSSIBLE









	select INTERCONNECT_QCOM_RPMH









	select INTERCONNECT_QCOM_BCM_VOTER









	help