mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-04 16:15:11 +00:00
Code Issues Releases Wiki Activity

interconnect fixes for v5.11

Browse source 
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: Georgi Djakov <georgi.djakov@linaro.org>
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJf9HPeAAoJEIDQzArG2BZjDjcP/jYTueIpTrkd4V2vBduePG4b
 uDP/WW7pTr7r2Upz78S6KyfV8YHrvWYmjWD1Yho/sV1sRqDcwVNa3cdpfxDT7be/
 ly8JB0cGcaSVztntI0QzFu3WhYL+h4DcZ9+kvsw6Ky5wUNX3tc0Oxu/QRO1Dn4/V
 sZNQ1i/GVV8W2wk1azB1fSjyVSZgF+Rh+cZHumyg/stSEj/+Kg7jqfoWJnPrz2Z4
 jorw6tDLW41Pg1n6FIFZn8lW1UUSOfCMWD6W/1hYyclsFcE2SZ8pHnVuVlcSCYSu
 MDvvktRQV4PGVFeUyyNfnd5kYyJUNeWDAoxAtr0VlxG2gZUg7v/rZ7QxEUMELCkK
 WC4JqHg4JqDsJZhKZw7XVBjCiXlz3Xg3HZwf62uC2TSr23VRUcIyXJoAoNSpKySs
 aEwra2I97kUgFEBBzfD46O/aG1AcdmcxrDrlqnoObRg3C6zFoO/rQpDgm8bs4Wqx
 LKJ7TSxyPfJfM/vHKo0EMLgjn0oXfADGkpmRV58MZXaywhyDit8EfB/iq439CP9o
 jiLWSBZC0/5cP2iuY5BQMWSlBbgbT6KT+E3boy8vekFqxdFKwY1rtWLPW02XRqtl
 FnCpwDbY0n0yJnFefvFcPWvCyuY/4HeZ0vJdymUAnpZRjAVc9hGbeAadn1Ns977O
 +t0usriv/b8oYRVn696j
 =0DvY
 -----END PGP SIGNATURE-----

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: Georgi 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
This commit is contained in:
Greg Kroah-Hartman 2021-01-06 18:54:21 +01:00
commit b8b54ad96e
4 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MAINTAINERS
View file

@ -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/

3
drivers/interconnect/imx/imx.c
View file

@ -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;
}

2
drivers/interconnect/imx/imx8mq.c
View file

@ -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,
},
};

23
drivers/interconnect/qcom/Kconfig
View file

@ -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