From patchwork Wed Dec 2 21:19:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Gamari X-Patchwork-Id: 7753311 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 108509F54F for ; Wed, 2 Dec 2015 21:32:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3611320549 for ; Wed, 2 Dec 2015 21:32:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5C33120551 for ; Wed, 2 Dec 2015 21:32:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757359AbbLBV3Z (ORCPT ); Wed, 2 Dec 2015 16:29:25 -0500 Received: from mail.smart-cactus.org ([54.187.36.80]:50799 "EHLO mail.smart-cactus.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756352AbbLBV3U (ORCPT ); Wed, 2 Dec 2015 16:29:20 -0500 Received: from localhost.localdomain (HSI-KBW-149-172-43-78.hsi13.kabel-badenwuerttemberg.de [149.172.43.78]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: ben@smart-cactus.org) by mail.smart-cactus.org (Postfix) with ESMTPSA id 07A2964B73; Wed, 2 Dec 2015 21:08:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mail.smart-cactus.org; s=mail; t=1449090489; bh=vAgPRhBsW9+fgbIK3SY0uaFwJ2wE4wOS7ppNExccieQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sXLwGblLu8PDtzSDp+6ybZvhD+J59s0vCdu9l69DoMVEGlmIK+BFrTLb6mZm5Ykqf NMb79rEsx0hMGVQCLhOV/DByTBtucS2/hpG2dLfvVmEAuOIKEEBlPm8gvh+qu+8Gjr BLkXJLAbNLxVxsrpkqsbVtLuLp98LDWLq32BvHME= From: Ben Gamari To: Thomas Abraham , Sylwester Nawrocki , Michael Turquette , Kukjin Kim , Kukjin Kim , Viresh Kumar , Krzysztof Kozlowski Cc: Tomasz Figa , Lukasz Majewski , Heiko Stuebner , Chanwoo Choi , Kevin Hilman , Javier Martinez Canillas , Tobias Jakobi , Anand Moon , linux-samsung-soc@vger.kernel.org, linux-clk@vger.kernel.org, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, b.zolnierkie@samsung.com, Ben Gamari , Javier Martinez Canillas Subject: [PATCH 10/12] cpufreq: arm-big-little: accept operating-points-v2 nodes Date: Wed, 2 Dec 2015 22:19:25 +0100 Message-Id: <1449091167-20758-11-git-send-email-ben@smart-cactus.org> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1449091167-20758-1-git-send-email-ben@smart-cactus.org> References: <1449091167-20758-1-git-send-email-ben@smart-cactus.org> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The arm_big_little cpufreq driver can use operating points from operating-points-v2 nodes without any trouble. Cc: Javier Martinez Canillas Signed-off-by: Ben Gamari --- drivers/cpufreq/arm_big_little_dt.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/cpufreq/arm_big_little_dt.c b/drivers/cpufreq/arm_big_little_dt.c index 16ddeef..be7f632 100644 --- a/drivers/cpufreq/arm_big_little_dt.c +++ b/drivers/cpufreq/arm_big_little_dt.c @@ -35,12 +35,16 @@ static struct device_node *get_cpu_node_with_valid_op(int cpu) { struct device_node *np = of_cpu_device_node_get(cpu); - if (!of_get_property(np, "operating-points", NULL)) { - of_node_put(np); - np = NULL; + if (of_get_property(np, "operating-points-v2", NULL)) { + return np; } - return np; + if (of_get_property(np, "operating-points", NULL)) { + return np; + } + + of_node_put(np); + return NULL; } static int dt_init_opp_table(struct device *cpu_dev)