From: Chanwoo Choi <cw00.choi@samsung.com>
To: krzk@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com,
heiko@sntech.de, leonard.crestez@nxp.com, lukasz.luba@arm.com
Cc: a.swigon@samsung.com, m.szyprowski@samsung.com, kgene@kernel.org,
cw00.choi@samsung.com, myungjoo.ham@samsung.com,
kyungmin.park@samsung.com, linux-pm@vger.kernel.org,
linux-samsung-soc@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org
Subject: [PATCH 6/9] PM / devfreq: rk3399_dmc: Replace deprecated 'devfreq-events' property
Date: Tue, 17 Dec 2019 14:57:35 +0900 [thread overview]
Message-ID: <20191217055738.28445-7-cw00.choi@samsung.com> (raw)
In-Reply-To: <20191217055738.28445-1-cw00.choi@samsung.com>
In order to remove the deprecated 'devfreq-events' property, replace with
new 'rockchip,dfi-device' property in order to get the devfreq-event device
in devicetree file instead of 'devfreq-events' property. But, to guarantee
the backward-compatibility, keep the support 'devfreq-events' property.
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
---
Documentation/devicetree/bindings/devfreq/rk3399_dmc.txt | 4 ++--
drivers/devfreq/rk3399_dmc.c | 9 ++++++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/Documentation/devicetree/bindings/devfreq/rk3399_dmc.txt b/Documentation/devicetree/bindings/devfreq/rk3399_dmc.txt
index 0ec68141f85a..e484768a4077 100644
--- a/Documentation/devicetree/bindings/devfreq/rk3399_dmc.txt
+++ b/Documentation/devicetree/bindings/devfreq/rk3399_dmc.txt
@@ -2,7 +2,7 @@
Required properties:
- compatible: Must be "rockchip,rk3399-dmc".
-- devfreq-events: Node to get DDR loading, Refer to
+- rockchip,dfi-device: Node to get DDR loading, Refer to
Documentation/devicetree/bindings/devfreq/event/
rockchip-dfi.txt
- clocks: Phandles for clock specified in "clock-names" property
@@ -173,7 +173,7 @@ Example:
dmc: dmc {
compatible = "rockchip,rk3399-dmc";
- devfreq-events = <&dfi>;
+ rockchip,dfi-device = <&dfi>;
interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cru SCLK_DDRCLK>;
clock-names = "dmc_clk";
diff --git a/drivers/devfreq/rk3399_dmc.c b/drivers/devfreq/rk3399_dmc.c
index 796272a208a8..5d007cb0643b 100644
--- a/drivers/devfreq/rk3399_dmc.c
+++ b/drivers/devfreq/rk3399_dmc.c
@@ -306,11 +306,14 @@ static int of_get_ddr_timings(struct dram_timing *timing,
static struct devfreq_event_dev *get_edev_by_node(struct device_node *np,
int index)
{
- struct device_node *node = of_parse_phandle(np, "devfreq-events",
+ struct device_node *node = of_parse_phandle(np, "rockchip,dfi-device",
index);
- if (!node)
- return ERR_PTR(-ENODEV);
+ if (!node) {
+ node = of_parse_phandle(np, "devfreq-events", index);
+ if (!node)
+ return ERR_PTR(-ENODEV);
+ }
return devfreq_event_get_edev_by_node(node);
}
--
2.17.1
next prev parent reply other threads:[~2019-12-17 5:51 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20191217055105epcas1p365e306f27fd53852b793155c929ee634@epcas1p3.samsung.com>
2019-12-17 5:57 ` [PATCH 0/9] PM / devfreq: Remove deprecated 'devfreq' and 'devfreq-events' properties Chanwoo Choi
[not found] ` <CGME20191217055105epcas1p3bacbf54550c52979fe819ab33bb21d30@epcas1p3.samsung.com>
2019-12-17 5:57 ` [PATCH 1/9] PM / devfreq: Add devfreq_get_devfreq_by_node function Chanwoo Choi
[not found] ` <CGME20191217055105epcas1p2d2930402a559e381a7854f515a683d15@epcas1p2.samsung.com>
2019-12-17 5:57 ` [PATCH 2/9] PM / devfreq: Remove devfreq_get_devfreq_by_phandle function Chanwoo Choi
2019-12-17 14:33 ` Leonard Crestez
2019-12-18 2:59 ` Chanwoo Choi
2019-12-18 3:20 ` Chanwoo Choi
[not found] ` <CGME20191217055106epcas1p3e77268d200006921dfa736b2c7550a04@epcas1p3.samsung.com>
2019-12-17 5:57 ` [PATCH 3/9] PM / devfreq: event: Add devfreq_event_get_edev_by_node function Chanwoo Choi
[not found] ` <CGME20191217055106epcas1p11f2bc81d6bb2db3fc4bc257d78c337b9@epcas1p1.samsung.com>
2019-12-17 5:57 ` [PATCH 4/9] PM / devfreq: exynos-bus: Replace deprecated 'devfreq' property Chanwoo Choi
2019-12-26 21:01 ` Rob Herring
2019-12-27 0:09 ` Chanwoo Choi
2020-01-06 1:38 ` Chanwoo Choi
2020-01-14 18:57 ` Chanwoo Choi
[not found] ` <CGME20191217055106epcas1p4b50ca647af9b54465e5c0a0bebb165b8@epcas1p4.samsung.com>
2019-12-17 5:57 ` [PATCH 5/9] PM / devfreq: exynos-bus: Replace deprecated 'devfreq-events' property Chanwoo Choi
[not found] ` <CGME20191217055106epcas1p156b1323f4ec9f7c35fed825d56e577ff@epcas1p1.samsung.com>
2019-12-17 5:57 ` Chanwoo Choi [this message]
[not found] ` <CGME20191217055106epcas1p2c43a45e34983c1b3e60cc6fd842dd33e@epcas1p2.samsung.com>
2019-12-17 5:57 ` [PATCH 7/9] memory: samsung: exynos5422-dmc: " Chanwoo Choi
2019-12-17 11:03 ` Lukasz Luba
2019-12-19 20:19 ` Krzysztof Kozlowski
[not found] ` <CGME20191217055106epcas1p4c0f65bec74e53b38d95e984e146bf8b6@epcas1p4.samsung.com>
2019-12-17 5:57 ` [PATCH 8/9] ARM: dts: exynos: Replace deprecated property for Exynos bus and DMC Chanwoo Choi
2019-12-19 20:21 ` Krzysztof Kozlowski
[not found] ` <CGME20191217055107epcas1p44d46bdea7b326b86689f326742f5444a@epcas1p4.samsung.com>
2019-12-17 5:57 ` [PATCH 9/9] arm64: dts: exynos: Replace deprecated property for Exynos bus Chanwoo Choi
2019-12-19 20:22 ` Krzysztof Kozlowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191217055738.28445-7-cw00.choi@samsung.com \
--to=cw00.choi@samsung.com \
--cc=a.swigon@samsung.com \
--cc=devicetree@vger.kernel.org \
--cc=heiko@sntech.de \
--cc=kgene@kernel.org \
--cc=krzk@kernel.org \
--cc=kyungmin.park@samsung.com \
--cc=leonard.crestez@nxp.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=lukasz.luba@arm.com \
--cc=m.szyprowski@samsung.com \
--cc=mark.rutland@arm.com \
--cc=myungjoo.ham@samsung.com \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).