From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chanwoo Choi Subject: [PATCH 6/9] PM / devfreq: rk3399_dmc: Replace deprecated 'devfreq-events' property Date: Tue, 17 Dec 2019 14:57:35 +0900 Message-ID: <20191217055738.28445-7-cw00.choi@samsung.com> References: <20191217055738.28445-1-cw00.choi@samsung.com> Content-Type: text/plain; charset="utf-8" Return-path: In-Reply-To: <20191217055738.28445-1-cw00.choi@samsung.com> Sender: linux-kernel-owner@vger.kernel.org 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 List-Id: linux-rockchip.vger.kernel.org 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 --- 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 = ; 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