From patchwork Wed Sep 9 04:42:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 11764863 X-Patchwork-Delegate: iwamatsu@nigauri.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 210C515AB for ; Wed, 9 Sep 2020 04:44:48 +0000 (UTC) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E90E221D47 for ; Wed, 9 Sep 2020 04:44:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=lists.cip-project.org header.i=@lists.cip-project.org header.b="ilftdNAx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E90E221D47 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=csie.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=bounce+64572+5428+4520428+8129116@lists.cip-project.org X-Received: by 127.0.0.2 with SMTP id 0zgVYY4521763xgNKS69xW82; Tue, 08 Sep 2020 21:44:47 -0700 X-Received: from wens.tw (wens.tw [140.112.194.72]) by mx.groups.io with SMTP id smtpd.web11.6576.1599626683742757130 for ; Tue, 08 Sep 2020 21:44:44 -0700 X-Received: by wens.tw (Postfix, from userid 1000) id 18CAA601BD; Wed, 9 Sep 2020 12:44:33 +0800 (CST) From: "Chen-Yu Tsai (Moxa)" To: nobuhiro1.iwamatsu@toshiba.co.jp, pavel@denx.de Cc: cip-dev@lists.cip-project.org, JohnsonCH.Chen@moxa.com, victor.yu@moxa.com, wens@csie.org Subject: [cip-dev] [PATCH 4.4.y-cip 09/11] cpufreq: dt: Don't use generic platdev driver for ti-cpufreq platforms Date: Wed, 9 Sep 2020 12:42:31 +0800 Message-Id: <20200909044233.4115-10-wens@csie.org> In-Reply-To: <20200909044233.4115-1-wens@csie.org> References: <20200909044233.4115-1-wens@csie.org> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: cip-dev@lists.cip-project.org List-Id: Mailing-List: list cip-dev@lists.cip-project.org; contact cip-dev+owner@lists.cip-project.org Delivered-To: mailing list cip-dev@lists.cip-project.org Reply-To: cip-dev@lists.cip-project.org X-Gm-Message-State: ozbFve1tA6eK7Eq8gDW3Ifb8x4520428AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.cip-project.org; q=dns/txt; s=20140610; t=1599626687; bh=v+Rn5Eq28V6vtwisKa+6zJ4u158SowSIwJOaFOXt+xc=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=ilftdNAxpLjBwnvGqxdl69RuFcoexvf6aodk19Y0q46mfrPLI0D0E61eGAW4pt1JDbA ZpjhGCQH0+QqsXGdmM9B3wE8PPUji3I9jn1bLSI4AdkE9ImIH+ZVSOZK3LuFgpeG2tCEc 7VLfR0K0O3/jMvxvT0ftL2c9/4LJY/RizUo= From: Dave Gerlach commit 051bd84bb45bc994b7d762467f60b3bd0c7aa6bc upstream. Some TI platforms, specifically those in the am33xx, am43xx, dra7xx, and am57xx families of SoCs can make use of the ti-cpufreq driver to selectively enable OPPs based on the exact configuration in use. The ti-cpufreq is given the responsibility of creating the cpufreq-dt platform device when the driver is in use so drop am33xx and dra7xx from the cpufreq-dt-platdev driver so it is not created twice. Acked-by: Viresh Kumar Signed-off-by: Dave Gerlach Signed-off-by: Rafael J. Wysocki [wens@csie.org: Backport to pre generic platdev driver] Signed-off-by: Chen-Yu Tsai (Moxa) --- I kept the original patch subject to make it easier for scripts to match against upstream patches. --- arch/arm/mach-omap2/pm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index 3d876bde8c859..88cb34c608ab8 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -281,6 +281,9 @@ static inline void omap_init_cpufreq(void) if (!of_have_populated_dt()) devinfo.name = "omap-cpufreq"; + else if (of_machine_is_compatible("ti,am33xx") || + of_machine_is_compatible("ti,dra7")) + return; else devinfo.name = "cpufreq-dt"; platform_device_register_full(&devinfo);