tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Greg Kroah-Hartman b8b54ad9 c9c48bb7

+20 -10
unified split
+1 -1
MAINTAINERS
··· 9240 K: \bSGX_ 9241 9242 INTERCONNECT API 9243 - M: Georgi Djakov <georgi.djakov@linaro.org> 9244 L: linux-pm@vger.kernel.org 9245 S: Maintained 9246 F: Documentation/devicetree/bindings/interconnect/
··· 9240 K: \bSGX_ 9241 9242 INTERCONNECT API 9243 + M: Georgi Djakov <djakov@kernel.org> 9244 L: linux-pm@vger.kernel.org 9245 S: Maintained 9246 F: Documentation/devicetree/bindings/interconnect/
+2 -1
drivers/interconnect/imx/imx.c
··· 96 return -ENODEV; 97 } 98 /* Allow scaling to be disabled on a per-node basis */ 99 - if (!dn || !of_device_is_available(dn)) { 100 dev_warn(dev, "Missing property %s, skip scaling %s\n", 101 adj->phandle_name, node->name); 102 return 0; 103 } 104
··· 96 return -ENODEV; 97 } 98 /* Allow scaling to be disabled on a per-node basis */ 99 + if (!of_device_is_available(dn)) { 100 dev_warn(dev, "Missing property %s, skip scaling %s\n", 101 adj->phandle_name, node->name); 102 + of_node_put(dn); 103 return 0; 104 } 105
+2
drivers/interconnect/imx/imx8mq.c
··· 7 8 #include <linux/module.h> 9 #include <linux/platform_device.h> 10 #include <dt-bindings/interconnect/imx8mq.h> 11 12 #include "imx.h" ··· 95 .remove = imx8mq_icc_remove, 96 .driver = { 97 .name = "imx8mq-interconnect", 98 }, 99 }; 100
··· 7 8 #include <linux/module.h> 9 #include <linux/platform_device.h> 10 + #include <linux/interconnect-provider.h> 11 #include <dt-bindings/interconnect/imx8mq.h> 12 13 #include "imx.h" ··· 94 .remove = imx8mq_icc_remove, 95 .driver = { 96 .name = "imx8mq-interconnect", 97 + .sync_state = icc_sync_state, 98 }, 99 }; 100
+15 -8
drivers/interconnect/qcom/Kconfig
··· 42 This is a driver for the Qualcomm Network-on-Chip on qcs404-based 43 platforms. 44 45 config INTERCONNECT_QCOM_RPMH 46 tristate 47 48 config INTERCONNECT_QCOM_SC7180 49 tristate "Qualcomm SC7180 interconnect driver" 50 - depends on INTERCONNECT_QCOM 51 - depends on (QCOM_RPMH && QCOM_COMMAND_DB && OF) || COMPILE_TEST 52 select INTERCONNECT_QCOM_RPMH 53 select INTERCONNECT_QCOM_BCM_VOTER 54 help ··· 67 68 config INTERCONNECT_QCOM_SDM845 69 tristate "Qualcomm SDM845 interconnect driver" 70 - depends on INTERCONNECT_QCOM 71 - depends on (QCOM_RPMH && QCOM_COMMAND_DB && OF) || COMPILE_TEST 72 select INTERCONNECT_QCOM_RPMH 73 select INTERCONNECT_QCOM_BCM_VOTER 74 help ··· 76 77 config INTERCONNECT_QCOM_SM8150 78 tristate "Qualcomm SM8150 interconnect driver" 79 - depends on INTERCONNECT_QCOM 80 - depends on (QCOM_RPMH && QCOM_COMMAND_DB && OF) || COMPILE_TEST 81 select INTERCONNECT_QCOM_RPMH 82 select INTERCONNECT_QCOM_BCM_VOTER 83 help ··· 85 86 config INTERCONNECT_QCOM_SM8250 87 tristate "Qualcomm SM8250 interconnect driver" 88 - depends on INTERCONNECT_QCOM 89 - depends on (QCOM_RPMH && QCOM_COMMAND_DB && OF) || COMPILE_TEST 90 select INTERCONNECT_QCOM_RPMH 91 select INTERCONNECT_QCOM_BCM_VOTER 92 help
··· 42 This is a driver for the Qualcomm Network-on-Chip on qcs404-based 43 platforms. 44 45 + config INTERCONNECT_QCOM_RPMH_POSSIBLE 46 + tristate 47 + default INTERCONNECT_QCOM 48 + depends on QCOM_RPMH || (COMPILE_TEST && !QCOM_RPMH) 49 + depends on QCOM_COMMAND_DB || (COMPILE_TEST && !QCOM_COMMAND_DB) 50 + depends on OF || COMPILE_TEST 51 + help 52 + Compile-testing RPMH drivers is possible on other platforms, 53 + but in order to avoid link failures, drivers must not be built-in 54 + when QCOM_RPMH or QCOM_COMMAND_DB are loadable modules 55 + 56 config INTERCONNECT_QCOM_RPMH 57 tristate 58 59 config INTERCONNECT_QCOM_SC7180 60 tristate "Qualcomm SC7180 interconnect driver" 61 + depends on INTERCONNECT_QCOM_RPMH_POSSIBLE 62 select INTERCONNECT_QCOM_RPMH 63 select INTERCONNECT_QCOM_BCM_VOTER 64 help ··· 57 58 config INTERCONNECT_QCOM_SDM845 59 tristate "Qualcomm SDM845 interconnect driver" 60 + depends on INTERCONNECT_QCOM_RPMH_POSSIBLE 61 select INTERCONNECT_QCOM_RPMH 62 select INTERCONNECT_QCOM_BCM_VOTER 63 help ··· 67 68 config INTERCONNECT_QCOM_SM8150 69 tristate "Qualcomm SM8150 interconnect driver" 70 + depends on INTERCONNECT_QCOM_RPMH_POSSIBLE 71 select INTERCONNECT_QCOM_RPMH 72 select INTERCONNECT_QCOM_BCM_VOTER 73 help ··· 77 78 config INTERCONNECT_QCOM_SM8250 79 tristate "Qualcomm SM8250 interconnect driver" 80 + depends on INTERCONNECT_QCOM_RPMH_POSSIBLE 81 select INTERCONNECT_QCOM_RPMH 82 select INTERCONNECT_QCOM_BCM_VOTER 83 help