From patchwork Thu Apr 4 08:11:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 161757 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1297681jan; Thu, 4 Apr 2019 01:12:20 -0700 (PDT) X-Google-Smtp-Source: APXvYqzDO6l6jzomNAuDniY6E2VIp0hYcUKWJPpLdw1LnXoSU/zBBOus74pDfyCXWTxO1LaVYL0v X-Received: by 2002:a17:902:e90b:: with SMTP id cs11mr4973144plb.243.1554365540685; Thu, 04 Apr 2019 01:12:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554365540; cv=none; d=google.com; s=arc-20160816; b=NuB4vnF5Jmmz0jn90Sy0fdaVJTX3SPydxXEvVffS8+4GGmsbwjADzK/m+aUn5a7zPO khwtjqDUBpIw1qECFAumVPA4dw2T7qYd1UV0MGCgOuQoUiEcGwBM60ZR7UdGLIQK0cWf V+iKEvOb9eB99YhlcWWFWY132AovJJQ9Ob4v5K+/MOvGLexvty6ZJLqIYNvkDs9mPXN4 KrGTXVDXOFvNcliFX2UAUQJA91KWM9bep9PU9zkzT7/zpIZwkyNGvn74IkjZcw5i7dut PORGhegh/b33EZth/saGEk7IG8KpOtEXSK8LYI+iiYKwsM9dpGQZVuvnxGLYUHAb4F7s QfIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Q2946IrUmlnaEqB0iIRGBbIKN7zWtT1klPpYZLnTdzs=; b=pIzGWXuUmiqLOGOaLSEpzA4bPWEYmTij4Xufib9mxLUzrScPQ/zRPQZKzvh7Y8hrVd CWM2uwmPE38YjmnaLs5/F+aCPKBoclMj8GQrIpb4MGqNgvjwYU+dCZ5lf0muY3ecCOw3 6OlHU8Y9pFMdj0QsrU4k2qCcq7f6CgWe5bgaUndhG4vaexALyNZ71pgiTXorMUvkt9Em DfB7ROkWQZYf4JUH69r57zLFYEpD3kctUAALEUk/m/1OGqV2+LuHVDcFenXbzNQ6Cx+n QRy7Opa/rE35M8r2F2xbykiIXGSNj/GS7qZIkDThORq5j9WHOrRTAmxHifvS3A+kFioQ P6vw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=N8TEA4hR; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m12si7767545pgv.586.2019.04.04.01.12.20; Thu, 04 Apr 2019 01:12:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=N8TEA4hR; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727323AbfDDIMT (ORCPT + 5 others); Thu, 4 Apr 2019 04:12:19 -0400 Received: from fllv0016.ext.ti.com ([198.47.19.142]:35248 "EHLO fllv0016.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727321AbfDDIMT (ORCPT ); Thu, 4 Apr 2019 04:12:19 -0400 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id x348CGf2105650; Thu, 4 Apr 2019 03:12:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1554365536; bh=Q2946IrUmlnaEqB0iIRGBbIKN7zWtT1klPpYZLnTdzs=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=N8TEA4hRxEzTo+iZ0AiQvugUQV7KW2zpTsoPeqXoaKjPzDvWPyO4OSkcBSsEZu/cS RaeHA17m3qHkZXEyx2f7pGcbdFLJHK9DoElYEfx43ReKpsNz3DUlCXU92o8Wy/osxl 0QdqfJzGqsvWuEZt/UjLobDB5dHwtL5fq6wn4YZQ= Received: from DFLE114.ent.ti.com (dfle114.ent.ti.com [10.64.6.35]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x348CGjE073317 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 4 Apr 2019 03:12:16 -0500 Received: from DFLE105.ent.ti.com (10.64.6.26) by DFLE114.ent.ti.com (10.64.6.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Thu, 4 Apr 2019 03:12:14 -0500 Received: from fllv0040.itg.ti.com (10.64.41.20) by DFLE105.ent.ti.com (10.64.6.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5 via Frontend Transport; Thu, 4 Apr 2019 03:12:14 -0500 Received: from gomoku.home (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id x348C8G9093305; Thu, 4 Apr 2019 03:12:13 -0500 From: Tero Kristo To: , , , CC: Subject: [PATCH 2/6] ARM: omap2+: hwmod: drop CLK_IS_BASIC flag usage Date: Thu, 4 Apr 2019 11:11:03 +0300 Message-ID: <1554365467-1325-3-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1554365467-1325-1-git-send-email-t-kristo@ti.com> References: <1554365467-1325-1-git-send-email-t-kristo@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org CLK_IS_BASIC flag is about to get deprecated, and as such, can't be used. Instead, the API call for checking whether a clock is of type hw_omap shall be used, so convert the code to use this. Signed-off-by: Tero Kristo --- arch/arm/mach-omap2/omap_hwmod.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 1.9.1 -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki Acked-by: Tony Lindgren diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 3a04c73..baadddf 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -648,10 +648,10 @@ static struct clockdomain *_get_clkdm(struct omap_hwmod *oh) if (oh->clkdm) { return oh->clkdm; } else if (oh->_clk) { - if (__clk_get_flags(oh->_clk) & CLK_IS_BASIC) + if (!omap2_clk_is_hw_omap(__clk_get_hw(oh->_clk))) return NULL; clk = to_clk_hw_omap(__clk_get_hw(oh->_clk)); - return clk->clkdm; + return clk->clkdm; } return NULL; }